From ddee37b14cd4620867aad759975cab3e41936dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Mon, 24 Nov 2025 01:13:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomPages/FM/UserEditPage.js | 9 +- .../CustomPages/FO/FO043ShowPrint.js | 115 +++++++++--------- .../CustomPages/FO/FO045ShowPrint.js | 102 +++++++++------- src/files/edit/FO043.js | 88 ++++++++------ 4 files changed, 176 insertions(+), 138 deletions(-) diff --git a/src/components/CustomPages/FM/UserEditPage.js b/src/components/CustomPages/FM/UserEditPage.js index cb14934..06ed512 100644 --- a/src/components/CustomPages/FM/UserEditPage.js +++ b/src/components/CustomPages/FM/UserEditPage.js @@ -104,6 +104,7 @@ class UserEditPage extends React.Component { extendInclude(userJson, 'Nav_UserPhotoFiles.Nav_ImgFile') extendInclude(userJson, 'Nav_UserSignFiles.Nav_ImgFile') extendInclude(userJson, 'Nav_ProdutionUnit.Nav_Enums') + extendInclude(userJson, 'Nav_ProdutionUnit.Nav_Unit') this.props.dispatch({ type: 'FMUserEdit/getUser', payload: userJson, @@ -800,12 +801,12 @@ class UserEditPage extends React.Component { {...formItemLayout} > {/* */} - {showFiles(data.Nav_Files, config.picServerHost, this)} - - {data.COMPLETED_CONDITION} - {enums.FOYesOrNoEnum.enums[data.IS_FIRE]} - {data.ACT_DATE} - {showFiles(data.Nav_FireFiles, config.picServerHost, this)} - {data.Nav_DispatchUser?.NAME} - { - - data.USER_DEAL_STATUS == 1? - showUserSign(data.Nav_FireUser, config.picServerHost) - :null - - } - { - - data.SAFE_DEAL_STATUS == 1? - showUserSign(data.Nav_SafeUser, config.picServerHost) - :null + - } - { - - data.DISPATCH_DEAL_STATUS == 1? - showUserSign(data.Nav_DispatchUser, config.picServerHost) - :null - - } - { - data.COMPLETED_CONTENT - } - { - enums.FOYesOrNoEnum.enums[data.IS_LEAVE] - } - { - data.ACT_END_DATE - } - { - data.LEAVE_DATE - } - { - showFiles(data.Nav_MonitorFiles, config.picServerHost, this) - } - { - data.USER_DEAL_FINISH_STATUS == 1? - showUserSign(data.Nav_FireUser, config.picServerHost) - :null - } - { - data.SAFE_DEAL_FINISH_STATUS == 1? - showUserSign(data.Nav_SafeUser, config.picServerHost) - :null - } - - - + { data && data.Nav_Users? @@ -283,8 +231,65 @@ class FO043ShowPrint extends React.Component {
: null } - + + {data.COMPLETED_CONDITION} + {enums.FOYesOrNoEnum.enums[data.IS_FIRE]} + {data.ACT_DATE} + {showFiles(data.Nav_FireFiles, config.picServerHost, this)} + {data.Nav_DispatchUser?.NAME} + { + + data.USER_DEAL_STATUS == 1? + showUserSign(data.Nav_FireUser, config.picServerHost) + :null + + } + { + + data.SAFE_DEAL_STATUS == 1? + showUserSign(data.Nav_SafeUser, config.picServerHost) + :null + + } + { + + data.DISPATCH_DEAL_STATUS == 1? + showUserSign(data.Nav_DispatchUser, config.picServerHost) + :null + + } + + + { + data.COMPLETED_CONTENT + } + { + enums.FOYesOrNoEnum.enums[data.IS_LEAVE] + } + { + data.ACT_END_DATE + } + { + data.LEAVE_DATE + } + { + showFiles(data.Nav_MonitorFiles, config.picServerHost, this) + } + { + data.USER_DEAL_FINISH_STATUS == 1? + showUserSign(data.Nav_FireUser, config.picServerHost) + :null + } + { + data.SAFE_DEAL_FINISH_STATUS == 1? + showUserSign(data.Nav_SafeUser, config.picServerHost) + :null + } + + + : null + } diff --git a/src/components/CustomPages/FO/FO045ShowPrint.js b/src/components/CustomPages/FO/FO045ShowPrint.js index 389c079..a71ac5f 100644 --- a/src/components/CustomPages/FO/FO045ShowPrint.js +++ b/src/components/CustomPages/FO/FO045ShowPrint.js @@ -150,52 +150,9 @@ class FO045ShowPrint extends React.Component { return item.RISK_NAME + ' ' })} {showFiles(data.Nav_Files, config.picServerHost, this)} + - {data.COMPLETED_CONDITION} - {enums.FOYesOrNoEnum.enums[data.IS_FIRE]} - {data.ACT_DATE} - {showFiles(data.Nav_FireFiles, config.picServerHost, this)} - - { - data.USER_DEAL_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile? - - :null - } - { - - data.SAFE_DEAL_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile? - - :null - - } - { - data.COMPLETED_CONTENT - } - { - enums.FOYesOrNoEnum.enums[data.IS_LEAVE] - } - { - data.ACT_END_DATE - } - { - data.LEAVE_DATE - } - { - showFiles(data.Nav_MonitorFiles, config.picServerHost, this) - } - { - data.USER_DEAL_FINISH_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile? - - :null - } - { - data.SAFE_DEAL_FINISH_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile? - - :null - } - - - + { data && data.Nav_Users? @@ -276,6 +233,61 @@ class FO045ShowPrint extends React.Component {
: null } + + {data.COMPLETED_CONDITION} + {enums.FOYesOrNoEnum.enums[data.IS_FIRE]} + {data.ACT_DATE} + {showFiles(data.Nav_FireFiles, config.picServerHost, this)} + {data.Nav_DispatchUser?.NAME} + { + data.USER_DEAL_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile? + + :null + } + { + + data.SAFE_DEAL_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile? + + :null + + } + { + + data.DISPATCH_DEAL_STATUS == 1? + showUserSign(data.Nav_DispatchUser, config.picServerHost) + :null + + } + + + { + data.COMPLETED_CONTENT + } + { + enums.FOYesOrNoEnum.enums[data.IS_LEAVE] + } + { + data.ACT_END_DATE + } + { + data.LEAVE_DATE + } + { + showFiles(data.Nav_MonitorFiles, config.picServerHost, this) + } + { + data.USER_DEAL_FINISH_STATUS == 1 && data.Nav_FireUser[0] && data.Nav_FireUser[0].Nav_ImgFile? + + :null + } + { + data.SAFE_DEAL_FINISH_STATUS == 1 && data.Nav_SafeUser[0] && data.Nav_SafeUser[0].Nav_ImgFile? + + :null + } + + + : null } diff --git a/src/files/edit/FO043.js b/src/files/edit/FO043.js index f2ffa80..7e69b92 100644 --- a/src/files/edit/FO043.js +++ b/src/files/edit/FO043.js @@ -32,17 +32,17 @@ export default { } } }); - ///发起人不能编辑 - setFieldEditable('COMPLETED_CONDITION', false) - setFieldEditable('IS_FIRE', false) - setFieldEditable('ACT_DATE', false) - setFieldEditable('Nav_FireFiles', false) - setFieldEditable('Nav_DispatchUser.NAME', false) - setFieldEditable('COMPLETED_CONTENT', false) - setFieldEditable('IS_LEAVE', false) - setFieldEditable('ACT_END_DATE', false) - setFieldEditable('LEAVE_DATE', false) - setFieldEditable('Nav_MonitorFiles', false) + ///发起人不能查看 + setFieldVisible('COMPLETED_CONDITION', false) + setFieldVisible('IS_FIRE', false) + setFieldVisible('ACT_DATE', false) + setFieldVisible('Nav_FireFiles', false) + setFieldVisible('Nav_DispatchUser.NAME', false) + setFieldVisible('COMPLETED_CONTENT', false) + setFieldVisible('IS_LEAVE', false) + setFieldVisible('ACT_END_DATE', false) + setFieldVisible('LEAVE_DATE', false) + setFieldVisible('Nav_MonitorFiles', false) } else if(stateData.FIRE_STATUS == 10) { @@ -59,34 +59,33 @@ export default { } else if(stateData.FIRE_STATUS == 18) { - setFieldEditable('COMPLETED_CONDITION', false) - setFieldEditable('IS_FIRE', false) - setFieldEditable('ACT_DATE', false) - setFieldEditable('Nav_FireFiles', false) - setFieldEditable('Nav_DispatchUser.NAME', false) - setFieldEditable('COMPLETED_CONTENT', true) - setFieldEditable('IS_LEAVE', true) - setFieldEditable('ACT_END_DATE', true) - setFieldEditable('LEAVE_DATE', true) - setFieldEditable('Nav_MonitorFiles', true) + setFieldVisible('COMPLETED_CONDITION', false) + setFieldVisible('IS_FIRE', false) + setFieldVisible('ACT_DATE', false) + setFieldVisible('Nav_FireFiles', false) + setFieldVisible('Nav_DispatchUser.NAME', false) + setFieldVisible('COMPLETED_CONTENT', true) + setFieldVisible('IS_LEAVE', true) + setFieldVisible('ACT_END_DATE', true) + setFieldVisible('LEAVE_DATE', true) + setFieldVisible('Nav_MonitorFiles', true) }else { - setFieldEditable('COMPLETED_CONDITION', false) - setFieldEditable('IS_FIRE', false) - setFieldEditable('ACT_DATE', false) - setFieldEditable('Nav_FireFiles', false) - setFieldEditable('Nav_DispatchUser.NAME', false) - setFieldEditable('COMPLETED_CONTENT', false) - setFieldEditable('IS_LEAVE', false) - setFieldEditable('ACT_END_DATE', false) - setFieldEditable('LEAVE_DATE', false) - setFieldEditable('Nav_MonitorFiles', false) + setFieldVisible('COMPLETED_CONDITION', false) + setFieldVisible('IS_FIRE', false) + setFieldVisible('ACT_DATE', false) + setFieldVisible('Nav_FireFiles', false) + setFieldVisible('Nav_DispatchUser.NAME', false) + setFieldVisible('COMPLETED_CONTENT', false) + setFieldVisible('IS_LEAVE', false) + setFieldVisible('ACT_END_DATE', false) + setFieldVisible('LEAVE_DATE', false) + setFieldVisible('Nav_MonitorFiles', false) } }, onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => { - if (!(colInfo.FIELD_NAME == 'Nav_OperationStep.NAME')) - return; - + if (colInfo.FIELD_NAME == 'Nav_OperationStep.NAME') + { let code = getFieldValue('OPERATION_STEP_ID') let json = initFilter(login.OrgId,code); dispatch({ @@ -104,5 +103,26 @@ export default { } } }) + } + if (colInfo.FIELD_NAME == 'Nav_FireDepartment.NAME') + { + let code = getFieldValue('FIRE_DEPARTMENT_ID') + let json = initFilter(login.OrgId,code); + dispatch({ + type: 'app/getDataByPost', + url: 'FO/FOFireJob/GetSafeUser', + payload: json, + onlyData: false, + onComplete: (re) => { + if (re && re.IsSuccessful && re.Data) { + let temps = []; + temps.push({ field: 'SAFE_USER_ID', value: re.Data?.ID }) + temps.push({ field: 'Nav_SafeUser.NAME', value: re.Data?.NAME}) + setFieldValueByBatch(temps); + } + } + }) + } + }, }