手工机台

chenxt
1 parent 18e50f00
Showing 3 changed files with 43 additions and 20 deletions
src/components/Common/CommonComponent/index.js
src/components/Common/CommonTable/index.js
src/mes/teamInfo/index.js
@@ -3051,7 +3051,7 @@ export default class CommonComponent extends Component {
     /*   页面输出   */
     const className = iColValue === 24 ? 'input24' : iColValue === 18 ? 'input18' : iColValue === 12 ? 'input12' : 'changeClassName';
     const mesInputBlue = enabled && !this.props.bNoMesBlue && this.firstDataIndex !== 'b';
-      const {bManual = false} = this.props?.app?.userinfo
+      const {bManual = false} = this.props?.app?.userinfo || {}
     return (
       <div ref={this.myRef} className={`${className} ${mesInputBlue ? "mesInputBlue" : ""}`} style={componentStyle}>
         {mesInputBlue ? <div  className={`mesInputBlueBg  ${bManual ? 'manualOverride' : ''}`} /> : ''}
@@ -12283,7 +12283,7 @@ const useGetTableBtnOprSetting = props =&gt; {
                 props.parentProps.onExecInstructSet({
                   btnConfig: {
                     ...btnsConfig,
-                    sInstruct: btnsConfig.sButtonParam
+                    sInstruct: btnsConfig.sInstruct
                   },
                   nextProps: {
                     ...props
@@ -12307,7 +12307,7 @@ const useGetTableBtnOprSetting = props =&gt; {
     } else if (btnType.includes("del")) {
       if (bManual) {
         resultTemp.mesDel = params => {
-          const { record } = params;
+          const { record, tableName } = params;
           const { sDefault: str } = btnTableDelConfig;
           let disabled = props.getBtnDisabled({
             str,
@@ -12328,14 +12328,18 @@ const useGetTableBtnOprSetting = props =&gt; {
                 const btnsConfig =
                   gdsconfigformslave.find(
                     item => item.sControlName?.toLowerCase().includes("btnenventdel")
-                  ) || {};
+                  ) || {};       
                 props.parentProps.onExecInstructSet({
                   btnConfig: {
                     ...btnsConfig,
-                    sInstruct: btnsConfig.sButtonParam
+                    sInstruct: btnsConfig.sInstruct
+                  },
+                  tableLineParams: {
+                   ...params
                   },
                   nextProps: {
-                    ...props
+                    ...props,
+                     [`${tableName}SelectedRowKeys`]: [record.sId]
                   }
                 });
               }}
@@ -12404,7 +12408,7 @@ const useGetTableBtnOprSetting = props =&gt; {
               props.parentProps.onExecInstructSet({
                 btnConfig: {
                   ...btnsConfig,
-                  sInstruct: btnsConfig.sButtonParam
+                  sInstruct: btnsConfig.sInstruct
                 },
                 nextProps: {
                   ...props
@@ -33,7 +33,7 @@ const teamInfoSid = &quot;17086669370007136849817837261000&quot;;
 let loginInfo = {};
 // 业务层
 const useTeamInfoEvent = props => {
-  const { formData, mesRefresh = true} = props;
+  const { formData, mesRefresh = true } = props;
   useEffect(
     async () => {
       if (commonUtils.isNotEmptyArr(formData) && mesRefresh) {
@@ -494,11 +494,7 @@ const TeamInfo = baseProps =&gt; {
   const foremanConfig = props.slaveConfig?.gdsconfigformslave.find(item => item.sName === 'sForemanName') || {};
   const ipqcConfig = props.slaveConfig?.gdsconfigformslave.find(item => item.sName === "sIpqcName") || {};
  
-  let faceProps = {
-    ...props,
-    faceModal,
-    setFaceModal
-  };
+
  
   const operationBarProps = {
     ...props,
@@ -508,6 +504,12 @@ const TeamInfo = baseProps =&gt; {
   const tableHeight = bManual ? "calc(88vh - 80px)" : "calc(25vh - 80px)";
   let bManualTableProps
   let bManualSlaveTableProps
+  let faceProps = {
+    ...props,
+    faceModal,
+    setFaceModal,
+
+  };
   if (bManual) {
     const tableBaseProps = commonBusiness.getTableTypes("slave", props);
     const slaveTableBaseProps = commonBusiness.getTableTypes("slave1", props);
@@ -519,12 +521,15 @@ const TeamInfo = baseProps =&gt; {
     }
     bManualSlaveTableProps = {
       ...slaveTableBaseProps,
-      data: slaveTableBaseProps?.data?.filter(item=>item.sParentId === bManualTableProps.selectedRowKeys?.[0]),
+      data: slaveTableBaseProps?.data?.filter(item => item.sParentId === bManualTableProps.selectedRowKeys?.[0]),
       fixedHeight: "calc(50vh - 126px)"
-
+    }
+    faceProps = {
+      ...faceProps,
+      gdsconfigformslave: slaveTableBaseProps?.config?.gdsconfigformslave,
     }
   }
-  
+
   const handleSave = (props) => {
     props.onExecInstructSet({
       btnConfig: {
@@ -592,7 +597,7 @@ const TeamInfo = baseProps =&gt; {
                       <Button
                         type="primary"
                         onClick={() => {
-            
+
                           if (props.masterData && !props.masterData.length) {
                             return message.warning('请先添加一条班组信息！')
                           }
@@ -757,7 +762,7 @@ const TeamInfo = baseProps =&gt; {
  
 // 人脸登录弹窗
 const FaceLoginModal = props => {
-  const { faceModal, setFaceModal } = props;
+  const { faceModal, setFaceModal, gdsconfigformslave } = props;
   if (!faceModal) return "";
  
   // 人脸登录成功回调
@@ -765,14 +770,28 @@ const FaceLoginModal = props =&gt; {
     const { sSubsidiaryId: sId, sEmployeeNo } = e.dataset.rows[0];
     // ZY023
     const { slave1Data = [] } = props
-    const faceData = {... e.dataset.rows[0],handleType:'add', sParentId: props.slaveSelectedRowKeys?.[0] || ''};
+    const faceData = { ...e.dataset.rows[0], handleType: 'add', sParentId: props.slaveSelectedRowKeys?.[0] || '' };
     const list = [
       ...slave1Data,
       faceData,
-     
+
     ]
     props.onSaveState({ slave1Data: list });
+    const btnsConfig =
+      gdsconfigformslave.find(
+        item => item.sControlName?.toLowerCase().includes("btnenventinsertwork")
+      ) || {};
+    props.onExecInstructSet({
+      btnConfig: {
+        ...btnsConfig,
+        sInstruct: btnsConfig.sInstruct
+      },
+      nextProps: {
+        ...props,
+      }
+    });
     setFaceModal(false)
+
     // handleSubmit(value);
   };