手工机台上班

chenxt
1 parent bde00f75
Showing 1 changed file with 17 additions and 13 deletions
src/mes/teamInfo/index.js
@@ -509,18 +509,21 @@ const TeamInfo = baseProps =&gt; {
   let bManualTableProps
   let bManualSlaveTableProps
   if (bManual) {
-    const tableBaseProps = commonBusiness.getTableTypes("master", props);
-    const slaveTableBaseProps = commonBusiness.getTableTypes("slave", props);
+    const tableBaseProps = commonBusiness.getTableTypes("slave", props);
+    const slaveTableBaseProps = commonBusiness.getTableTypes("slave1", props);
     bManualTableProps = {
       ...tableBaseProps,
+      selectedRowKeys: tableBaseProps.selectedRowKeys ? tableBaseProps.selectedRowKeys : [tableBaseProps?.data?.sId],
       fixedHeight: "calc(50vh - 218px)"
     }
     bManualSlaveTableProps = {
       ...slaveTableBaseProps,
+      data: slaveTableBaseProps?.data?.filter(item=>item.sParentId === bManualTableProps.selectedRowKeys?.[0]),
       fixedHeight: "calc(50vh - 126px)"
     }
   }
+  
   const handleSave = (props) => {
     props.onExecInstructSet({
       btnConfig: {
@@ -588,7 +591,10 @@ const TeamInfo = baseProps =&gt; {
                       <Button
                         type="primary"
                         onClick={() => {
-                          console.log(1111111);
+            
+                          if (props.masterData && !props.masterData.length) {
+                            return message.warning('请先添加一条班组信息！')
+                          }
                           setFaceModal(true);
                         }}
@@ -755,18 +761,16 @@ const FaceLoginModal = props =&gt; {
   // 人脸登录成功回调
   const handleIdentifySuccess = e => {
-    const { sBrandsId: sParentId, sSubsidiaryId: sId, sEmployeeNo } = e.dataset.rows[0];
-    // ZY0232
-    const value = {
-      sParentId, sId, sEmployeeNo
-    };
-    const { slaveData = [] } = props
-    const faceData = {... e.dataset.rows[0],handleType:'add'}
+    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 list = [
-      ...slaveData,
-      faceData
+      ...slave1Data,
+      faceData,
+     
     ]
-    props.onSaveState({ slaveData: list });
+    props.onSaveState({ slave1Data: list });
     setFaceModal(false)
     // handleSubmit(value);
   };