fix

jjb.config.js

@@ -10,10 +10,10 @@ module.exports = {
       javaGitBranch: "dev",
       // 本地联调 safetyEval-service（context-path: /safetyEval，默认端口 8095）
       // 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
-      API_HOST:  "https://gbs-gateway.qhdsafety.com",
+     // API_HOST:  "https://gbs-gateway.qhdsafety.com",
 
       // API_HOST:  "http://192.168.0.134",
-     //API_HOST:  "http://192.168.0.150", //太浅
+     API_HOST:  "http://192.168.0.150", //太浅
      // API_HOST:  "http://192.168.0.152",
      //API_HOST:  "http://192.168.0.103", //huwei
     },

src/enumerate/constant/index.js

@@ -413,6 +413,7 @@ export const NODE_LABELS = {
   INTERNAL_REVIEW: "内审",
   TECHNICAL_REVIEW: "技术审核",
   PROCESS_CONTROL: "过程控制",
+  ARCHIVE: "项目归档",
 };
 
 /** 监管端-安评项目实时监控 - 监管状态映射 */

src/pages/Container/SafetyEvalBusiness/ProjectFlow/ArchiveContent.js

@@ -25,7 +25,7 @@ const ArchiveContent = ({ readOnly, ...props }) => {
   const projectId = router.query?.id;
   const { processControlDetail, processControlFiles, evalProjectDetailData } =
     props.safetyEvalBusiness || {};
-  const { processControl } = processControlDetail || {};
+  const { processControl, archiveFlag } = processControlDetail || {};
 
   const [files, setFiles] = useState([]);
   const [archiveForm] = Form.useForm();
@@ -140,6 +140,7 @@ const ArchiveContent = ({ readOnly, ...props }) => {
     },
   ];
 
+
   return (
     <Card
       title="项目归档"
@@ -202,16 +203,10 @@ const ArchiveContent = ({ readOnly, ...props }) => {
             type="primary"
             onClick={handleArchive}
             loading={props.safetyEvalBusiness?.processControlArchiveLoading}
-            disabled={!canArchive}
+            disabled={!canArchive || archiveFlag}
-            title={
+           
-              !canArchive
-                ? !isSignatureCompleted
-                  ? "需签字完成后才可归档"
-                  : "需生成归档交接单后才可归档"
-                : ""
-            }
           >
-            双方签字并确认入库
+            {archiveFlag ? '已归档' : '双方签字并确认入库'}
           </Button>
         )}
       </Flex>

src/pages/Container/SafetyEvalBusiness/ProjectFlow/ControlContent.js

@@ -21,7 +21,7 @@ const { router } = tools;
 const ControlContent = ({ readOnly, ...props }) => {
   const projectId = router.query?.id;
   const { processControlDetail } = props.safetyEvalBusiness || {};
-  const { processControl, controllers, reviewItems } =
+  const { processControl, controllers, reviewItems, orgHeads } =
     processControlDetail || {};
 
   const [selectPeople, setSelectPeople] = useState(null);
@@ -59,6 +59,7 @@ const ControlContent = ({ readOnly, ...props }) => {
       setRows(
         reviewItems.map((item) => ({
           ...item,
+          reviewConclusion: item.reviewConclusion || "conform_to",
           _key: item.id || item.reviewDimensionCode,
         })),
       );
@@ -76,7 +77,7 @@ const ControlContent = ({ readOnly, ...props }) => {
   };
 
   const isDispatched = processControl?.reviewerSignatureTaskStatus !== "completed";
-  const isOrgHeadSignature = processControl?.orgHeadSignatureTaskStatus !== "completed";
+  const isOrgHeadSignature = processControl?.orgHeadSignatureTaskStatus !== "non_dispatched";
 
   // 过程控制签字提交（confirm）
   const handleConfirm = async (resultCode) => {
@@ -90,6 +91,10 @@ const ControlContent = ({ readOnly, ...props }) => {
       projectId,
       resultCode,
       opinionContent: approvalOpinion,
+      signTaskPersonCmd: {
+        signerPersonnelId: controllers?.[0]?.personnelId,
+        signerName: controllers?.[0]?.personnelName,
+      },
       reviewItems: rows.map((r) => ({
         bizType: "eval_process_control",
         bizId: processControl?.id,
@@ -170,6 +175,18 @@ const ControlContent = ({ readOnly, ...props }) => {
     { key: 2, label: "机构负责人签发" },
   ];
 
+  const reviewerSignatureTaskStatusMap={
+    dispatched: "已下发",
+    non_dispatched: "过程控制签字提交",
+    completed: "已完成",
+  }
+
+  const OrgHeadSignatureTaskStatusMap={
+    dispatched: "已下发",
+    non_dispatched: "下发APP签字",
+    completed: "已完成",
+  }
+
   return (
     <div>
       <Flex
@@ -253,10 +270,11 @@ const ControlContent = ({ readOnly, ...props }) => {
             {!readOnly && (
               <Button
                 type="primary"
+                disabled={processControl?.reviewerSignatureTaskStatus !== "non_dispatched"}
                 onClick={() => handleConfirm("passed")}
                 loading={props.safetyEvalBusiness?.processControlConfirmLoading}
               >
-                过程控制签字提交
+                {reviewerSignatureTaskStatusMap[processControl?.reviewerSignatureTaskStatus]}
               </Button>
             )}
           </Flex>
@@ -335,7 +353,7 @@ const ControlContent = ({ readOnly, ...props }) => {
                   onChange={(value, option) => {
                     setSelectPeople(option);
                   }}
-                  options={(controllers || []).map((r) => ({
+                  options={(orgHeads || []).map((r) => ({
                     value: r.personnelId,
                     label: r.personnelName,
                   }))}
@@ -348,7 +366,7 @@ const ControlContent = ({ readOnly, ...props }) => {
                   }
                   disabled={isDispatched || isOrgHeadSignature || !selectPeople?.value || readOnly}
                 >
-                  {isDispatched ? "过程控制审核暂未完成" : isOrgHeadSignature ? "已下发APP签字" : "下发APP签字"}
+                  {isDispatched ? "过程控制审核暂未完成" : OrgHeadSignatureTaskStatusMap[processControl?.orgHeadSignatureTaskStatus]}
                 </Button>
               </Flex>
             </Flex>