登录界面bug修复 2.完工时选择是否完工清场

chenxt
1 parent 2678cd30
Showing 7 changed files with 79 additions and 39 deletions
src/components/Common/CommonBase.js
src/components/Common/commonFunc.js
src/mes/login/index.js
src/mes/productionExec/noticeModal/index.js
src/mes/productionExec/productionExecMain/index.js
src/mes/scheduledTasks/machineTasks/index.js
src/oee/common/oeeCurrentState.js
@@ -780,7 +780,6 @@ export default (ChildComponent) =&gt; {
             addState[`${name}DelData`] = [];
           }
           if (isWait) {
-            console.log(addState)
             return addState;
           } else if (this.mounted) {
             this.setState(addState);
@@ -1025,12 +1024,10 @@ export default (ChildComponent) =&gt; {
             if (commonUtils.isNotEmptyObject(sRulesJson) && commonUtils.isJSON(sRulesJson)) {
               const sRulesObjArr = JSON.parse(sRulesJson);
               if (commonUtils.isNotEmptyArr(sRulesObjArr)) {
-                console.log('sRulesObjArr:', sRulesObjArr);
                 sRulesObjArr.forEach((sRulesObj) => {
                   const {
                     showColumn, hideColumn, condition, tbName, sConfigName,
                   } = sRulesObj;
-                  console.log('tbName:', tbName);
                   /* 主表单表字段根据条件控制 其他字段的显示与隐藏 */
                   if (commonUtils.isEmptyObject(tbName)) {
                     if (commonUtils.isNotEmptyArr(condition)) {
@@ -2015,7 +2012,6 @@ export default (ChildComponent) =&gt; {
             if (commonUtils.isNotEmptyObject(sRulesJson) && commonUtils.isJSON(sRulesJson)) {
               const sRulesObjArr = JSON.parse(sRulesJson);
               if (Array.isArray(sRulesObjArr) && commonUtils.isNotEmptyArr(sRulesObjArr)) {
-                console.log('sRulesObjArr:', sRulesObjArr);
                 sRulesObjArr.forEach((sRulesObj) => {
                   const {
                     showColumn, hideColumn, condition, tbName, sConfigName,
@@ -2195,7 +2191,6 @@ export default (ChildComponent) =&gt; {
           const value = { sProName, sProInParam: JSON.stringify({ params: sRowData }) };
           const url = `${commonConfig.server_host}procedureCall/doGenericProcedureCall?sModelsId=${sModelsId}`;
           const dataReturn = (await commonServices.postValueService(app.token, value, url)).data;
-          console.log('dataReturn', dataReturn);
           if (dataReturn.code === 1) {
             if (commonUtils.isNotEmptyArr(slaveDataOld)) {
               slaveDataOld.forEach((item) => {
@@ -274,7 +274,6 @@ export function getAssignFieldValue(sAssignField, srcData, allTableData, bMultiT
     if (commonUtils.isNotEmptyObject(srcData)) {
       let strVar = '';
       if (sAssignField && sAssignField.includes('var') && bCommon) {
-        console.log('sAssignFiel:d', sAssignField);
         if (sAssignField.includes('slave.') || sAssignField.includes('slave.') || sAssignField.includes('control.')
           || sAssignField.includes('materials.') || sAssignField.includes('process.') || sAssignField.includes('master.')) { /* var表格对象 */
           for (const row of Object.keys(allTableData)) {
@@ -132,7 +132,7 @@ const useLoginEvent = props =&gt; {
   };
   // 登录事件
-  const handleSubmit = async ({ faceLoginValue = {}, sEmployeeNo } = {}, configsData) => {
+  const handleSubmit = async ({ faceLoginValue = {}, sEmployeeName, sEmployeeNo, sUserId } = {}, configsData) => {
     const bFaceLogin = commonUtils.isNotEmptyObject(faceLoginValue);
     let masterNewData = {}
     let dataReturn = {};
@@ -142,12 +142,21 @@ const useLoginEvent = props =&gt; {
       const masterLocal = commonUtils.convertStrToObj(
         localStorage.getItem(`${commonConfig.prefix}masterData`)
       )
+
       if (masterLocal) {
         masterNewData = {
           ...masterLocal,
           ...masterData,
         }
-      }else {
+        if (sEmployeeNo) {
+          masterNewData = {
+            ...masterNewData,
+            sEmployeeNo,
+            sUserName:sEmployeeName,
+            sUserId
+          }
+        }
+      } else {
         masterNewData = {
           ...masterData
         }
@@ -160,7 +169,7 @@ const useLoginEvent = props =&gt; {
         return showName;
       };
       const sLanguage = companys ? commonUtils.isNotEmptyArr(companys) ? companys[0].sLanguage : 'sEnglish' : 'sChinese';
-      
+
       const pleaseSelectUser = getConfigByName('pleaseSelectUser', configsData, sLanguage);
       const pleaseInputPassword = getConfigByName('pleaseInputPassword', configsData, sLanguage);
@@ -187,7 +196,7 @@ const useLoginEvent = props =&gt; {
         sShift
       } = masterNewData;
-      const value = {
+      let value = {
         userId,
         // username,
         userShowName,
@@ -202,7 +211,7 @@ const useLoginEvent = props =&gt; {
         sShift,
         sEmployeeNo
       };
-
+     
       if (!sEmployeeNo) {
         value.username = username;
       }
@@ -376,11 +385,19 @@ const useLoginEvent = props =&gt; {
 const handleGetFormItem = (props, item) => {
   const { sModelsId } = initValue;
-  const { masterData = {}, companys } = props;
+  const { masterData = {}, companys, faceLoginValue } = props;
-  const userInfo = commonUtils.convertStrToObj(
+  let userInfo = commonUtils.convertStrToObj(
     localStorage.getItem(`${commonConfig.prefix}masterData`)
   );
+  if (faceLoginValue) {
+    userInfo = {
+      ...userInfo,
+      sUserName: faceLoginValue.sEmployeeName,
+      sUserNo: faceLoginValue.sEmployeeNo,
+      sUserId: faceLoginValue.sUserId
+    }
+  }
   let masterNewData = masterData
   if (userInfo) {
     masterNewData = {
@@ -437,7 +454,6 @@ const handleGetFormItem = (props, item) =&gt; {
     bPassWord: item.sName === "sPassWord",
     style: { backgroundColor: "#eaeaea" }
   };
-  console.log(showTypeProps, 'showTypeProps');
   const showName = sLanguage === 'sChinese' ? item.sChinese : sLanguage === 'sEnglish' ? item.sEnglish
     : item.sBig5;
@@ -526,21 +542,21 @@ const login = baseProps =&gt; {
       </div>
       <div className="loginBox">
         <div className="logo">{oeeTitle}</div>
-        <Form form={form} layout="vertical" size="large">
+        <Form form={form} layout="horizontal" size="large" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
           {configs.map(item => handleGetFormItem(props, item))}
-          <Form.Item>
-            <Button
-              className="submitBtn"
-              type="primary"
-              block
-              onClick={() => {
-                props.onSubmit({}, configs);
-              }}
-            >
-              {btnLogin}
-            </Button>
-          </Form.Item>
         </Form>
+        <div style={{ padding: '0 11.76% 0 11.76%' }}>
+          <Button
+            className="submitBtn"
+            type="primary"
+            block
+            onClick={() => {
+              props.onSubmit({}, configs);
+            }}
+          >
+            {btnLogin}
+          </Button>
+        </div>
         <div className="faceLogin">
           <div
             className="faceImg"
@@ -619,7 +635,7 @@ const FaceLoginAfterModal = props =&gt; {
     faceLoginValue = {}
   } = props;
   const { sModelsId } = initValue;
-  const { name, sParentId, sEmployeeNo } = faceLoginValue;
+  const { name, sParentId, sEmployeeNo, sEmployeeName, sUserId } = faceLoginValue;
   const configs = cloneDeep(configOld);
   const showConfig = configs.find(item => item.sName === "sUserName");
@@ -663,6 +679,7 @@ const FaceLoginAfterModal = props =&gt; {
   }, []);
   const [form] = Form.useForm();
+
   return (
     <Modal
       title={sLoginConfirm}
@@ -682,7 +699,7 @@ const FaceLoginAfterModal = props =&gt; {
             type="primary"
             size="large"
             onClick={() => {
-              props.onSubmit({ sEmployeeNo });
+              props.onSubmit({ sEmployeeName, sEmployeeNo, sUserId });
             }}
           >
             {btnConfirm}
@@ -266,7 +266,6 @@ const firstNoticeModal = _props =&gt; {
     viewRow,
     tableName: viewName
   };
-  console.log("🚀 ~ firstNoticeModal ~ viewProps:", viewProps)
   return (
     <Modal
@@ -568,7 +568,7 @@ const ProductionExecContentByType = props =&gt; {
       const showValue = {
         stop: {
-          showName: "调机结束",
+          showName: "调机 / 生产",
           onClick: config =>
             operationFetch(props, config, undefined, () => {
               props.onSaveState({
@@ -578,7 +578,7 @@ const ProductionExecContentByType = props =&gt; {
             })
         },
         again: {
-          showName: "调机开始",
+          showName: "调机 / 生产",
           onClick: config =>
             operationFetch(props, config, "again", () => {
               props.onSaveState({
@@ -17,8 +17,11 @@ import {
   Space,
   Dropdown,
   message,
-  Tooltip
+  Tooltip,
+  Form,
+  Select
 } from "antd";
+import { DownOutlined } from '@ant-design/icons';
 import { SettingTwoTone } from "@ant-design/icons";
 import * as commonFunc from "@/components/Common/commonFunc";
 import * as commonUtils from "@/utils/utils";
@@ -348,14 +351,38 @@ const useInfoEvent = props =&gt; {
       props.onTableBtnClick(item);
       return;
     }
+    let value = true
+    const handleChange = val => {
+      value = val
+    }
     if (showName === "完工") {
+
       Modal.confirm({
         title: "温馨提示:",
-        content: <div>确认完工？</div>,
+        content: <div>
+          {/* <div>确认完工？</div> */}
+          <div>
+            <div style={{ padding: '8px 0' }}>是否确认完工清场?</div>
+            <Select
+              suffixIcon={<DownOutlined style={{ fontSize: '16px' }} />}
+              onChange={handleChange}
+              style={{ width: '100%', fontSize: '18px' }}
+              defaultValue={true}
+              options={[
+                { label: '是', value: true },
+                { label: '否', value: false },
+              ]}
+            />
+          </div>
+        </div>,
         okText: "确认",
         cancelText: "取消",
         onOk() {
-          handleUpdateProductionplan({ item, iFlag: 4 });
+          const newItem = {
+            ...item,
+            bComplete: value
+          }
+          handleUpdateProductionplan({ item:newItem, iFlag: 4,});
         }
       });
       return;
@@ -442,13 +469,17 @@ const useInfoEvent = props =&gt; {
   // 更新机台状态
   const handleUpdateProductionplan = async ({ item, iFlag, pauseValue }) => {
     const { app } = props;
-    const { sId } = item.record;
+    const { sId } = item?.record;
     const { token } = app;
-    const url = `${commonConfig.server_host
+    let url = `${commonConfig.server_host
       }oee/updateProductionplan/${sId}/${iFlag}${pauseValue
         ? `?sWorkOrderChangeMemo=${encodeURIComponent(pauseValue)}`
         : ""
       }`;
+    if (typeof item.bComplete === 'boolean') {
+      url = url + `?bComplete=${item.bComplete}`
+    }
+
     const dataReturn = (await commonServices.getService(token, url)).data;
     if (dataReturn.code === 1) {
       handleRefresh();
@@ -806,7 +837,7 @@ const MachineTasks = baseProps =&gt; {
 };
 const TaskConfirmModal = props => {
-  const { taskConfirmModalVisible, taskConfirmModalMsg, bPauseOnly } = props;
+  const { taskConfirmModalVisible, taskConfirmModalMsg, bPauseOnly = true } = props;
   if (!taskConfirmModalVisible) return "";
   const handleClose = () => {
@@ -262,7 +262,6 @@ class OeeCurrentState extends Component {
       }
       const { slaveData, onSaveCurrentState } = this.props;
       /* 打印标签跳转的界面模块ID */
-      console.log('2222', btnConfig);
       onSaveCurrentState(slaveData, undefined, undefined, btnConfig);
       this.props.onOeeLabelCopyTo(btnConfig.sControlName, btnConfig.sActiveId);
       this.props.dispatch(routerRedux.push('/indexOee/labelPrint'));