Merge branch 'release/customer/2025/AJT' of http://git.xlyprint.cn/qiangmj/ebc-M…

…es into release/customer/2025/AJT

Merge branch 'release/customer/2025/AJT' of http://git.xlyprint.cn/qiangmj/ebc-M…
…es into release/customer/2025/AJT
Min
2 parents 778842fc 9ac94f24
Showing 3 changed files with 569 additions and 355 deletions
.prettierrc
src/mes/common/commonModelComponent/index.js
src/mes/costomPageFun/index.js
+{
+  "printWidth": 150,
+  "eslintIntegration": true,
+  "stylelintIntegration": true,
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": false,
+  "quoteProps": "as-needed",
+  "jsxSingleQuote": false,
+  "bracketSpacing": true,
+  "arrowParens": "avoid",
+  "htmlWhitespaceSensitivity": "css",
+  "javascript.format.insertSpaceBeforeFunctionParenthesis": true,
+  "files.insertFinalNewline": true,
+  "useTabs": false,
+  "endOfLine": "lf",
+  "ignorePath": ".gnore",
+  "trailingComma": "es5",
+  "jsxBracketSameLine": false,
+  "bracketSameLine": false
+}
 \ No newline at end of file
@@ -348,6 +348,7 @@ const useCommonModelEvent = props =&gt; {
   useEffect(
     () => {
       if (!props.bFinish) return;
+      window.refreshTableList = undefined;
       const { firstTableName } = props;
       if (!firstTableName) return;
@@ -8,15 +8,10 @@ import * as commonFunc from &quot;@/components/Common/commonFunc&quot;;
 import FaceDetect from "@/components/FaceDetect";
 import ShowType from "@/components/Common/CommonComponent";
 const costomPageFun = ({ props, tableName, sFieldName, actionName }) => {
-  const { sModelsId } = commonUtils.convertStrToObj(
-    localStorage.xlybusinesscurrentMesPane
-  );
+  const { sModelsId } = commonUtils.convertStrToObj(localStorage.xlybusinesscurrentMesPane);
   let result = false;
-  switch (
-  `${sModelsId}-${tableName}${sFieldName ? `-${sFieldName}` : ""
-  }-${actionName}`
-  ) {
+  switch (`${sModelsId}-${tableName}${sFieldName ? `-${sFieldName}` : ""}-${actionName}`) {
     case "12710101117087404588200-table0-mesTableLineAdd":
     case "12710101117260270570210-table0-mesTableLineAdd":
     case "12710101117087371044360-slave0-mesTableLineAdd":
@@ -131,14 +126,63 @@ const costomPageFun = ({ props, tableName, sFieldName, actionName }) =&gt; {
       result = true;
       handleZlxjCheck(props, sFieldName);
       break;
+    case "mesBtnClick-slave0-BtnRight.foremanReview":
+      result = true;
+      window.refreshTableList = ["slave1"];
+      handleCjlbshCheck(props);
+      break;
+    case "mesBtnClick-slave0-BtnRight.reverseReview":
+      result = true;
+      window.refreshTableList = ["slave1"];
+      handleCjlbfsCheck(props);
+      break;
+    case "mesBtnClick-slave0-BtnRight.ipqcReview":
+      result = true;
+      window.refreshTableList = ["slave1"];
+      handlePgshCheck(props);
+      break;
+    case "mesBtnClick-slave0-BtnRight.ipqcReverseReview":
+      result = true;
+      window.refreshTableList = ["slave1"];
+      handlePgfsCheck(props);
+      break;
+    case "mesBtnClick-slave0-BtnRight.confirmSubmit":
+      result = true;
+      window.refreshTableList = ["slave1"];
+      handleConfirmSubmit(props);
+      break;
+    case "mesBtnClick-slave0-BtnRight..edit":
+    case "mesBtnClick-slave0-BtnRight.edit":
+      {
+        window.refreshTableList = ["slave1"];
+        const { slave0Data } = props;
+        result = true;
+        const slave0DataNew = [{ ...slave0Data[0], bSubmit: 0, handleType: slave0Data[0].handleType || "update" }];
+        props.onExecInstructSet({
+          nextProps: { ...props, slave0Data: slave0DataNew },
+          btnConfig: {
+            showName: "保存",
+            sInstruct: JSON.stringify([
+              {
+                opr: "save",
+                data: [
+                  {
+                    tablename: "EptCompletionSiteClearanceMaster",
+                    srcDataset: "slave0",
+                  },
+                ],
+              },
+            ]),
+          },
+        });
+        break;
+      }
+
     default:
       break;
   }
-  if (
-    ["mesBtnClick"].includes(actionName) &&
-    ["BtnRight.PriorCom", "BtnRight.NextCom"].includes(sFieldName)
-  ) {
+  if (["mesBtnClick"].includes(actionName) && ["BtnRight.PriorCom", "BtnRight.NextCom"].includes(sFieldName)) {
     handleUpDownData({ ...props, tableName, sFieldName });
     return true;
   }
@@ -149,19 +193,14 @@ const costomPageFun = ({ props, tableName, sFieldName, actionName }) =&gt; {
 // 班组报工行车记录表格新增
 const mesTableLineAdd1 = (props, tableName) => {
   // const tableName = "table0";
-  const {
-    [`${tableName}SelectedRowKeys`]: selectedRowKeys,
-    [`${tableName}Data`]: tableData = []
-  } = props;
+  const { [`${tableName}SelectedRowKeys`]: selectedRowKeys, [`${tableName}Data`]: tableData = [] } = props;
   if (commonUtils.isEmptyObject(selectedRowKeys)) {
     message.info("请先选中一条行车记录数据！");
     return;
   }
-  const rowDataIndex = tableData.findIndex(
-    item => item.sId === selectedRowKeys[0]
-  );
+  const rowDataIndex = tableData.findIndex(item => item.sId === selectedRowKeys[0]);
   if (rowDataIndex === -1) return;
   const rowData = tableData[rowDataIndex];
@@ -206,21 +245,17 @@ const mesTableLineAdd1 = (props, tableName) =&gt; {
   props.onSaveState(
     {
       [`${tableName}Data`]: tableDataNew,
-      [`${tableName}SelectedRowKeys`]: [rowDataCopy.sId]
+      [`${tableName}SelectedRowKeys`]: [rowDataCopy.sId],
     },
     nextProps => {
       const name = tableName;
       const { [`${name}Config`]: tableConfig = {} } = nextProps;
-      const rowClickConfig = tableConfig.gdsconfigformslave?.find(
-        item =>
-          item.sControlName &&
-          item.sControlName.toLowerCase().includes("rowclick")
-      );
+      const rowClickConfig = tableConfig.gdsconfigformslave?.find(item => item.sControlName && item.sControlName.toLowerCase().includes("rowclick"));
       if (!rowClickConfig) return;
       props.handleExecInstructSet({
         btnConfig: rowClickConfig,
-        nextProps: nextProps
+        nextProps: nextProps,
       });
     }
   );
@@ -228,9 +263,7 @@ const mesTableLineAdd1 = (props, tableName) =&gt; {
 // 研发工艺参数材料表新增
 const mesTableLineAdd2 = (props, tableName) => {
-  const oTab = document
-    .querySelector('.ant-tabs-tabpane-active[id*="研发工艺参数"]')
-    .querySelector(".ant-tabs-tab-active");
+  const oTab = document.querySelector('.ant-tabs-tabpane-active[id*="研发工艺参数"]').querySelector(".ant-tabs-tab-active");
   if (!oTab) return;
   const dataNodeKey = oTab.getAttribute("data-node-key") || "";
@@ -242,29 +275,23 @@ const mesTableLineAdd2 = (props, tableName) =&gt; {
     handleType: "add",
     sParentId: props.yftable0Data?.[0]?.sId || "",
     sRev,
-    bSave: 0
+    bSave: 0,
   };
   const { [`${tableName}Data`]: tableData = [] } = props;
   props.onSaveState({
-    [`${tableName}Data`]: [...tableData, newData]
+    [`${tableName}Data`]: [...tableData, newData],
   });
 };
 // 班组报工行车记录表格起始时间修改
 const mesTableChange1 = (props, tableName) => {
   // const tableName = "table0";
-  const {
-    [`${tableName}SelectedRowKeys`]: selectedRowKeys,
-    [`${tableName}Data`]: tableData = [],
-    rowDataOld
-  } = props;
+  const { [`${tableName}SelectedRowKeys`]: selectedRowKeys, [`${tableName}Data`]: tableData = [], rowDataOld } = props;
   let tableDataNew = lodash.cloneDeep(tableData);
-  const rowDataIndex = tableData.findIndex(
-    item => item.sId === selectedRowKeys[0]
-  );
+  const rowDataIndex = tableData.findIndex(item => item.sId === selectedRowKeys[0]);
   if (rowDataIndex === -1) return;
   const rowData = tableData[rowDataIndex];
@@ -275,30 +302,23 @@ const mesTableChange1 = (props, tableName) =&gt; {
     return;
   }
-  let parentRowDataIndex = tableData.findIndex(
-    item => item.sId !== sId && item.tStartDate === tStartDate
-  );
+  let parentRowDataIndex = tableData.findIndex(item => item.sId !== sId && item.tStartDate === tStartDate);
   if (parentRowDataIndex === -1) {
-    parentRowDataIndex = tableData.findIndex(
-      item => item.tStartDate === rowDataOld.tEndDate
-    );
+    parentRowDataIndex = tableData.findIndex(item => item.tStartDate === rowDataOld.tEndDate);
   }
   if (parentRowDataIndex === -1) return;
   const parentRowData = tableData[parentRowDataIndex];
-  const {
-    tStartDate: tStartDateParent,
-    tEndDate: tEndDateParent
-  } = parentRowData;
+  const { tStartDate: tStartDateParent, tEndDate: tEndDateParent } = parentRowData;
   // 检查tStartDate是否在tEndDate之前
   if (moment(tEndDate).isBefore(moment(tStartDate))) {
     message.info("结束时间不能小于起始时间！", 3);
     tableDataNew[rowDataIndex] = rowDataOld;
     props.onSaveState({
-      [`${tableName}Data`]: tableDataNew
+      [`${tableName}Data`]: tableDataNew,
     });
     return;
   }
@@ -308,7 +328,7 @@ const mesTableChange1 = (props, tableName) =&gt; {
     message.info("结束不能大于父节点的结束时间！", 3);
     tableDataNew[rowDataIndex] = rowDataOld;
     props.onSaveState({
-      [`${tableName}Data`]: tableDataNew
+      [`${tableName}Data`]: tableDataNew,
     });
     return;
   }
@@ -318,7 +338,7 @@ const mesTableChange1 = (props, tableName) =&gt; {
     message.info("结束不能大于当前时间！", 3);
     tableDataNew[rowDataIndex] = rowDataOld;
     props.onSaveState({
-      [`${tableName}Data`]: tableDataNew
+      [`${tableName}Data`]: tableDataNew,
     });
     return;
   }
@@ -326,14 +346,13 @@ const mesTableChange1 = (props, tableName) =&gt; {
   // 父节点的结束时间改成当前行的起始时间
   tableDataNew[rowDataIndex].bUnChanged = false;
   tableDataNew[parentRowDataIndex].tStartDate = tEndDate;
-  tableDataNew[parentRowDataIndex].handleType =
-    tableDataNew[parentRowDataIndex].handleType || "update";
+  tableDataNew[parentRowDataIndex].handleType = tableDataNew[parentRowDataIndex].handleType || "update";
   // 时间倒序排序
   tableDataNew.sort((a, b) => new Date(b.tEndDate) - new Date(a.tEndDate));
   const addState = {
-    [`${tableName}Data`]: tableDataNew
+    [`${tableName}Data`]: tableDataNew,
   };
   props.onSaveState(addState);
@@ -353,32 +372,28 @@ const mesTableLineDel1 = async (props, tableName) =&gt; {
     if (commonUtils.isNotEmptyArr(tableData)) {
       const addState = {
         [`${tableName}SelectedRowKeys`]: [tableData[0].sId],
-        [`slave1SelectedRowKeys`]: [tableData[0].sAbnormalEventId]
+        [`slave1SelectedRowKeys`]: [tableData[0].sAbnormalEventId],
       };
       if (tableData.some(item => item.bUnChanged)) {
         addState[`${tableName}Data`] = tableData.map(item => ({
           ...item,
-          bUnChanged: undefined
+          bUnChanged: undefined,
         }));
       }
       props.onSaveState(addState);
       const name = tableName;
       const { [`${name}Config`]: tableConfig = {} } = props;
-      const rowClickConfig = tableConfig.gdsconfigformslave?.find(
-        item =>
-          item.sControlName &&
-          item.sControlName.toLowerCase().includes("rowclick")
-      );
+      const rowClickConfig = tableConfig.gdsconfigformslave?.find(item => item.sControlName && item.sControlName.toLowerCase().includes("rowclick"));
       if (!rowClickConfig) return;
       await awaitPromiseReturn();
       props.handleExecInstructSet({
         btnConfig: rowClickConfig,
         nextProps: {
           ...props,
-          [`${tableName}SelectedRowKeys`]: [tableData[0].sId]
-        }
+          [`${tableName}SelectedRowKeys`]: [tableData[0].sId],
+        },
       });
     }
     return;
@@ -386,10 +401,7 @@ const mesTableLineDel1 = async (props, tableName) =&gt; {
   // 找剩余数据中开始时间等于删除数据结束时间的那条数据
   const iIndex = tableData.findIndex(
-    item =>
-      !item.bUnChanged &&
-      (item.sSrcHourId === sSrcHourId || item.sId === sSrcHourId) &&
-      tEndDate === item.tStartDate
+    item => !item.bUnChanged && (item.sSrcHourId === sSrcHourId || item.sId === sSrcHourId) && tEndDate === item.tStartDate
   );
   if (iIndex === -1) {
     if (tableName === "table0") {
@@ -404,7 +416,7 @@ const mesTableLineDel1 = async (props, tableName) =&gt; {
   tableDataNew[iIndex].tStartDate = tStartDate;
   tableDataNew[iIndex].handleType = tableDataNew[iIndex].handleType || "update";
   const addState = {
-    [`${tableName}Data`]: tableDataNew
+    [`${tableName}Data`]: tableDataNew,
   };
   props.onSaveState(addState);
@@ -424,73 +436,67 @@ const handleMesSave = props =&gt; {
       sInstruct: JSON.stringify([
         {
           opr: "newempty",
-          newDataset: "NewReportSlave"
+          newDataset: "NewReportSlave",
         },
         {
           opr: "edit",
           desDataset: "NewReportSlave",
           dataset: "table0@sec",
-          sValue:
-            "sNewReportSlaveId:table0.sId,sSrcHourId:table0.sSrcHourId,tEndDate:table0.tEndDate"
+          sValue: "sNewReportSlaveId:table0.sId,sSrcHourId:table0.sSrcHourId,tEndDate:table0.tEndDate",
         },
         {
           opr: "filter",
           srcDataset: "table0",
           newDataset: "OldReportSlave",
           dataset: "NewReportSlave,table0One",
-          condition: "'${table0One.sId}'=='${NewReportSlave.sSrcHourId}'"
+          condition: "'${table0One.sId}'=='${NewReportSlave.sSrcHourId}'",
         },
         {
           opr: "newempty",
-          newDataset: "temp0"
+          newDataset: "temp0",
         },
         {
           opr: "edit",
           desDataset: "temp0",
           dataset: "NewReportSlave,OldReportSlave",
           sValue:
-            "iOperateType:${1},sNewReportSlaveId:NewReportSlave.sNewReportSlaveId,sOldReportSlaveId:OldReportSlave.sId,tNewEndDate:NewReportSlave.tEndDate"
+            "iOperateType:${1},sNewReportSlaveId:NewReportSlave.sNewReportSlaveId,sOldReportSlaveId:OldReportSlave.sId,tNewEndDate:NewReportSlave.tEndDate",
         },
         {
           opr: "exesql",
           data: [
             {
-              sql:
-                "call Sp_mes_Operate_ProductionReport(${iOperateType},${sNewReportSlaveId},${sOldReportSlaveId},${tNewEndDate})",
-              srcDataset: "temp0"
-            }
-          ]
+              sql: "call Sp_mes_Operate_ProductionReport(${iOperateType},${sNewReportSlaveId},${sOldReportSlaveId},${tNewEndDate})",
+              srcDataset: "temp0",
+            },
+          ],
         },
         {
           opr: "save",
           data: [
             {
               tablename: "mftproductionreportslave",
-              srcDataset: "table0"
-            }
-          ]
+              srcDataset: "table0",
+            },
+          ],
         },
         {
           opr: "refresh",
-          dataset: "table0,table1,table4,table0NotFirstlineSelected"
-        }
-      ])
+          dataset: "table0,table1,table4,table0NotFirstlineSelected",
+        },
+      ]),
     },
     inscallback: async () => {
       const name = "table0";
       const { [`${name}Config`]: tableConfig = {} } = props;
-      const rowClickConfig = tableConfig.gdsconfigformslave?.find(
-        item =>
-          item.sControlName &&
-          item.sControlName.toLowerCase().includes("rowclick")
-      );
+      const rowClickConfig = tableConfig.gdsconfigformslave?.find(item => item.sControlName && item.sControlName.toLowerCase().includes("rowclick"));
       if (!rowClickConfig) return;
       await awaitPromiseReturn();
       props.handleExecInstructSet({
         btnConfig: rowClickConfig,
-        nextProps: props
+        nextProps: props,
       });
-    }
+    },
   });
 };
@@ -513,25 +519,24 @@ const handleMesSlave0Save = props =&gt; {
       sInstruct: JSON.stringify([
         {
           opr: "newempty",
-          newDataset: "NewReportSlave"
+          newDataset: "NewReportSlave",
         },
         {
           opr: "edit",
           desDataset: "NewReportSlave",
           dataset: "slave0@sec",
-          sValue:
-            "sNewReportSlaveId:slave0.sId,sSrcHourId:slave0.sSrcHourId,tEndDate:slave0.tEndDate"
+          sValue: "sNewReportSlaveId:slave0.sId,sSrcHourId:slave0.sSrcHourId,tEndDate:slave0.tEndDate",
         },
         {
           opr: "filter",
           srcDataset: "slave0",
           newDataset: "OldReportSlave",
           dataset: "NewReportSlave,slave0One",
-          condition: "'${slave0One.sId}'=='${NewReportSlave.sSrcHourId}'"
+          condition: "'${slave0One.sId}'=='${NewReportSlave.sSrcHourId}'",
         },
         {
           opr: "newempty",
-          newDataset: "temp0"
+          newDataset: "temp0",
         },
         {
@@ -539,48 +544,43 @@ const handleMesSlave0Save = props =&gt; {
           desDataset: "temp0",
           dataset: "NewReportSlave,OldReportSlave",
           sValue:
-            "iOperateType:${1},sNewReportSlaveId:NewReportSlave.sNewReportSlaveId,sOldReportSlaveId:OldReportSlave.sId,tNewEndDate:NewReportSlave.tEndDate"
+            "iOperateType:${1},sNewReportSlaveId:NewReportSlave.sNewReportSlaveId,sOldReportSlaveId:OldReportSlave.sId,tNewEndDate:NewReportSlave.tEndDate",
         },
         {
           opr: "exesql",
           data: [
             {
-              sql:
-                "call Sp_mes_Operate_ProductionReport(${iOperateType},${sNewReportSlaveId},${sOldReportSlaveId},${tNewEndDate})",
-              srcDataset: "temp0"
-            }
-          ]
+              sql: "call Sp_mes_Operate_ProductionReport(${iOperateType},${sNewReportSlaveId},${sOldReportSlaveId},${tNewEndDate})",
+              srcDataset: "temp0",
+            },
+          ],
         },
         {
           opr: "save",
           data: [
             {
               tablename: "mftproductionreportslave",
-              srcDataset: "slave0"
-            }
-          ]
+              srcDataset: "slave0",
+            },
+          ],
         },
         {
           opr: "refresh",
-          dataset: "slave0,slave0NotFirstlineSelected"
-        }
-      ])
+          dataset: "slave0,slave0NotFirstlineSelected",
+        },
+      ]),
     },
     inscallback: async nextProps => {
       const name = "slave0";
       const { [`${name}Config`]: tableConfig = {} } = props;
-      const rowClickConfig = tableConfig.gdsconfigformslave?.find(
-        item =>
-          item.sControlName &&
-          item.sControlName.toLowerCase().includes("rowclick")
-      );
+      const rowClickConfig = tableConfig.gdsconfigformslave?.find(item => item.sControlName && item.sControlName.toLowerCase().includes("rowclick"));
       if (!rowClickConfig) return;
       await awaitPromiseReturn();
       props.handleExecInstructSet({
         btnConfig: rowClickConfig,
-        nextProps: nextProps
+        nextProps: nextProps,
       });
-    }
+    },
   });
 };
@@ -590,7 +590,7 @@ const handleMesSave1 = (props, delRow) =&gt; {
   const temp0Data = [];
   temp0Data.push({
     sNewReportSlaveId: delRow.sId,
-    sOldReportSlaveId: delRow.sSrcHourId
+    sOldReportSlaveId: delRow.sSrcHourId,
   });
   props.handleExecInstructSet({
@@ -602,11 +602,10 @@ const handleMesSave1 = (props, delRow) =&gt; {
           opr: "exesql",
           data: [
             {
-              sql:
-                "call Sp_mes_Operate_ProductionReport(2,${sNewReportSlaveId},${sOldReportSlaveId},null)",
-              srcDataset: "temp0"
-            }
-          ]
+              sql: "call Sp_mes_Operate_ProductionReport(2,${sNewReportSlaveId},${sOldReportSlaveId},null)",
+              srcDataset: "temp0",
+            },
+          ],
         },
         // {
@@ -633,25 +632,21 @@ const handleMesSave1 = (props, delRow) =&gt; {
         // },
         {
           opr: "refresh",
-          dataset: "table0,table1,table4,tableS1,table0FirstlineSelected"
-        }
-      ])
+          dataset: "table0,table1,table4,tableS1,table0FirstlineSelected",
+        },
+      ]),
     },
     inscallback: async nextProps => {
       const name = "table0";
       const { [`${name}Config`]: tableConfig = {} } = props;
-      const rowClickConfig = tableConfig.gdsconfigformslave?.find(
-        item =>
-          item.sControlName &&
-          item.sControlName.toLowerCase().includes("rowclick")
-      );
+      const rowClickConfig = tableConfig.gdsconfigformslave?.find(item => item.sControlName && item.sControlName.toLowerCase().includes("rowclick"));
       if (!rowClickConfig) return;
       await awaitPromiseReturn();
       props.handleExecInstructSet({
         btnConfig: rowClickConfig,
-        nextProps: nextProps
+        nextProps: nextProps,
       });
-    }
+    },
   });
 };
@@ -661,7 +656,7 @@ const handleMesSlave0Save1 = (props, delRow) =&gt; {
   const temp0Data = [];
   temp0Data.push({
     sNewReportSlaveId: delRow.sId,
-    sOldReportSlaveId: delRow.sSrcHourId
+    sOldReportSlaveId: delRow.sSrcHourId,
   });
   props.handleExecInstructSet({
@@ -680,51 +675,40 @@ const handleMesSlave0Save1 = (props, delRow) =&gt; {
           opr: "exesql",
           data: [
             {
-              sql:
-                "call Sp_mes_Operate_ProductionReport(2,${sNewReportSlaveId},${sOldReportSlaveId},null)",
-              srcDataset: "temp0"
-            }
-          ]
+              sql: "call Sp_mes_Operate_ProductionReport(2,${sNewReportSlaveId},${sOldReportSlaveId},null)",
+              srcDataset: "temp0",
+            },
+          ],
         },
         {
           opr: "refresh",
-          dataset: "slave0,slave0FirstlineSelected"
-        }
-      ])
+          dataset: "slave0,slave0FirstlineSelected",
+        },
+      ]),
     },
     inscallback: async nextProps => {
       const name = "slave0";
       const { [`${name}Config`]: tableConfig = {} } = props;
-      const rowClickConfig = tableConfig.gdsconfigformslave?.find(
-        item =>
-          item.sControlName &&
-          item.sControlName.toLowerCase().includes("rowclick")
-      );
+      const rowClickConfig = tableConfig.gdsconfigformslave?.find(item => item.sControlName && item.sControlName.toLowerCase().includes("rowclick"));
       if (!rowClickConfig) return;
       await awaitPromiseReturn();
       props.handleExecInstructSet({
         btnConfig: rowClickConfig,
-        nextProps: nextProps
+        nextProps: nextProps,
       });
-    }
+    },
   });
 };
 // 班组报工托盘计数信息按钮
 const mesGetBtnsConfig1 = props => {
-  const {
-    table0Data = [],
-    table0SelectedRowKeys = [],
-    btnsConfig = []
-  } = props;
+  const { table0Data = [], table0SelectedRowKeys = [], btnsConfig = [] } = props;
   if (!table0SelectedRowKeys.length) {
     return [];
   }
-  const table0Row = table0Data.find(
-    item => item.sId === table0SelectedRowKeys[0]
-  );
+  const table0Row = table0Data.find(item => item.sId === table0SelectedRowKeys[0]);
   const sSrcHourId = table0Row?.sSrcHourId;
   // 是否新纪录
@@ -740,16 +724,9 @@ const mesGetBtnsConfig1 = props =&gt; {
 // 班组报工托盘计数信息按钮点击事件
 const mesTableBtnClick1 = props => {
-  const {
-    sControlName,
-    table0Data = [],
-    table0SelectedRowKeys = [],
-    params
-  } = props;
+  const { sControlName, table0Data = [], table0SelectedRowKeys = [], params } = props;
   const { record } = params;
-  const table0Row = table0Data.find(
-    item => item.sId === table0SelectedRowKeys[0]
-  );
+  const table0Row = table0Data.find(item => item.sId === table0SelectedRowKeys[0]);
   const { sId, sSrcHourId, tStartDate, tEndDate } = table0Row;
   let table0RowNext;
@@ -757,21 +734,13 @@ const mesTableBtnClick1 = props =&gt; {
     // 调至下段
     table0RowNext = table0Data.find(
       item =>
-        !item.bUnChanged &&
-        item.tStartDate === tEndDate &&
-        (item.sId === sSrcHourId ||
-          item.sSrcHourId === sSrcHourId ||
-          item.sSrcHourId === sId)
+        !item.bUnChanged && item.tStartDate === tEndDate && (item.sId === sSrcHourId || item.sSrcHourId === sSrcHourId || item.sSrcHourId === sId)
     );
   } else {
     // 调至上段
     table0RowNext = table0Data.find(
       item =>
-        !item.bUnChanged &&
-        item.tEndDate === tStartDate &&
-        (item.sId === sSrcHourId ||
-          item.sSrcHourId === sSrcHourId ||
-          item.sSrcHourId === sId)
+        !item.bUnChanged && item.tEndDate === tStartDate && (item.sId === sSrcHourId || item.sSrcHourId === sSrcHourId || item.sSrcHourId === sId)
     );
   }
@@ -779,7 +748,7 @@ const mesTableBtnClick1 = props =&gt; {
   temp0Data.push({
     sNewReportSlaveId: sId,
     sOldReportSlaveId: table0RowNext.sId,
-    sTrayOutId: record.sId
+    sTrayOutId: record.sId,
   });
   props.onExecInstructSet({
@@ -793,16 +762,16 @@ const mesTableBtnClick1 = props =&gt; {
             {
               sql:
                 "update mftplctray A  SET A.sReportTrayId= ${sOldReportSlaveId} WHERE A.sReportTrayId=${sNewReportSlaveId}  and A.sTrayOutId=${sTrayOutId}",
-              srcDataset: "temp0"
-            }
-          ]
+              srcDataset: "temp0",
+            },
+          ],
         },
         {
           opr: "refresh",
-          dataset: "table1"
-        }
-      ])
-    }
+          dataset: "table1",
+        },
+      ]),
+    },
   });
 };
@@ -833,7 +802,7 @@ const mesTableBtnClick2 = props =&gt; {
     tableS5Data: [],
     tableS8Data: [],
     tableS9Data: [],
-    tableS10Data: []
+    tableS10Data: [],
   });
   const oTabs = document.querySelectorAll(`.ant-tabs-tab-btn[id*="生产日报"]`);
@@ -850,7 +819,7 @@ const mesTableBtnClick3 = props =&gt; {
   if (bHourlyReport) {
     props.onExecInstructSet({
       nextProps: props,
-      btnConfig: config
+      btnConfig: config,
     });
     return;
   }
@@ -868,22 +837,20 @@ const mesTableBtnClick3 = props =&gt; {
   props.onSaveState({
     table0SelectedRowKeys: [],
     table4Data: [],
-    table13Data: []
+    table13Data: [],
   });
   setTimeout(() => {
     props.onTableSelectRowChange("table0", [table0Data[iIndex].sId]);
     props.onSaveState({
-      refreshTableList: ["table0,table0NotFirstlineSelected"]
+      refreshTableList: ["table0,table0NotFirstlineSelected"],
     });
   }, 200);
   const oTabs = document.querySelectorAll(`.ant-tabs-tab-btn[id*="班组报工"]`);
   oTabs?.[0]?.click();
   setTimeout(() => {
-    const oTabs1 = document.querySelectorAll(
-      `.ant-tabs-tab-btn[id*="产量上报信息"]`
-    );
+    const oTabs1 = document.querySelectorAll(`.ant-tabs-tab-btn[id*="产量上报信息"]`);
     oTabs1?.[0]?.click();
   }, 200);
 };
@@ -892,10 +859,7 @@ const mesTableBtnClick3 = props =&gt; {
 const handleSlaveWypj2BtnPre = props => {
   const listName = "slaveWypj2";
   const tableName = "slaveWypj3";
-  const {
-    [`${listName}Data`]: listData = [],
-    [`${tableName}Data`]: tableData = []
-  } = props;
+  const { [`${listName}Data`]: listData = [], [`${tableName}Data`]: tableData = [] } = props;
   const [rowData = {}] = listData;
@@ -910,23 +874,21 @@ const handleSlaveWypj2BtnPre = props =&gt; {
     return;
   }
-  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(
-    item => item.sControlName === "BtnTable.View"
-  )?.sInstruct;
+  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(item => item.sControlName === "BtnTable.View")?.sInstruct;
   if (!sInstructStr) return;
   const selectedRowKeys = [tableData[iIndex - 1].sId];
   props.onSaveState(
     {
-      [`${tableName}SelectedRowKeys`]: selectedRowKeys
+      [`${tableName}SelectedRowKeys`]: selectedRowKeys,
     },
     nextProps => {
       props.onExecInstructSet({
         nextProps: nextProps,
         btnConfig: {
           showName: "上一卷",
-          sInstruct: sInstructStr
-        }
+          sInstruct: sInstructStr,
+        },
       });
     }
   );
@@ -936,10 +898,7 @@ const handleSlaveWypj2BtnPre = props =&gt; {
 const handleSlaveWypj2BtnNext = props => {
   const listName = "slaveWypj2";
   const tableName = "slaveWypj3";
-  const {
-    [`${listName}Data`]: listData = [],
-    [`${tableName}Data`]: tableData = []
-  } = props;
+  const { [`${listName}Data`]: listData = [], [`${tableName}Data`]: tableData = [] } = props;
   const [rowData = {}] = listData;
@@ -954,23 +913,21 @@ const handleSlaveWypj2BtnNext = props =&gt; {
     return;
   }
-  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(
-    item => item.sControlName === "BtnTable.View"
-  )?.sInstruct;
+  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(item => item.sControlName === "BtnTable.View")?.sInstruct;
   if (!sInstructStr) return;
   const selectedRowKeys = [tableData[iIndex + 1].sId];
   props.onSaveState(
     {
-      [`${tableName}SelectedRowKeys`]: selectedRowKeys
+      [`${tableName}SelectedRowKeys`]: selectedRowKeys,
     },
     nextProps => {
       props.onExecInstructSet({
         nextProps: nextProps,
         btnConfig: {
           showName: "下一卷",
-          sInstruct: sInstructStr
-        }
+          sInstruct: sInstructStr,
+        },
       });
     }
   );
@@ -980,10 +937,7 @@ const handleSlaveWypj2BtnNext = props =&gt; {
 const handleSalveWydm2BtnPre = props => {
   const listName = "salveWydm2";
   const tableName = "salveWydm3";
-  const {
-    [`${listName}Data`]: listData = [],
-    [`${tableName}Data`]: tableData = []
-  } = props;
+  const { [`${listName}Data`]: listData = [], [`${tableName}Data`]: tableData = [] } = props;
   const [rowData = {}] = listData;
@@ -998,23 +952,21 @@ const handleSalveWydm2BtnPre = props =&gt; {
     return;
   }
-  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(
-    item => item.sControlName === "BtnReelView"
-  )?.sInstruct;
+  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(item => item.sControlName === "BtnReelView")?.sInstruct;
   if (!sInstructStr) return;
   const selectedRowKeys = [tableData[iIndex - 1].sId];
   props.onSaveState(
     {
-      [`${tableName}SelectedRowKeys`]: selectedRowKeys
+      [`${tableName}SelectedRowKeys`]: selectedRowKeys,
     },
     nextProps => {
       props.onExecInstructSet({
         nextProps: nextProps,
         btnConfig: {
           showName: "上一版",
-          sInstruct: sInstructStr
-        }
+          sInstruct: sInstructStr,
+        },
       });
     }
   );
@@ -1024,10 +976,7 @@ const handleSalveWydm2BtnPre = props =&gt; {
 const handleSalveWydm2BtnNext = props => {
   const listName = "salveWydm2";
   const tableName = "salveWydm3";
-  const {
-    [`${listName}Data`]: listData = [],
-    [`${tableName}Data`]: tableData = []
-  } = props;
+  const { [`${listName}Data`]: listData = [], [`${tableName}Data`]: tableData = [] } = props;
   const [rowData = {}] = listData;
@@ -1042,23 +991,21 @@ const handleSalveWydm2BtnNext = props =&gt; {
     return;
   }
-  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(
-    item => item.sControlName === "BtnReelView"
-  )?.sInstruct;
+  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(item => item.sControlName === "BtnReelView")?.sInstruct;
   if (!sInstructStr) return;
   const selectedRowKeys = [tableData[iIndex + 1].sId];
   props.onSaveState(
     {
-      [`${tableName}SelectedRowKeys`]: selectedRowKeys
+      [`${tableName}SelectedRowKeys`]: selectedRowKeys,
     },
     nextProps => {
       props.onExecInstructSet({
         nextProps: nextProps,
         btnConfig: {
           showName: "下一版",
-          sInstruct: sInstructStr
-        }
+          sInstruct: sInstructStr,
+        },
       });
     }
   );
@@ -1068,15 +1015,11 @@ const handleSalveWydm2BtnNext = props =&gt; {
 const handleSlaveWyrj2BtnPre = props => {
   const listName = "slaveWyrj2";
   const tableName = "slaveWyrj3";
-  const {
-    [`${listName}Data`]: listData = [],
-    [`${tableName}Data`]: tableData = []
-  } = props;
+  const { [`${listName}Data`]: listData = [], [`${tableName}Data`]: tableData = [] } = props;
   const [rowData = {}] = listData;
   const iIndex = tableData.findIndex(item => item.sId === rowData.sId);
-  console.log("=====rowData", rowData, tableData);
   if (iIndex === -1) {
     message.info("暂无数据！");
     return;
@@ -1087,23 +1030,21 @@ const handleSlaveWyrj2BtnPre = props =&gt; {
     return;
   }
-  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(
-    item => item.sControlName === "BtnReelView"
-  )?.sInstruct;
+  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(item => item.sControlName === "BtnReelView")?.sInstruct;
   if (!sInstructStr) return;
   const selectedRowKeys = [tableData[iIndex - 1].sId];
   props.onSaveState(
     {
-      [`${tableName}SelectedRowKeys`]: selectedRowKeys
+      [`${tableName}SelectedRowKeys`]: selectedRowKeys,
     },
     nextProps => {
       props.onExecInstructSet({
         nextProps: nextProps,
         btnConfig: {
           showName: "上一版",
-          sInstruct: sInstructStr
-        }
+          sInstruct: sInstructStr,
+        },
       });
     }
   );
@@ -1113,10 +1054,7 @@ const handleSlaveWyrj2BtnPre = props =&gt; {
 const handleSlaveWyrj2BtnNext = props => {
   const listName = "slaveWyrj2";
   const tableName = "slaveWyrj3";
-  const {
-    [`${listName}Data`]: listData = [],
-    [`${tableName}Data`]: tableData = []
-  } = props;
+  const { [`${listName}Data`]: listData = [], [`${tableName}Data`]: tableData = [] } = props;
   const [rowData = {}] = listData;
@@ -1131,23 +1069,21 @@ const handleSlaveWyrj2BtnNext = props =&gt; {
     return;
   }
-  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(
-    item => item.sControlName === "BtnReelView"
-  )?.sInstruct;
+  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(item => item.sControlName === "BtnReelView")?.sInstruct;
   if (!sInstructStr) return;
   const selectedRowKeys = [tableData[iIndex + 1].sId];
   props.onSaveState(
     {
-      [`${tableName}SelectedRowKeys`]: selectedRowKeys
+      [`${tableName}SelectedRowKeys`]: selectedRowKeys,
     },
     nextProps => {
       props.onExecInstructSet({
         nextProps: nextProps,
         btnConfig: {
           showName: "下一版",
-          sInstruct: sInstructStr
-        }
+          sInstruct: sInstructStr,
+        },
       });
     }
   );
@@ -1159,10 +1095,7 @@ const handleUpDownData = props =&gt; {
   const listName = showTableName;
   const tableName = showTableName.substr(0, showTableName.length - 1) + 3;
-  const {
-    [`${listName}Data`]: listData = [],
-    [`${tableName}Data`]: tableData = []
-  } = props;
+  const { [`${listName}Data`]: listData = [], [`${tableName}Data`]: tableData = [] } = props;
   const [rowData = {}] = listData;
@@ -1177,36 +1110,31 @@ const handleUpDownData = props =&gt; {
     return;
   }
-  if (
-    ["BtnRight.NextCom"].includes(sFieldName) &&
-    iIndex === tableData.length - 1
-  ) {
+  if (["BtnRight.NextCom"].includes(sFieldName) && iIndex === tableData.length - 1) {
     message.info("已是最后一条数据！");
     return;
   }
-  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(
-    item => item.sControlName === "BtnReelView"
-  )?.sInstruct;
+  const sInstructStr = props[`${tableName}Config`]?.gdsconfigformslave.find(item => item.sControlName === "BtnReelView")?.sInstruct;
   if (!sInstructStr) return;
   const info = {
     "BtnRight.PriorCom": { index: iIndex - 1, message: "上一版" },
-    "BtnRight.NextCom": { index: iIndex + 1, message: "下一版" }
+    "BtnRight.NextCom": { index: iIndex + 1, message: "下一版" },
   }[sFieldName] || { index: iIndex, message: "当前" };
   const selectedRowKeys = [tableData[info.index].sId];
   props.onSaveState(
     {
-      [`${tableName}SelectedRowKeys`]: selectedRowKeys
+      [`${tableName}SelectedRowKeys`]: selectedRowKeys,
     },
     nextProps => {
       props.onExecInstructSet({
         nextProps: nextProps,
         btnConfig: {
           showName: info.message,
-          sInstruct: sInstructStr
-        }
+          sInstruct: sInstructStr,
+        },
       });
     }
   );
@@ -1220,7 +1148,7 @@ const mesTableChange2 = (props, tableName) =&gt; {
   delete tableDataNew[0].tConnectDate;
   props.onSaveState({
-    [`${tableName}Data`]: tableDataNew
+    [`${tableName}Data`]: tableDataNew,
   });
 };
@@ -1257,10 +1185,7 @@ const mesTableChange3 = (props, tableName) =&gt; {
   }
   const checkTime = moment(tConnectDate);
-  if (
-    !checkTime.isSameOrAfter(startTime) ||
-    !checkTime.isSameOrBefore(endTime)
-  ) {
+  if (!checkTime.isSameOrAfter(startTime) || !checkTime.isSameOrBefore(endTime)) {
     let msg = "";
     if (sShift === "1" || sShift === "白班") {
       if (bDelayedOvertime) {
@@ -1280,33 +1205,32 @@ const mesTableChange3 = (props, tableName) =&gt; {
   }
 };
-
 const handleGetRefreshStatus = props => {
   const { refreshTableListCount = 0 } = props;
   if (!refreshTableListCount) {
-    message.warning('请先等待页面初始化加载完成！');
+    message.warning("请先等待页面初始化加载完成！");
     return true;
   } else {
     return false;
   }
-}
+};
 // 质量巡检-巡检项目-所有巡检按钮
 const handleZlxjCheck = async (props, btnName) => {
   const { table0Data = [], table1Data = [], refreshTableListCount = 0 } = props;
   const { sTeamNo } = commonUtils.getAppData("userinfo");
   if (!refreshTableListCount) {
-    message.warning('请先等待页面初始化加载完成！');
+    message.warning("请先等待页面初始化加载完成！");
     return;
   }
   const typeList = {
-    "BtnRight.ipqcCheck": '2',
-    "BtnRight.qualityCheck": '3',
-    "BtnRight.foremanCheck": '4',
-    "BtnRight.managerCheck": '5',
-    "BtnRight.otherCheck": '6'
-  }
+    "BtnRight.ipqcCheck": "2",
+    "BtnRight.qualityCheck": "3",
+    "BtnRight.foremanCheck": "4",
+    "BtnRight.managerCheck": "5",
+    "BtnRight.otherCheck": "6",
+  };
   const sCurRole = typeList[btnName];
@@ -1314,39 +1238,37 @@ const handleZlxjCheck = async (props, btnName) =&gt; {
   if (!faceResult) return;
   const { name } = faceResult;
   if (!name) {
-    message.warning('人脸信息获取失败，请重新尝试！');
+    message.warning("人脸信息获取失败，请重新尝试！");
     return;
   }
   const table0DataNew = cloneDeep(table0Data);
   const table1DataNew = cloneDeep(table1Data);
   table0DataNew[0].sCurRole = sCurRole;
-  table0DataNew[0].handleType = table0DataNew[0].handleType || 'update';
+  table0DataNew[0].handleType = table0DataNew[0].handleType || "update";
   table1DataNew.unshift({
     sId: commonUtils.createSid(),
-    handleType: 'add',
+    handleType: "add",
     sSReserve1: sCurRole,
     bSave: 1,
     sParentId: table0Data[0].sId,
-    tPollingTime: moment().format('YYYY-MM-DD HH:mm:ss'),
+    tPollingTime: moment().format("YYYY-MM-DD HH:mm:ss"),
     sPollingPerson: name,
-    sGroup: sTeamNo.substr(sTeamNo.length - 1, 1) === 'A' ? 'A' : 'B'
+    sGroup: sTeamNo.substr(sTeamNo.length - 1, 1) === "A" ? "A" : "B",
   });
   props.onSaveState({
     userfaceData: [faceResult],
     tempUserName: name,
     table0Data: table0DataNew,
-    table1Data: table1DataNew
+    table1Data: table1DataNew,
   });
-}
+};
 let loginInfo = {};
 const sModelsId = "16034339700006038392152714521000";
-const mesSysbrands = commonUtils.convertStrToObj(
-  localStorage.getItem("mesSysbrands")
-);
+const mesSysbrands = commonUtils.convertStrToObj(localStorage.getItem("mesSysbrands"));
 const handleGetFormItem = (props, item) => {
   let enabledNew = true;
@@ -1374,32 +1296,28 @@ const handleGetFormItem = (props, item) =&gt; {
     onFilterDropDownData: props.onFilterDropDownData,
     onSaveState: props.onSaveState,
     bPassWord: item.sName === "sPassWord",
-    style: { backgroundColor: "#eaeaea" }
+    style: { backgroundColor: "#eaeaea" },
   };
   return (
-    <Form.Item
-      label={item.sName === "sUserName" ? "账号" : item.showName}
-      key={item.sName}
-    >
+    <Form.Item label={item.sName === "sUserName" ? "账号" : item.showName} key={item.sName}>
       <ShowType {...showTypeProps} />
     </Form.Item>
   );
 };
-const getFaceResult = async (props) => {
+const getFaceResult = async props => {
   let faceResult = false;
-
-  const selectMethod = commonFunc.showLocalMessage(props, 'selectMethod', '请选择验证方式');
-  const FriendlyReminder = commonFunc.showLocalMessage(props, 'FriendlyReminder', '温馨提示');
-  const accountPwd = commonFunc.showLocalMessage(props, 'account', '账号密码');
-  const faceRecognition = commonFunc.showLocalMessage(props, 'faceRecognition', '人脸识别');
-  const btnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
-  const btnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确定');
-  const enterAccountPwd = commonFunc.showLocalMessage(props, 'enterAccountPwd', '请输入账号密码');
-  const nameNotEmpty = commonFunc.showLocalMessage(props, 'NameNotEmpty', '账号/姓名不能为空！');
-  const passwordNotEmpty = commonFunc.showLocalMessage(props, 'PasswordNotEmpty', '密码不能为空！');
-  const account = commonFunc.showLocalMessage(props, 'account', '账号');
+  const selectMethod = commonFunc.showLocalMessage(props, "selectMethod", "请选择验证方式");
+  const FriendlyReminder = commonFunc.showLocalMessage(props, "FriendlyReminder", "温馨提示");
+  const accountPwd = commonFunc.showLocalMessage(props, "account", "账号密码");
+  const faceRecognition = commonFunc.showLocalMessage(props, "faceRecognition", "人脸识别");
+  const btnCancel = commonFunc.showLocalMessage(props, "BtnCancel", "取消");
+  const btnSure = commonFunc.showLocalMessage(props, "BtnSure", "确定");
+  const enterAccountPwd = commonFunc.showLocalMessage(props, "enterAccountPwd", "请输入账号密码");
+  const nameNotEmpty = commonFunc.showLocalMessage(props, "NameNotEmpty", "账号/姓名不能为空！");
+  const passwordNotEmpty = commonFunc.showLocalMessage(props, "PasswordNotEmpty", "密码不能为空！");
+  const account = commonFunc.showLocalMessage(props, "account", "账号");
   const loginType = await new Promise(resolve => {
     Modal.confirm({
       title: FriendlyReminder,
@@ -1419,7 +1337,7 @@ const getFaceResult = async (props) =&gt; {
         } else {
           resolve(0);
         }
-      }
+      },
     });
   });
@@ -1444,27 +1362,20 @@ const getFaceResult = async (props) =&gt; {
         okText: btnCancel,
         onOk() {
           resolve(false);
-        }
+        },
       });
     });
   } else if (loginType === 2) {
     // 账号密码登陆
     let loginConfig;
-    const configUrl = `${commonConfig.server_host
-      }business/getModelBysId/${sModelsId}?sModelsId=${sModelsId}&sName=/commonAuto`;
-    const configReturn = (await commonServices.getService("", configUrl))
-      .data;
+    const configUrl = `${commonConfig.server_host}business/getModelBysId/${sModelsId}?sModelsId=${sModelsId}&sName=/commonAuto`;
+    const configReturn = (await commonServices.getService("", configUrl)).data;
     if (configReturn.code === 1) {
       const dataReturn = configReturn.dataset.rows;
       if (commonUtils.isNotEmptyArr(dataReturn)) {
         const { formData } = dataReturn[0];
         if (commonUtils.isNotEmptyArr(formData)) {
-          loginConfig = formData[0].gdsconfigformslave.filter(
-            item =>
-              item.bVisible &&
-              item.sName &&
-              ["sUserName", "sPassWord"].includes(item.sName)
-          );
+          loginConfig = formData[0].gdsconfigformslave.filter(item => item.bVisible && item.sName && ["sUserName", "sPassWord"].includes(item.sName));
         }
       }
     } else {
@@ -1496,34 +1407,31 @@ const getFaceResult = async (props) =&gt; {
             }
             const { sBrandsId, sSubsidiaryId } = mesSysbrands;
-            const url = `${commonConfig.server_host
-              }userloginUserNo/${sBrandsId}/${sSubsidiaryId}`;
+            const url = `${commonConfig.server_host}userloginUserNo/${sBrandsId}/${sSubsidiaryId}`;
             const value = {
               username: loginInfo.sUserNo || loginInfo.sUserName,
-              password: loginInfo.sPassWord
+              password: loginInfo.sPassWord,
             };
-            commonServices
-              .postValueService(null, value, url)
-              .then(({ data: dataReturn }) => {
-                const { msg, code, dataset } = dataReturn;
-                if (code !== 1) {
-                  message.error(msg);
-                  return;
-                }
-
-                if (commonUtils.isNotEmptyObject(msg)) {
-                  message.warning(msg, 6);
-                }
-
-                const result = dataset.rows[0];
-                resolve(result);
-              });
+            commonServices.postValueService(null, value, url).then(({ data: dataReturn }) => {
+              const { msg, code, dataset } = dataReturn;
+              if (code !== 1) {
+                message.error(msg);
+                return;
+              }
+
+              if (commonUtils.isNotEmptyObject(msg)) {
+                message.warning(msg, 6);
+              }
+
+              const result = dataset.rows[0];
+              resolve(result);
+            });
           }
         },
         onCancel() {
           resolve(false);
-        }
+        },
       });
     });
   }
@@ -1532,7 +1440,7 @@ const getFaceResult = async (props) =&gt; {
 };
 // 质量巡检-巡检项目-完成/修改
-const mesTableBtnClick4 = async (props) => {
+const mesTableBtnClick4 = async props => {
   const { params = {}, table0Data = [], table1Data = [], tempUserName } = props;
   const { config = {}, record } = params;
   const { sControlName } = config;
@@ -1556,7 +1464,7 @@ const mesTableBtnClick4 = async (props) =&gt; {
       table1Data: table1Data.map(item => {
         return item.sId === record.sId ? { ...item, bSave: 1 } : item;
       }),
-    })
+    });
   } else if (sControlName === "BtnFinish") {
     const bHasX = Object.keys(record).some(key => key?.startsWith("sItem") && record[key] === "✗");
     if (bHasX && !sQualityDeg) {
@@ -1566,18 +1474,18 @@ const mesTableBtnClick4 = async (props) =&gt; {
     const iIndex = table1Data.findIndex(item => item.sId === record.sId);
     table1Data[iIndex].bSave = 0;
-    table1Data[iIndex].handleType = table1Data[iIndex].handleType || 'update'
+    table1Data[iIndex].handleType = table1Data[iIndex].handleType || "update";
     if (table1Data[iIndex].sSReserve1 === "1") {
       table1Data[iIndex].sPollingPerson = sUserName;
     }
     if (table1Data[iIndex].tPollingTime) {
-      table1Data[iIndex].tSReserve1 = moment().format('YYYY-MM-DD HH:mm:ss');
+      table1Data[iIndex].tSReserve1 = moment().format("YYYY-MM-DD HH:mm:ss");
     }
     if (!table1Data[iIndex].tPollingTime) {
-      table1Data[iIndex].tPollingTime = moment().format('YYYY-MM-DD HH:mm:ss');
+      table1Data[iIndex].tPollingTime = moment().format("YYYY-MM-DD HH:mm:ss");
     }
-    const addState1 = { table0Data: table0Data.map(item => ({ ...item, bSave: 0, handleType: item.handleType || 'update' })), table1Data };
+    const addState1 = { table0Data: table0Data.map(item => ({ ...item, bSave: 0, handleType: item.handleType || "update" })), table1Data };
     props.onSaveState({ tempUserName: undefined, ...addState1 });
     props.onExecInstructSet({
@@ -1587,22 +1495,306 @@ const mesTableBtnClick4 = async (props) =&gt; {
         sInstruct: JSON.stringify([
           {
             opr: "save",
-            doNotRefresh: true,
+            // doNotRefresh: true,
             data: [
               {
                 tablename: "qlyqualityinspectionmaster",
-                srcDataset: "table0"
+                srcDataset: "table0",
               },
               {
                 tablename: "qlyqualityinspectionslave",
-                srcDataset: "table1"
-              }
-            ]
-          }
-        ])
-      }
+                srcDataset: "table1",
+              },
+            ],
+          },
+        ]),
+      },
+    });
+  }
+};
+
+// 完工情场确认-车间领班审核
+const handleCjlbshCheck = async props => {
+  const faceResult = await getFaceResult(props);
+
+  if (!faceResult) return;
+
+  const { name } = faceResult;
+  const { slave0Config, slave0Data = [] } = props;
+  const filterConfig = slave0Config?.gdsconfigformslave?.filter(item => {
+    return item.sName === "sForemanCheckMemo";
+  });
+
+  const returnData = await new Promise(resolve => {
+    props.onSaveState({
+      commonRepairModalParams: {
+        visible: true,
+        title: "领班审核备注",
+        tableName: "slave0",
+        config: slave0Config,
+        record: { ...slave0Data[0], bSubmit: 0 },
+        filterConfig,
+        callback: rowData => {
+          resolve(rowData);
+        },
+      },
+    });
+  });
+
+  if (commonUtils.isEmptyObject(returnData)) return;
+
+  const slave0DataNew = [
+    {
+      ...returnData,
+      bSubmit: 1,
+      tForemanCheckDate: moment().format("YYYY-MM-DD HH:mm:ss"),
+      sForemanCheckPerson: name,
+      bForemanCheck: 1,
+      handleType: returnData.handleType || "update",
+    },
+  ];
+
+  props.onSaveState({ slave0Data: slave0DataNew });
+  props.onExecInstructSet({
+    nextProps: { ...props, slave0Data: slave0DataNew },
+    btnConfig: {
+      showName: "保存",
+      sInstruct: JSON.stringify([
+        {
+          opr: "save",
+          doNotRefresh: true,
+          data: [
+            {
+              tablename: "EptCompletionSiteClearanceMaster",
+              srcDataset: "slave0",
+            },
+          ],
+        },
+      ]),
+    },
+  });
+};
+
+// 完工情场确认-车间领班反审
+const handleCjlbfsCheck = async props => {
+  const faceResult = await getFaceResult(props);
+  if (!faceResult) return;
+
+  const { slave0Data = [] } = props;
+
+  const slave0DataNew = [{ ...slave0Data[0], bForemanCheck: 0, bIPQCCheck: 0, handleType: slave0Data[0].handleType || "update" }];
+
+  props.onSaveState({ slave0Data: slave0DataNew });
+  props.onExecInstructSet({
+    nextProps: { ...props, slave0Data: slave0DataNew },
+    btnConfig: {
+      showName: "保存",
+      sInstruct: JSON.stringify([
+        {
+          opr: "save",
+          doNotRefresh: true,
+          data: [
+            {
+              tablename: "EptCompletionSiteClearanceMaster",
+              srcDataset: "slave0",
+            },
+          ],
+        },
+      ]),
+    },
+  });
+};
+
+// 完工情场确认-品管审核
+const handlePgshCheck = async props => {
+  const faceResult = await getFaceResult(props);
+
+  if (!faceResult) return;
+
+  const { name } = faceResult;
+  const { slave0Config, slave0Data = [] } = props;
+  const filterConfig = slave0Config?.gdsconfigformslave?.filter(item => {
+    return item.sName === "sIPQCCheckMemo";
+  });
+
+  const returnData = await new Promise(resolve => {
+    props.onSaveState({
+      commonRepairModalParams: {
+        visible: true,
+        title: "品管审核备注",
+        tableName: "slave0",
+        config: slave0Config,
+        record: { ...slave0Data[0], bSubmit: 0 },
+        filterConfig,
+        callback: rowData => {
+          resolve(rowData);
+        },
+      },
+    });
+  });
+
+  if (commonUtils.isEmptyObject(returnData)) return;
+
+  const slave0DataNew = [
+    {
+      ...returnData,
+      bSubmit: 1,
+      tIPQCCheckDate: moment().format("YYYY-MM-DD HH:mm:ss"),
+      sIPQCCheckPerson: name,
+      bIPQCCheck: 1,
+      handleType: returnData.handleType || "update",
+    },
+  ];
+
+  props.onSaveState({ slave0Data: slave0DataNew });
+  props.onExecInstructSet({
+    nextProps: { ...props, slave0Data: slave0DataNew },
+    btnConfig: {
+      showName: "保存",
+      sInstruct: JSON.stringify([
+        {
+          opr: "save",
+          doNotRefresh: true,
+          data: [
+            {
+              tablename: "EptCompletionSiteClearanceMaster",
+              srcDataset: "slave0",
+            },
+          ],
+        },
+      ]),
+    },
+  });
+};
+
+// 完工情场确认-品管反审
+const handlePgfsCheck = async props => {
+  const faceResult = await getFaceResult(props);
+  if (!faceResult) return;
+
+  const { slave0Data = [] } = props;
+
+  const slave0DataNew = [{ ...slave0Data[0], bIPQCCheck: 0, handleType: slave0Data[0].handleType || "update" }];
+
+  props.onSaveState({ slave0Data: slave0DataNew });
+  props.onExecInstructSet({
+    nextProps: { ...props, slave0Data: slave0DataNew },
+    btnConfig: {
+      showName: "保存",
+      sInstruct: JSON.stringify([
+        {
+          opr: "save",
+          doNotRefresh: true,
+          data: [
+            {
+              tablename: "EptCompletionSiteClearanceMaster",
+              srcDataset: "slave0",
+            },
+          ],
+        },
+      ]),
+    },
+  });
+};
+
+// 完工清场确认-确认提交
+const handleConfirmSubmit = async props => {
+  const { slave0Data } = props;
+  const slave0RowData = slave0Data[0];
+  const { tFirstCompleteTime, tFirstClearanceTime, tSecondStartTime } = slave0RowData;
+  if (tFirstCompleteTime) {
+    // 完工时间需小于清场时间
+    if (moment(tFirstCompleteTime).isAfter(moment(tFirstClearanceTime))) {
+      message.error("完工时间需小于清场时间", 3);
+      return;
+    }
+  }
+
+  if (tSecondStartTime) {
+    // 清场时间需小于第二单开单时间
+    if (moment(tFirstClearanceTime).isAfter(moment(tSecondStartTime))) {
+      message.error("清场时间需小于第二单开单时间", 3);
+      return;
+    }
+  }
+
+  if (!tFirstCompleteTime || !tSecondStartTime) {
+    const confirmResult = await new Promise(resolve => {
+      Modal.confirm({
+        title: "温馨提示：",
+        content: "工单完工时间或者第二单开工时间未填写是否继续提交？",
+        closable: true,
+        maskClosable: true,
+        wrapClassName: "mesCommonModal",
+        onOk() {
+          resolve(1);
+        },
+        onCancel() {
+          resolve(0);
+        },
+      });
     });
+
+    if (!confirmResult) return;
   }
-}
+
+  const { sMachineGuid, sUserName, sTeamNo, sTeamId } = commonUtils.getAppData("userinfo");
+  const addState = {
+    sMachineId: sMachineGuid,
+    bSave: 1,
+    bSubmit: 1,
+    sFormId: "17086722220003015078585693314000",
+    sMakePerson: sUserName,
+    sFirstTeamNo: sTeamNo,
+    sSecondTeamNo: sTeamNo,
+    sFirstTeamId: sTeamId,
+    sSecondTeamId: sTeamId,
+    sFirstClearancePerson: sUserName,
+    handleType: slave0RowData.handleType || "update"
+  };
+  const slave0DataNew = [{ ...slave0RowData, ...addState }];
+
+  let refreshDataset = "slave1";
+  if (addState.handleType === 'add') {
+    window.rowclickAfterFunc = (nextProps) => {
+      const { slave1Data } = nextProps;
+      props.onSaveState({ slave1SelectedRowKeys: [slave1Data[0].sId] });
+    }
+  } else {
+    refreshDataset = "*";
+  }
+
+  props.onExecInstructSet({
+    nextProps: { ...props, bSaveAndUpdate: true, slave0Data: slave0DataNew },
+    btnConfig: {
+      showName: "保存",
+      sInstruct: JSON.stringify([
+        {
+          opr: "save",
+          doNotRefresh: true,
+          data: [
+            {
+              tablename: "EptCompletionSiteClearanceMaster",
+              srcDataset: "slave0",
+            },
+          ].map(item => {
+            if (!slave0RowData.sBillNo) {
+              return {
+                ...item,
+                maxBillNo: "sBillNo"
+              }
+            } else {
+              return item;
+            }
+          }),
+        },
+        {
+          opr: "refresh",
+          dataset: refreshDataset
+        },
+      ]),
+    },
+  });
+};
 export default costomPageFun;