From f600f90b0641bc8b74f9190cd20275c58a9929aa Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Mon, 29 Dec 2025 10:19:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(inspection):=20=E4=BF=AE=E5=A4=8D=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=A0=81=E5=92=8C=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将暂存状态码从 -1 修改为 98
- 统一检查时间显示格式为 自xx至xx止
- 修复检查人信息显示逻辑，支持多检查人显示
- 添加导出功能的加载状态和参数处理
- 修复签字图片显示和导出按钮逻辑
- 为人员选择组件添加额外参数配置
---
 src/enumerate/constant/index.js               |  2 +-
 .../Inspection/Acceptance/List/index.js       |  2 +-
 .../Inspection/Assign/List/index.js           |  2 +-
 .../Inspection/Defense/List/index.js          |  2 +-
 .../Inspection/Inspected/List/index.js        |  2 +-
 .../Inspection/Inspection/Add/index.js        |  1 +
 .../Inspection/Inspection/List/index.js       |  4 +-
 .../Inspection/Inspector/List/index.js        |  4 +-
 .../Inspection/Records/List/index.js          | 12 +++-
 .../BranchCompany/InspectionView/index.js     | 65 +++++++++++--------
 .../Plan/Management/List/index.js             |  2 +
 .../PersonnelExecutionDetails/index.js        |  2 +-
 .../Management/PlanExecutionDetails/index.js  |  2 +-
 13 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/src/enumerate/constant/index.js b/src/enumerate/constant/index.js
index 3bece4d..978c09c 100644
--- a/src/enumerate/constant/index.js
+++ b/src/enumerate/constant/index.js
@@ -18,7 +18,7 @@ export const INSPECTION_STATE_ENUM = [
   { bianma: "500", name: "检查归档" },
   { bianma: "600", name: "检查核实打回" },
   { bianma: "700", name: "被检查人申辩" },
-  { bianma: "-1", name: "暂存" },
+  { bianma: "98", name: "暂存" },
 ];
 
 export const PLAN_ENUM = [
diff --git a/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js b/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js
index fa211ed..5fd1a79 100644
--- a/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js
@@ -50,7 +50,7 @@ function List(props) {
           { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" },
           { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 },
           { title: "检查类型", dataIndex: "typeName" },
-          { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) },
+          { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) },
           { title: "检查状态", dataIndex: "status", render: () => "待验收" },
           { title: "发现隐患数", dataIndex: "hiddenNumber" },
           {
diff --git a/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js b/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js
index d395bd1..e4664d5 100644
--- a/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js
@@ -50,7 +50,7 @@ function List(props) {
           { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" },
           { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 },
           { title: "检查类型", dataIndex: "typeName" },
-          { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) },
+          { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) },
           { title: "检查状态", dataIndex: "status", render: () => "待指派" },
           { title: "发现隐患数", dataIndex: "hiddenNumber" },
           {
diff --git a/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js b/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js
index 47fd9fb..76fa838 100644
--- a/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js
@@ -62,7 +62,7 @@ function List(props) {
           { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" },
           { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 },
           { title: "检查类型", dataIndex: "typeName" },
-          { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) },
+          { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) },
           { title: "检查状态", dataIndex: "status", render: () => "被检查单位负责人申辩" },
           { title: "发现隐患数", dataIndex: "hiddenNumber" },
           {
diff --git a/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js b/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js
index 59ef63c..87a38ed 100644
--- a/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js
@@ -58,7 +58,7 @@ function List(props) {
           { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" },
           { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 },
           { title: "检查类型", dataIndex: "typeName" },
-          { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) },
+          { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) },
           { title: "检查状态", dataIndex: "status", render: () => "待确认" },
           { title: "发现隐患数", dataIndex: "hiddenNumber" },
           {
diff --git a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js
index a9e77dc..288e6da 100644
--- a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js
@@ -384,6 +384,7 @@ function Add(props) {
                   onGetLabel={label => form.setFieldValue(["personUnderInspection", "userName"], label)}
                 />
               ),
+              formItemProps: { labelCol: { span: 8 } },
             },
             { name: ["personUnderInspection", "userName"], label: "被检查单位现场负责人名称", onlyForLabel: true },
             { name: "place", label: "检查场所", span: 24 },
diff --git a/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js b/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js
index 53c3f60..4e1424f 100644
--- a/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js
@@ -78,7 +78,7 @@ function List(props) {
           { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" },
           { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 },
           { title: "检查类型", dataIndex: "typeName" },
-          { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) },
+          { title: "检查时间", width: 200, render: (_, record) => (record.timeStart && record.timeEnd ? `自${record.timeStart}至${record.timeEnd}止` : "") },
           {
             title: "检查状态",
             dataIndex: "status",
@@ -92,7 +92,7 @@ function List(props) {
             width: 200,
             render: (_, record) => (
               <Space>
-                {(props.permission(props.updatePermissionKey || "inspection-qy-check-edit") && (record.status === -1 || record.status === 600)) && (
+                {(props.permission(props.updatePermissionKey || "inspection-qy-check-edit") && (record.status === 98 || record.status === 600)) && (
                   <Button
                     type="link"
                     onClick={() => {
diff --git a/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js b/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js
index 00cb96f..99e8fff 100644
--- a/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Inspector/List/index.js
@@ -57,7 +57,7 @@ function List(props) {
           { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" },
           { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 },
           { title: "检查类型", dataIndex: "typeName" },
-          { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) },
+          { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) },
           { title: "检查状态", dataIndex: "status", render: () => "待核实" },
           { title: "发现隐患数", dataIndex: "hiddenNumber" },
           {
@@ -79,7 +79,7 @@ function List(props) {
                     type="link"
                     onClick={() => {
                       setVerifyModalOpen(true);
-                      setCurrentId(record.id);
+                      setCurrentId(record.inspectionId);
                     }}
                   >
                     核实
diff --git a/src/pages/Container/BranchCompany/Inspection/Records/List/index.js b/src/pages/Container/BranchCompany/Inspection/Records/List/index.js
index 496579c..42ffcef 100644
--- a/src/pages/Container/BranchCompany/Inspection/Records/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Records/List/index.js
@@ -10,6 +10,8 @@ import DictionarySelectTree from "zy-react-library/components/SelectTree/Diction
 import Table from "zy-react-library/components/Table";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
+import useUrlQueryCriteria from "zy-react-library/hooks/useUrlQueryCriteria";
+import useDownloadBlob from "zy-react-library/hooks/useDownloadBlob";
 import useTable from "zy-react-library/hooks/useTable";
 import { getLabelName } from "zy-react-library/utils";
 import InspectionFlowModal from "~/components/InspectionFlowModal";
@@ -22,6 +24,8 @@ function List(props) {
 
   const [flowModalOpen, setFlowModalOpen] = useState(false);
   const [currentId, setCurrentId] = useState("");
+  const { getUrlCriteriaQuery } = useUrlQueryCriteria();
+  const { loading, downloadBlob } = useDownloadBlob();
   const [count, setCount] = useState({
     inspectCount: 0,
     hiddenCount: 0,
@@ -142,8 +146,12 @@ function List(props) {
             {(props.permission(props.exportPermissionKey || "inspection-qy-list-dc") && query.entrance !== "statistics") && (
               <Button
                 type="primary"
+                loading={loading}
                 icon={<ExportIcon />}
-                onClick={() => {
+                onClick={async () => {
+                  const exportParams = getUrlCriteriaQuery("searchFormKeys", "searchFormValues");
+
+                  await downloadBlob("/accident/accident/export", { params: { ...exportParams, eqType: props.type } })
                 }}
               >
                 导出
@@ -159,7 +167,7 @@ function List(props) {
           { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" },
           { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 },
           { title: "检查类型", dataIndex: "typeName" },
-          { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) },
+          { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) },
           {
             title: "检查状态",
             dataIndex: "status",
diff --git a/src/pages/Container/BranchCompany/InspectionView/index.js b/src/pages/Container/BranchCompany/InspectionView/index.js
index 8d160ee..c901b2a 100644
--- a/src/pages/Container/BranchCompany/InspectionView/index.js
+++ b/src/pages/Container/BranchCompany/InspectionView/index.js
@@ -33,6 +33,8 @@ function InspectionView(props) {
   const [hiddenUUId, setHiddenUUId] = useState("");
   const [flowModalOpen, setFlowModalOpen] = useState(false);
   const [currentId, setCurrentId] = useState("");
+  const [currentInspectorDepartmentName, setCurrentInspectorDepartmentName] = useState([]);
+  const [currentInspectorUserName, setCurrentInspectorUserName] = useState([]);
   const contentRef = useRef(null);
   const handlePrint = useReactToPrint({
     contentRef,
@@ -60,7 +62,12 @@ function InspectionView(props) {
       });
       data.content[i].files = files;
     }
-    data.currentInspectorUser = data.inspectorVerificationList.filter(item => item.userId === userInfo.id)[0];
+    data.inspector.forEach(item => {
+      setCurrentInspectorDepartmentName(prev => [...prev, item.departmentName || ""])
+    })
+    data.inspectorVerificationList.forEach(item => {
+      setCurrentInspectorUserName(prev => [...prev, item.userName || ""])
+    })
     setInfo(data);
     const { data: hiddenList } = await props["hiddenList"]({ foreignKey: query.inspectionId, pageIndex: 1, pageSize: 999 });
     setHiddenList(hiddenList);
@@ -85,8 +92,8 @@ function InspectionView(props) {
             items={[
               { label: "被检查单位", children: info.inspectedPartyConfirmation?.departmentName },
               { label: "被检查单位现场负责人", children: info.inspectedPartyConfirmation?.userName },
-              { label: "牵头检查部门", children: info.currentInspectorUser?.departmentName },
-              { label: "检查人", children: info.currentInspectorUser?.userName },
+              { label: "牵头检查部门", children: currentInspectorDepartmentName.join("，") },
+              { label: "检查人", children: currentInspectorUserName.join("，") },
               { label: "检查类型", children: info.typeName },
               { label: "检查时间", children: `${info.timeStart}至${info.timeEnd}` },
               { label: "检查场所", children: info.place, span: 2 },
@@ -119,29 +126,31 @@ function InspectionView(props) {
             columns={[
               { title: "隐患描述", dataIndex: "hiddenDesc" },
               { title: "隐患部位", dataIndex: "hiddenPartName" },
-              { title: "操作", render: (_, record) => (
-                <Space>
-                  <Button
-                    type="link"
-                    onClick={() => {
-                      setHiddenViewModalOpen(true);
-                      setHiddenId(record.id);
-                      setHiddenUUId(record.hiddenId);
-                    }}
-                  >
-                    查看
-                  </Button>
-                  <Button
-                    type="link"
-                    onClick={() => {
-                      setFlowModalOpen(true);
-                      setCurrentId(record.id);
-                    }}
-                  >
-                    流程图
-                  </Button>
-                </Space>
-              ) },
+              {
+                title: "操作", render: (_, record) => (
+                  <Space>
+                    <Button
+                      type="link"
+                      onClick={() => {
+                        setHiddenViewModalOpen(true);
+                        setHiddenId(record.id);
+                        setHiddenUUId(record.hiddenId);
+                      }}
+                    >
+                      查看
+                    </Button>
+                    <Button
+                      type="link"
+                      onClick={() => {
+                        setFlowModalOpen(true);
+                        setCurrentId(record.id);
+                      }}
+                    >
+                      流程图
+                    </Button>
+                  </Space>
+                )
+              },
             ]}
           />
           <table className="print-table">
@@ -205,14 +214,14 @@ function InspectionView(props) {
             bordered
             styles={{ label: { width: 200 } }}
             items={[
-              { label: "被检查单位现场负责人（签字）", children: (<PreviewImg files={[]} />) },
+              { label: "被检查单位现场负责人（签字）", children: (<PreviewImg files={[info.inspectedPartyConfirmation.signature]} />) },
             ]}
           />
         </div>
         <div style={{ marginTop: 20, paddingBottom: 20, textAlign: "center" }}>
           <Space>
             <Button type="primary" onClick={handlePrint}>打印</Button>
-            {query.isExport !== "0" && <Button type="primary">导出</Button>}
+            {/* {query.isExport !== "0" && <Button type="primary">导出</Button>} */}
           </Space>
         </div>
       </Spin>
diff --git a/src/pages/Container/BranchCompany/Plan/Management/List/index.js b/src/pages/Container/BranchCompany/Plan/Management/List/index.js
index 229c2e6..f202567 100644
--- a/src/pages/Container/BranchCompany/Plan/Management/List/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Management/List/index.js
@@ -358,12 +358,14 @@ const AddModalComponent = (props) => {
                       params={{ corpinfoId: corpId }}
                       isNeedCorpInfoId={true}
                       isNeedDepartmentId={false}
+                      extraParams={{ noMain: 1 }}
                       {...commonProps}
                     />
                   )
                 : (
                     <PersonnelSelect
                       params={{ departmentId: userInfo.departmentId }}
+                      extraParams={{ noMain: 1 }}
                       {...commonProps}
                     />
                   );
diff --git a/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js b/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js
index 4774851..0f1e70e 100644
--- a/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js
@@ -30,7 +30,7 @@ function PersonnelExecutionDetails(props) {
             { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" },
             { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 },
             { title: "检查类型", dataIndex: "typeName" },
-            { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) },
+            { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) },
             {
               title: "检查状态",
               dataIndex: "status",
diff --git a/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js b/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js
index 278fe51..1632e09 100644
--- a/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js
+++ b/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js
@@ -31,7 +31,7 @@ function PlanExecutionDetails(props) {
             { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" },
             { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 },
             { title: "检查类型", dataIndex: "typeName" },
-            { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) },
+            { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) },
             {
               title: "检查状态",
               dataIndex: "status",