质量完工

chenxt
1 parent 0bd4c698
Showing 2 changed files with 54 additions and 4 deletions
src/components/Common/CommonHooks/useCommonBase.js
src/components/Common/CommonTable/index.js
@@ -2771,17 +2771,20 @@ const useCommonBase = props =&gt; {
       tableData,
       config = {},
       onSuccess,
-      nextProps
+      nextProps,
+      inscallback
     } = params;
     const { sControlName = "", sInstruct } = config;
     const sControlLowerName = sControlName.toLowerCase();
     // 调用指令集
+    console.log(sInstruct, 'sInstruct');
     if (sInstruct) {
       handleExecInstructSet({
         ...props,
         btnConfig: config,
         tableLineParams: params,
-        nextProps
+        nextProps,
+        inscallback
       });
       return;
     }
@@ -34,6 +34,7 @@ import {
 } from "@ant-design/icons";
 import { Icon as LegacyIcon } from "@ant-design/compatible";
 import "@ant-design/compatible/assets/index.css";
+import * as commonServices from "@/services/services";
 import lodash, { cloneDeep } from "lodash";
 import {
   Table,
@@ -4855,6 +4856,7 @@ class CommonTableRc extends React.Component {
                     }}
                     loading={bLoading}
                     onClick={e => {
+                      console.log("🚀 ~ CommonTableRc ~ e:", e)
                       e.stopPropagation(); /* 阻止父级穿透 */
                       const onTempTableBtnClick = nextProps => {
                         props.onTableBtnClick &&
@@ -4864,7 +4866,7 @@ class CommonTableRc extends React.Component {
                             config,
                             name: props.name,
                             tableData: props.data,
-                            nextProps
+                            nextProps,
                           });
                       };
  
@@ -4876,7 +4878,52 @@ class CommonTableRc extends React.Component {
                         return
                       }
                       if (selectedRowKeys.includes(rowKeyId)) {
-                        onTempTableBtnClick();
+                        if (sControlName.includes('_qlyqualityinspec')) {
+                          const { app } = props;
+                          const { token, currentMesPane } = app;
+                          const { sModelsId } = currentMesPane || {};
+                          props.onTableBtnClick &&
+                            props.onTableBtnClick({
+                              record,
+                              index,
+                              config,
+                              name: props.name,
+                              tableData: props.data,
+                              inscallback: async nextProps => {
+                                const value = {
+                                  sBtnName: sControlName,
+                                  sProName: "Sp_mes_qualityinspect_complete",
+                                  sProInParam: JSON.stringify({
+                                    changeValue: {},
+                                    sButtonParam: {
+                                      sproName: "Sp_mes_qualityinspect_complete",
+                                      inMap: "qualityinspect.sId"
+                                    },
+                                    params: [
+                                      {
+                                        key: "qualityinspect",
+                                        value: [
+                                          {
+                                            sId: record.sId,
+                                          }
+                                        ]
+                                      }
+                                    ]
+                                  })
+                                };
+                                const url = `${commonConfig.server_host
+                                  }procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
+                                const returnData = (await commonServices.postValueService(
+                                  token,
+                                  value,
+                                  url
+                                )).data;
+                              }
+                            });
+                        } else {
+                          onTempTableBtnClick();
+
+                        }
                       } else {
                         props.onSaveState(
                           {