From 865ef76fa45e853461b69380dfe8f1740e76cc1c Mon Sep 17 00:00:00 2001 From: chenxt <10125295+chen-xintao97@user.noreply.gitee.com> Date: Mon, 12 Jan 2026 11:55:41 +0800 Subject: [PATCH] 登录界面bug修复 2.完工时选择是否完工清场 --- src/components/Common/CommonBase.js | 5 ----- src/components/Common/commonFunc.js | 1 - src/mes/login/index.js | 63 ++++++++++++++++++++++++++++++++++++++++----------------------- src/mes/productionExec/noticeModal/index.js | 1 - src/mes/productionExec/productionExecMain/index.js | 4 ++-- src/mes/scheduledTasks/machineTasks/index.js | 43 +++++++++++++++++++++++++++++++++++++------ src/oee/common/oeeCurrentState.js | 1 - 7 files changed, 79 insertions(+), 39 deletions(-) diff --git a/src/components/Common/CommonBase.js b/src/components/Common/CommonBase.js index 311238d..5a93c83 100644 --- a/src/components/Common/CommonBase.js +++ b/src/components/Common/CommonBase.js @@ -780,7 +780,6 @@ export default (ChildComponent) => { addState[`${name}DelData`] = []; } if (isWait) { - console.log(addState) return addState; } else if (this.mounted) { this.setState(addState); @@ -1025,12 +1024,10 @@ export default (ChildComponent) => { 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) => { 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) => { 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) => { diff --git a/src/components/Common/commonFunc.js b/src/components/Common/commonFunc.js index 62ca65d..23631c5 100644 --- a/src/components/Common/commonFunc.js +++ b/src/components/Common/commonFunc.js @@ -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)) { diff --git a/src/mes/login/index.js b/src/mes/login/index.js index 894f6ba..d0639c0 100644 --- a/src/mes/login/index.js +++ b/src/mes/login/index.js @@ -132,7 +132,7 @@ const useLoginEvent = props => { }; // 登录事件 - 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 => { 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 => { 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 => { sShift } = masterNewData; - const value = { + let value = { userId, // username, userShowName, @@ -202,7 +211,7 @@ const useLoginEvent = props => { sShift, sEmployeeNo }; - + if (!sEmployeeNo) { value.username = username; } @@ -376,11 +385,19 @@ const useLoginEvent = props => { 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) => { 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 => {
{oeeTitle}
-
+ {configs.map(item => handleGetFormItem(props, item))} - - -
+
+ +
{ 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 => { }, []); const [form] = Form.useForm(); + return ( { type="primary" size="large" onClick={() => { - props.onSubmit({ sEmployeeNo }); + props.onSubmit({ sEmployeeName, sEmployeeNo, sUserId }); }} > {btnConfirm} diff --git a/src/mes/productionExec/noticeModal/index.js b/src/mes/productionExec/noticeModal/index.js index 0aa3879..54842f0 100644 --- a/src/mes/productionExec/noticeModal/index.js +++ b/src/mes/productionExec/noticeModal/index.js @@ -266,7 +266,6 @@ const firstNoticeModal = _props => { viewRow, tableName: viewName }; - console.log("🚀 ~ firstNoticeModal ~ viewProps:", viewProps) return ( { const showValue = { stop: { - showName: "调机结束", + showName: "调机 / 生产", onClick: config => operationFetch(props, config, undefined, () => { props.onSaveState({ @@ -578,7 +578,7 @@ const ProductionExecContentByType = props => { }) }, again: { - showName: "调机开始", + showName: "调机 / 生产", onClick: config => operationFetch(props, config, "again", () => { props.onSaveState({ diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js index baefa63..83f7d3b 100644 --- a/src/mes/scheduledTasks/machineTasks/index.js +++ b/src/mes/scheduledTasks/machineTasks/index.js @@ -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 => { props.onTableBtnClick(item); return; } + let value = true + const handleChange = val => { + value = val + } if (showName === "完工") { + Modal.confirm({ title: "温馨提示:", - content:
确认完工？
, + content:
+ {/*
确认完工？
*/} +
+
是否确认完工清场?
+