From e3f93fd345483ca0145d0366ba858ec68b043246 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Wed, 19 Nov 2025 17:40:03 +0800 Subject: [PATCH 1/6] 1 --- src/components/CustomPages/SK/OperateLog.css | 16 ++++++++++++++++ .../CustomPages/SK/SK006ShowOperateLog.js | 8 +++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/components/CustomPages/SK/OperateLog.css b/src/components/CustomPages/SK/OperateLog.css index 3356e7d..9ce7a77 100644 --- a/src/components/CustomPages/SK/OperateLog.css +++ b/src/components/CustomPages/SK/OperateLog.css @@ -187,6 +187,22 @@ margin-left: 25px; } +.stepxOver { + width: 120px; + height: 40px; + background-color: #303133; + color: white; + border: 1px solid white; + /* border: 1px solid #ddd; */ + display: flex; + align-items: center; + justify-content: center; + margin-top: 20px; + position: relative; + border-radius: 50px; + margin-left: 25px; +} + /* 未处理 */ .stepxEnable { /* margin-right: 15px; */ diff --git a/src/components/CustomPages/SK/SK006ShowOperateLog.js b/src/components/CustomPages/SK/SK006ShowOperateLog.js index 78a8b91..c61dfbf 100644 --- a/src/components/CustomPages/SK/SK006ShowOperateLog.js +++ b/src/components/CustomPages/SK/SK006ShowOperateLog.js @@ -138,10 +138,12 @@ class SK006ShowOperateLog extends React.Component {
From b526872fc2316db021ff240a0c1f7d5c20f1916f 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: Wed, 19 Nov 2025 21:41:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/SK/SK022ShowPrint.js | 19 +++++++++++++------ src/files/edit/SK006.js | 10 +++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js index 62d7540..a207cdc 100644 --- a/src/components/CustomPages/SK/SK022ShowPrint.js +++ b/src/components/CustomPages/SK/SK022ShowPrint.js @@ -9,6 +9,7 @@ import { connect } from 'dva'; import stylesStep from '../HI/StepForm.css'; import FormPage from '../../../components/FormPage' import moment from 'moment'; +import { display } from "html2canvas/dist/types/css/property-descriptors/display"; class SK022ShowPrint extends React.Component { constructor(props) { super(props); @@ -124,7 +125,7 @@ class SK022ShowPrint extends React.Component { pageStyle=".printDIV { padding:0 40px;} img{width :120px}" /> - +
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id}>

隐患整改记录

@@ -153,7 +154,11 @@ class SK022ShowPrint extends React.Component { {moment(data.RECITIFY_TIME).format('YYYY-MM-DD')} {data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''} {data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''} - {data.Nav_ImplementUser ? data.Nav_ImplementUser.NAME : ''} + { + data.STATUS == 21 && + data.Nav_ImplementUser && data.Nav_ImplementUser.FILE_PATH ? + showUserSign(data.Nav_ImplementUser, config.picServerHost) + : data.Nav_ImplementUser ? data.Nav_ImplementUser.NAME : ''} {data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''} {data.RECTIFICATION_DESCRIPTION} {data.RECTIFICATION_MONEY} @@ -167,16 +172,18 @@ class SK022ShowPrint extends React.Component { { showFiles(data?.Nav_RectifyFiles, config.picServerHost, this) } - {data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null} - {enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]} - {data.ACCEPT_OPINION} + + {data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null} + {enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]} + {data.ACCEPT_OPINION} { + data.STATUS == 20 && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ? showUserSign(data.Nav_RecitifyUser, config.picServerHost) : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : '' } { - (data.STATUS == 20 ||data.STATUS == 30) && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ? + data.STATUS == 30 && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ? showUserSign(data.Nav_RecitifyUser, config.picServerHost) : data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : '' } diff --git a/src/files/edit/SK006.js b/src/files/edit/SK006.js index f45fde6..42d49af 100644 --- a/src/files/edit/SK006.js +++ b/src/files/edit/SK006.js @@ -189,11 +189,11 @@ export default { }, btnSubContents: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => { - // if(!stateData.PRODUCTION_UNIT_ID) - // { - // message.error("请选择生产单元!") - // return - // }debugger + if(!stateData.PRODUCTION_UNIT_ID) + { + message.error("请选择生产单元!") + return + } // if(!stateData.DEPARTMENT_TYPE) // { // message.error("请选择检查层级!") From 0764cafb4613f1fb2e87317fee865dbfd5b97789 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: Wed, 19 Nov 2025 22:04:35 +0800 Subject: [PATCH 3/6] bug --- src/components/CustomPages/SK/SK022ShowPrint.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js index a207cdc..8b15689 100644 --- a/src/components/CustomPages/SK/SK022ShowPrint.js +++ b/src/components/CustomPages/SK/SK022ShowPrint.js @@ -172,10 +172,11 @@ class SK022ShowPrint extends React.Component { { showFiles(data?.Nav_RectifyFiles, config.picServerHost, this) } - - {data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null} - {enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]} - {data.ACCEPT_OPINION} +
+ {data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null} + {enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]} + {data.ACCEPT_OPINION} +
{ data.STATUS == 20 && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ? From 9e5325d65f27fbac9dbe7504e1e5ad9daf3d1e37 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: Thu, 20 Nov 2025 00:30:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=95=B4=E6=94=B9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomPages/SK/SK022ShowPrint.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js index 8b15689..366e29a 100644 --- a/src/components/CustomPages/SK/SK022ShowPrint.js +++ b/src/components/CustomPages/SK/SK022ShowPrint.js @@ -9,7 +9,6 @@ import { connect } from 'dva'; import stylesStep from '../HI/StepForm.css'; import FormPage from '../../../components/FormPage' import moment from 'moment'; -import { display } from "html2canvas/dist/types/css/property-descriptors/display"; class SK022ShowPrint extends React.Component { constructor(props) { super(props); @@ -172,7 +171,7 @@ class SK022ShowPrint extends React.Component { { showFiles(data?.Nav_RectifyFiles, config.picServerHost, this) } -
+
{data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null} {enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]} {data.ACCEPT_OPINION} From 2a88a5a21c12f63dcca9310215c0045055d26943 Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Thu, 20 Nov 2025 14:17:48 +0800 Subject: [PATCH 5/6] 1 --- src/components/CustomPages/SK/OperateLog.css | 53 ---------- .../CustomPages/SK/SK006ShowOperateLog.js | 98 ++++++++++++++++--- 2 files changed, 83 insertions(+), 68 deletions(-) diff --git a/src/components/CustomPages/SK/OperateLog.css b/src/components/CustomPages/SK/OperateLog.css index 9ce7a77..3f2952f 100644 --- a/src/components/CustomPages/SK/OperateLog.css +++ b/src/components/CustomPages/SK/OperateLog.css @@ -156,59 +156,6 @@ /* margin-right: 15px; */ width: 120px; height: 40px; - background-color: #70AD47; - color: white; - border: 1px solid white; - /* border: 1px solid #ddd; */ - display: flex; - align-items: center; - justify-content: center; - margin-top: 20px; - position: relative; - border-radius: 50px; - margin-left: 25px; -} - -/* 超时处理 */ -.stepxOutTime { - /* margin-right: 15px; */ - width: 120px; - height: 40px; - background-color: #FFC000; - color: white; - border: 1px solid white; - /* border: 1px solid #ddd; */ - display: flex; - align-items: center; - justify-content: center; - margin-top: 20px; - position: relative; - border-radius: 50px; - margin-left: 25px; -} - -.stepxOver { - width: 120px; - height: 40px; - background-color: #303133; - color: white; - border: 1px solid white; - /* border: 1px solid #ddd; */ - display: flex; - align-items: center; - justify-content: center; - margin-top: 20px; - position: relative; - border-radius: 50px; - margin-left: 25px; -} - -/* 未处理 */ -.stepxEnable { - /* margin-right: 15px; */ - width: 120px; - height: 40px; - background-color: #A5A5A5; color: white; border: 1px solid white; /* border: 1px solid #ddd; */ diff --git a/src/components/CustomPages/SK/SK006ShowOperateLog.js b/src/components/CustomPages/SK/SK006ShowOperateLog.js index c61dfbf..40caa60 100644 --- a/src/components/CustomPages/SK/SK006ShowOperateLog.js +++ b/src/components/CustomPages/SK/SK006ShowOperateLog.js @@ -1,4 +1,4 @@ -import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd'; +import { Button, Descriptions, Badge, Popconfirm, Row, Col, Form, Input, Select, Table, Modal } from 'antd'; import React from 'react'; import { initFilter, @@ -8,6 +8,7 @@ import { showApprove, guid, ShowDateTime, + GetFileModel, } from '../../../utils/common.js'; import ReactToPrint from 'react-to-print'; import { ExportToExcel } from '@woowalker/feui'; @@ -17,6 +18,7 @@ import moment from 'moment'; import { message } from 'antd/lib/index'; import styles from './OperateLog.css'; import config from '../../../config.js'; +import FormPage from '../../FormPage'; class SK006ShowOperateLog extends React.Component { constructor(props) { @@ -26,6 +28,17 @@ class SK006ShowOperateLog extends React.Component { riskCount: 1, riskHeight: 50, opEnd: null, + detailForm: { + isShow: false, + formCode: '', + title: '', + ID: '', + }, + fileData: [], + fileForm: { + title: '', + visible: false, + }, // dateFirst: [ // [{ OPERATEPOINT: 10 }, { OPERATEPOINT: 20 }, { OPERATEPOINT: 30 }, { OPERATEPOINT: 40 }], // [{ OPERATEPOINT: 48 }, { OPERATEPOINT: 50 }, { OPERATEPOINT: 60 }, { OPERATEPOINT: 70 }, { OPERATEPOINT: 80 }], @@ -87,6 +100,35 @@ class SK006ShowOperateLog extends React.Component { }, }); }; + showDetailModalPage = (ID, CODE) => { + if (ID == null) return message.warning('暂无待办'); + const newtmpData = { + data: { + id: ID, + // USER_ID: USER_ID, + }, + formCode: CODE, + }; + this.setState({ tmpDataPage: newtmpData }, () => { + var detailForm = { + isShow: true, + title: '', + }; + console.log(this.state.tmpDataPage, '00'); + this.setState({ + detailForm: detailForm, + }); + }); + }; + //详情弹窗关闭（隐藏） + detailFormClose = () => { + var detailForm = { + isShow: false, + }; + this.setState({ + detailForm: detailForm, + }); + }; render() { const { data, riskCount, dataRiskMore, opEnd, riskHeight } = this.state; const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums; @@ -108,14 +150,22 @@ class SK006ShowOperateLog extends React.Component { data?.map((item, index) => { // 判断当前item的logList中是否所有STATUS都是0 const allStatusZero = item.logList?.every((log) => log.STATUS === 0); + // 获取上一个item的FORM_NAME + const prevFormName = index > 0 ? data[index - 1].FORM_NAME : null; + // 判断当前FORM_NAME是否与上一个重复 + const isDuplicate = item.FORM_NAME === prevFormName; + { return (
-
- {item.FORM_NAME} -
- {index < data.length - 1 && ( + {/* 当不是重复的FORM_NAME时才显示步骤名称 */} + {!isDuplicate && ( +
+ {item.FORM_NAME} +
+ )} + {!isDuplicate && index < data.length - 1 && (
)}
@@ -134,17 +184,21 @@ class SK006ShowOperateLog extends React.Component { }} key={index1} > -
+
this.showDetailModalPage(item1.ID, item1.CODE)}>
{item1.NAME} @@ -174,6 +228,20 @@ class SK006ShowOperateLog extends React.Component { {/* 隐患整改记录 */} +
+ + + +
+ {GetFileModel(Modal, FormPage, this, this.state.fileForm.visible)}
); } From 9aefffb9edfcf345605a161f5576ba225d39068d 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: Thu, 20 Nov 2025 18:49:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=8C=E6=94=BE=E5=87=BA=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomPages/FO/FO015ShowPrint.js | 2 +- .../CustomPages/FO/FO017ShowPrint.js | 2 +- .../CustomPages/FO/FO017ShowPrintJD.js | 1 - .../CustomPages/FO/FO019ShowPrint.js | 2 - .../CustomPages/FO/FO021ShowPrint.js | 1 - .../CustomPages/FO/FO022ShowPrint.js | 2 +- .../CustomPages/FO/FO025ShowPrint.js | 2 +- .../CustomPages/FO/FO035ShowPrint.js | 2 - .../CustomPages/FO/FO037ShowPrint.js | 3 +- .../CustomPages/FO/FO041ShowPrint.js | 3 +- .../CustomPages/FO/FO043ShowPrint.js | 3 +- .../CustomPages/FO/FO045ShowPrint.js | 3 +- .../CustomPages/SK/SK002ShowPrint.js | 2 - .../CustomPages/SK/SK004ShowPrint.js | 2 - .../CustomPages/SK/SK006ShowPrint.js | 4 +- .../CustomPages/SK/SK010ShowPrint.js | 2 +- .../CustomPages/SK/SK012ShowPrint.js | 2 +- .../CustomPages/SK/SK014ShowPrint.js | 2 +- .../CustomPages/SK/SK016ShowPrint.js | 2 +- .../CustomPages/SK/SK018ShowPrint.js | 2 +- .../CustomPages/SK/SK020ShowPrint.js | 2 +- .../CustomPages/SK/SK022ShowPrint.js | 10 ++-- .../CustomPages/SK/SK024ShowPrint.js | 2 +- .../CustomPages/SK/SK026ShowPrint.js | 2 +- .../CustomPages/SK/SK027ShowPrint.js | 2 +- .../CustomPages/SK/SK031ShowPrint.js | 2 +- .../CustomPages/SK/SK033ShowPrint.js | 2 +- .../CustomPages/SK/SK035CheckLibrary.js | 3 +- .../CustomPages/SK/SK035ShowPrint.js | 2 +- .../CustomPages/SK/SK037ShowPrint.js | 2 +- .../CustomPages/SK/SK039ShowPrint.js | 2 +- .../CustomPages/SK/SK041ShowPrint.js | 2 +- .../CustomPages/SK/SK043ShowPrint.js | 3 +- .../CustomPages/SK/SK045ShowPrint.js | 3 +- src/files/edit/SK006.js | 49 ++++++++----------- src/utils/customConfig.js | 28 +++++------ 36 files changed, 67 insertions(+), 93 deletions(-) diff --git a/src/components/CustomPages/FO/FO015ShowPrint.js b/src/components/CustomPages/FO/FO015ShowPrint.js index e5cc0b9..1838e97 100644 --- a/src/components/CustomPages/FO/FO015ShowPrint.js +++ b/src/components/CustomPages/FO/FO015ShowPrint.js @@ -93,7 +93,7 @@ class FO015ShowPrint extends React.Component { this.setState({ BtnAgreeDisplay: 'inline' }) } } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/FO/FO017ShowPrint.js b/src/components/CustomPages/FO/FO017ShowPrint.js index b74b43b..08f5ca6 100644 --- a/src/components/CustomPages/FO/FO017ShowPrint.js +++ b/src/components/CustomPages/FO/FO017ShowPrint.js @@ -82,7 +82,7 @@ class FO017ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/FO/FO017ShowPrintJD.js b/src/components/CustomPages/FO/FO017ShowPrintJD.js index 90f3a64..ffd64c8 100644 --- a/src/components/CustomPages/FO/FO017ShowPrintJD.js +++ b/src/components/CustomPages/FO/FO017ShowPrintJD.js @@ -82,7 +82,6 @@ class FO017ShowPrintJD extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } } }); } diff --git a/src/components/CustomPages/FO/FO019ShowPrint.js b/src/components/CustomPages/FO/FO019ShowPrint.js index 15f9a71..6668054 100644 --- a/src/components/CustomPages/FO/FO019ShowPrint.js +++ b/src/components/CustomPages/FO/FO019ShowPrint.js @@ -85,8 +85,6 @@ class FO019ShowPrint extends React.Component { this.setState({ BtnAgreeDisplay: 'inline' }) } } - else - { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');} } }); } diff --git a/src/components/CustomPages/FO/FO021ShowPrint.js b/src/components/CustomPages/FO/FO021ShowPrint.js index 6f64cb3..1c5dd69 100644 --- a/src/components/CustomPages/FO/FO021ShowPrint.js +++ b/src/components/CustomPages/FO/FO021ShowPrint.js @@ -88,7 +88,6 @@ class FO021ShowPrint extends React.Component { this.setState({ BtnAgreeDisplay: 'inline' }) } } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } } }); } diff --git a/src/components/CustomPages/FO/FO022ShowPrint.js b/src/components/CustomPages/FO/FO022ShowPrint.js index 567f989..ce3d5f5 100644 --- a/src/components/CustomPages/FO/FO022ShowPrint.js +++ b/src/components/CustomPages/FO/FO022ShowPrint.js @@ -104,7 +104,7 @@ class FO022ShowPrint extends React.Component { this.setState({ BtnAgreeDisplay: 'inline' }) } } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/FO/FO025ShowPrint.js b/src/components/CustomPages/FO/FO025ShowPrint.js index 918501d..56d9c8a 100644 --- a/src/components/CustomPages/FO/FO025ShowPrint.js +++ b/src/components/CustomPages/FO/FO025ShowPrint.js @@ -82,7 +82,7 @@ class FO025ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/FO/FO035ShowPrint.js b/src/components/CustomPages/FO/FO035ShowPrint.js index a53d47d..72b2ff6 100644 --- a/src/components/CustomPages/FO/FO035ShowPrint.js +++ b/src/components/CustomPages/FO/FO035ShowPrint.js @@ -74,8 +74,6 @@ class FO035ShowPrint extends React.Component { this.setState({ BtnAgreeDisplay: 'inline' }) } } - else - { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');} } }); } diff --git a/src/components/CustomPages/FO/FO037ShowPrint.js b/src/components/CustomPages/FO/FO037ShowPrint.js index 73869af..6296fb5 100644 --- a/src/components/CustomPages/FO/FO037ShowPrint.js +++ b/src/components/CustomPages/FO/FO037ShowPrint.js @@ -74,8 +74,7 @@ class FO037ShowPrint extends React.Component { this.setState({ BtnAgreeDisplay: 'inline' }) } } - else - { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');} + } }); } diff --git a/src/components/CustomPages/FO/FO041ShowPrint.js b/src/components/CustomPages/FO/FO041ShowPrint.js index b01ea89..c8b6cb5 100644 --- a/src/components/CustomPages/FO/FO041ShowPrint.js +++ b/src/components/CustomPages/FO/FO041ShowPrint.js @@ -74,8 +74,7 @@ class FO041ShowPrint extends React.Component { this.setState({ BtnAgreeDisplay: 'inline' }) } } - else - { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');} + } }); } diff --git a/src/components/CustomPages/FO/FO043ShowPrint.js b/src/components/CustomPages/FO/FO043ShowPrint.js index 49a7819..6c9b6e2 100644 --- a/src/components/CustomPages/FO/FO043ShowPrint.js +++ b/src/components/CustomPages/FO/FO043ShowPrint.js @@ -74,8 +74,7 @@ class FO043ShowPrint extends React.Component { this.setState({ BtnAgreeDisplay: 'inline' }) } } - else - { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');} + } }); } diff --git a/src/components/CustomPages/FO/FO045ShowPrint.js b/src/components/CustomPages/FO/FO045ShowPrint.js index a80fc6e..77104cc 100644 --- a/src/components/CustomPages/FO/FO045ShowPrint.js +++ b/src/components/CustomPages/FO/FO045ShowPrint.js @@ -74,8 +74,7 @@ class FO045ShowPrint extends React.Component { this.setState({ BtnAgreeDisplay: 'inline' }) } } - else - { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');} + } }); } diff --git a/src/components/CustomPages/SK/SK002ShowPrint.js b/src/components/CustomPages/SK/SK002ShowPrint.js index e1e8092..f21d33b 100644 --- a/src/components/CustomPages/SK/SK002ShowPrint.js +++ b/src/components/CustomPages/SK/SK002ShowPrint.js @@ -145,8 +145,6 @@ class SK002ShowPrint extends React.Component { // this.setState({ isFinished: 'inline' }) // } } - else - { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');} } }); } diff --git a/src/components/CustomPages/SK/SK004ShowPrint.js b/src/components/CustomPages/SK/SK004ShowPrint.js index ebd0b87..bdd0e9b 100644 --- a/src/components/CustomPages/SK/SK004ShowPrint.js +++ b/src/components/CustomPages/SK/SK004ShowPrint.js @@ -203,8 +203,6 @@ class SK004ShowPrint extends React.Component { // this.setState({ isFinished: 'inline' }) // } } - else - { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');} } }); } diff --git a/src/components/CustomPages/SK/SK006ShowPrint.js b/src/components/CustomPages/SK/SK006ShowPrint.js index 9f544a6..f3373be 100644 --- a/src/components/CustomPages/SK/SK006ShowPrint.js +++ b/src/components/CustomPages/SK/SK006ShowPrint.js @@ -79,7 +79,7 @@ class SK006ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } @@ -115,7 +115,7 @@ class SK006ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK010ShowPrint.js b/src/components/CustomPages/SK/SK010ShowPrint.js index 2a9beab..967e834 100644 --- a/src/components/CustomPages/SK/SK010ShowPrint.js +++ b/src/components/CustomPages/SK/SK010ShowPrint.js @@ -91,7 +91,7 @@ class SK010ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK012ShowPrint.js b/src/components/CustomPages/SK/SK012ShowPrint.js index bee86a7..33e9444 100644 --- a/src/components/CustomPages/SK/SK012ShowPrint.js +++ b/src/components/CustomPages/SK/SK012ShowPrint.js @@ -112,7 +112,7 @@ class SK012ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK014ShowPrint.js b/src/components/CustomPages/SK/SK014ShowPrint.js index e0acec8..f1efede 100644 --- a/src/components/CustomPages/SK/SK014ShowPrint.js +++ b/src/components/CustomPages/SK/SK014ShowPrint.js @@ -91,7 +91,7 @@ class SK014ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK016ShowPrint.js b/src/components/CustomPages/SK/SK016ShowPrint.js index 21bf5f4..523b7d7 100644 --- a/src/components/CustomPages/SK/SK016ShowPrint.js +++ b/src/components/CustomPages/SK/SK016ShowPrint.js @@ -71,7 +71,7 @@ class SK016ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK018ShowPrint.js b/src/components/CustomPages/SK/SK018ShowPrint.js index b3034f3..f0683f1 100644 --- a/src/components/CustomPages/SK/SK018ShowPrint.js +++ b/src/components/CustomPages/SK/SK018ShowPrint.js @@ -102,7 +102,7 @@ class SK018ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK020ShowPrint.js b/src/components/CustomPages/SK/SK020ShowPrint.js index 5cc1785..cd2e00c 100644 --- a/src/components/CustomPages/SK/SK020ShowPrint.js +++ b/src/components/CustomPages/SK/SK020ShowPrint.js @@ -91,7 +91,7 @@ class SK020ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK022ShowPrint.js b/src/components/CustomPages/SK/SK022ShowPrint.js index 366e29a..6444e57 100644 --- a/src/components/CustomPages/SK/SK022ShowPrint.js +++ b/src/components/CustomPages/SK/SK022ShowPrint.js @@ -92,7 +92,7 @@ class SK022ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } @@ -171,11 +171,9 @@ class SK022ShowPrint extends React.Component { { showFiles(data?.Nav_RectifyFiles, config.picServerHost, this) } -
- {data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null} - {enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]} - {data.ACCEPT_OPINION} -
+ {data.ACCEPT_DATE?moment(data.ACCEPT_DATE).format('YYYY-MM-DD'):null} + {enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]} + {data.ACCEPT_OPINION} { data.STATUS == 20 && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ? diff --git a/src/components/CustomPages/SK/SK024ShowPrint.js b/src/components/CustomPages/SK/SK024ShowPrint.js index 3758055..44d286c 100644 --- a/src/components/CustomPages/SK/SK024ShowPrint.js +++ b/src/components/CustomPages/SK/SK024ShowPrint.js @@ -84,7 +84,7 @@ class SK024ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK026ShowPrint.js b/src/components/CustomPages/SK/SK026ShowPrint.js index 97497e5..797fa9f 100644 --- a/src/components/CustomPages/SK/SK026ShowPrint.js +++ b/src/components/CustomPages/SK/SK026ShowPrint.js @@ -272,7 +272,7 @@ class SK026ShowPrint extends React.Component { // this.setState({ isFinished: 'inline' }) // } } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK027ShowPrint.js b/src/components/CustomPages/SK/SK027ShowPrint.js index a00a775..07ca05f 100644 --- a/src/components/CustomPages/SK/SK027ShowPrint.js +++ b/src/components/CustomPages/SK/SK027ShowPrint.js @@ -77,7 +77,7 @@ class SK027ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK031ShowPrint.js b/src/components/CustomPages/SK/SK031ShowPrint.js index 9851ece..b254452 100644 --- a/src/components/CustomPages/SK/SK031ShowPrint.js +++ b/src/components/CustomPages/SK/SK031ShowPrint.js @@ -68,7 +68,7 @@ class SK031ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK033ShowPrint.js b/src/components/CustomPages/SK/SK033ShowPrint.js index f57f3c6..6329857 100644 --- a/src/components/CustomPages/SK/SK033ShowPrint.js +++ b/src/components/CustomPages/SK/SK033ShowPrint.js @@ -72,7 +72,7 @@ class SK033ShowPrint extends React.Component { } this.onClickApprove(true); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK035CheckLibrary.js b/src/components/CustomPages/SK/SK035CheckLibrary.js index e3c3a73..9210b9b 100644 --- a/src/components/CustomPages/SK/SK035CheckLibrary.js +++ b/src/components/CustomPages/SK/SK035CheckLibrary.js @@ -210,8 +210,7 @@ class SK035CheckLibrary extends React.Component { } }); } - else - { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');} + } }); } diff --git a/src/components/CustomPages/SK/SK035ShowPrint.js b/src/components/CustomPages/SK/SK035ShowPrint.js index 3d06463..a96a8c5 100644 --- a/src/components/CustomPages/SK/SK035ShowPrint.js +++ b/src/components/CustomPages/SK/SK035ShowPrint.js @@ -72,7 +72,7 @@ class SK035ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK037ShowPrint.js b/src/components/CustomPages/SK/SK037ShowPrint.js index cb74b6f..49f89be 100644 --- a/src/components/CustomPages/SK/SK037ShowPrint.js +++ b/src/components/CustomPages/SK/SK037ShowPrint.js @@ -73,7 +73,7 @@ class SK037ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK039ShowPrint.js b/src/components/CustomPages/SK/SK039ShowPrint.js index a495048..ace2661 100644 --- a/src/components/CustomPages/SK/SK039ShowPrint.js +++ b/src/components/CustomPages/SK/SK039ShowPrint.js @@ -73,7 +73,7 @@ class SK039ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK041ShowPrint.js b/src/components/CustomPages/SK/SK041ShowPrint.js index b1d4eb8..9a9972e 100644 --- a/src/components/CustomPages/SK/SK041ShowPrint.js +++ b/src/components/CustomPages/SK/SK041ShowPrint.js @@ -73,7 +73,7 @@ class SK041ShowPrint extends React.Component { } this.onClickApprove(false); } - else { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!'); } + } }); } diff --git a/src/components/CustomPages/SK/SK043ShowPrint.js b/src/components/CustomPages/SK/SK043ShowPrint.js index 2c077fa..46bf059 100644 --- a/src/components/CustomPages/SK/SK043ShowPrint.js +++ b/src/components/CustomPages/SK/SK043ShowPrint.js @@ -67,8 +67,7 @@ class SK043ShowPrint extends React.Component { // this.setState({ isFinished: 'inline' }) // } } - else - { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');} + } }); } diff --git a/src/components/CustomPages/SK/SK045ShowPrint.js b/src/components/CustomPages/SK/SK045ShowPrint.js index 6ea9976..156c740 100644 --- a/src/components/CustomPages/SK/SK045ShowPrint.js +++ b/src/components/CustomPages/SK/SK045ShowPrint.js @@ -71,8 +71,7 @@ class SK045ShowPrint extends React.Component { // this.setState({ isFinished: 'inline' }) // } } - else - { message.error('请先尝试刷新，若仍然加载失败，请联系管理员排查!');} + } }); } diff --git a/src/files/edit/SK006.js b/src/files/edit/SK006.js index 42d49af..841fe7b 100644 --- a/src/files/edit/SK006.js +++ b/src/files/edit/SK006.js @@ -124,34 +124,27 @@ export default { } } }, - // onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => { - // if (colInfo.FIELD_NAME === 'Nav_ProdutionUnit.NAME' || colInfo.FIELD_NAME === 'Nav_CheckType.NAME' ||colInfo.FIELD_NAME === 'DEPARTMENT_TYPE'||colInfo.FIELD_NAME === 'PLANCHECKFREQUENCY') - // { - // let json = initFilter(login.OrgId); - // json.Parameter1 = getFieldValue('PRODUCTION_UNIT_ID'); - // json.Parameter2 = getFieldValue('CHECK_TYPE_ID'); - // json.Parameter3 = getFieldValue('DEPARTMENT_TYPE') ; - // json.Parameter4 = getFieldValue('PLANCHECKFREQUENCY') ; - // dispatch({ - // type: 'app/getDataByPost', - // url: 'SK/SKSecurityInspectionNotice/GetCheckContentPCs', - // payload: json, - // onlyData: false, - // onComplete: (re) => { - // if (re && re.IsSuccessful && re.Data) { - // let temps = []; - // // let detailConfirms=re.Data?.map((item,i)=>{ - // // item['NUM'] = i+1; - // // item['SafeConfirmsStr'] = item.NAME; - // // return item; - // // }); - // temps.push({ field: 'Nav_CheckNoticeDetails', value: re.Data }) - // setFieldValueByBatch(temps); - // } - // } - // }) - // } - // }, + onChange: ({ colInfo, getFieldValue,stateData, setFieldValueByBatch, dispatch,login,updateSubTableData }) => { + if (colInfo.FIELD_NAME === 'Nav_ProdutionUnit.NAME' || colInfo.FIELD_NAME === 'Nav_CheckType.NAME' ||colInfo.FIELD_NAME === 'DEPARTMENT_TYPE'||colInfo.FIELD_NAME === 'PLANCHECKFREQUENCY') + { + dispatch({ + type: 'app/getDataByPost', + url: 'SK/SKSecurityInspectionNotice/GetCheckContentsNew', + payload: stateData, + onlyData: false, + onComplete: (re) => { + if (re && re.IsSuccessful && re.Data) { + let temps = []; + temps.push({ field: 'Nav_CheckNoticeDetails', value: re.Data }) + setFieldValueByBatch(temps); + // stateData.Nav_CheckNoticeDetails = re.Data + // saveRowRecord({ record: stateData, editCode: "T_SK_SECURITY_INSPECTION_NOTICE_DETAIL" }) + } + + } + }) + } + }, btnSubAdd: ({row, srcRecord,getSelectedRecords,record,saveRowRecord,colInfo,parentRecord,pageCode, stateData,setState, close, loadData, login, btn, dispatch,props }) => { if(login.tempContents && login.tempContents.length>0) diff --git a/src/utils/customConfig.js b/src/utils/customConfig.js index 2c57814..d5fdaf9 100644 --- a/src/utils/customConfig.js +++ b/src/utils/customConfig.js @@ -151,8 +151,8 @@ const SE063ShowPrint = createLoadableComponent(() => import('../components/Custo const SE051ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE051ShowPrint')) const SE007ShowPrint = createLoadableComponent(() => import('../components/CustomPages/SE/SE007ShowPrint')) -// const BI001HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI001HomeDetail')) -// const BI002HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI002HomeDetail')) +const BI001HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI001HomeDetail')) +const BI002HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI002HomeDetail')) // const BI054HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI054HomeDetail')) // const BI055HomeDetail = createLoadableComponent(() => import('../components/CustomPages/BI/BI055HomeDetail')) // const BI004FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI004FormRunAnalysis')) @@ -164,8 +164,8 @@ const SE007ShowPrint = createLoadableComponent(() => import('../components/Custo // const BI008FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI008FormRunAnalysis')) // const BI009RiskAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI009RiskAnalysis')) // const BI010FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI010FormRunAnalysis')) -// const BI011FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011FormRunAnalysis')) -// const BI011TrainSafeAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011TrainSafeAnalysis')) +const BI011FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011FormRunAnalysis')) +const BI011TrainSafeAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI011TrainSafeAnalysis')) // const BI012NotificationTaskAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI012NotificationTaskAnalysis')) // const BI013RiskAnalysisModel = createLoadableComponent(() => import('../components/CustomPages/BI/BI013RiskAnalysisModel')) // const BI030FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI030FormRunAnalysis')) @@ -173,14 +173,14 @@ const SE007ShowPrint = createLoadableComponent(() => import('../components/Custo // const BI060MapeShow = createLoadableComponent(() => import('../components/CustomPages/BI/BI060MapeShow')) // const BI060MapePoint = createLoadableComponent(() => import('../components/CustomPages/BI/BI060MapePoint')) // const BI061MapeGISShow = createLoadableComponent(() => import('../components/CustomPages/BI/BI061MapeGISShow')) -// const BI009FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI009FormRunAnalysis')) -// const BIView = createLoadableComponent(() => import('../components/CustomPages/BI/BIView')) +const BI009FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI009FormRunAnalysis')) +const BIView = createLoadableComponent(() => import('../components/CustomPages/BI/BIView')) // const BI001 = createLoadableComponent(() => import('../components/CustomPages/BI/BI001')) // const BI050BSSafeCheck = createLoadableComponent(() => import('../components/CustomPages/BI/BI050BSSafeCheck')) // const BI051BSCompanyYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI051BSCompanyYearOne')) // const BI052BSSafeCheckYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI052BSSafeCheckYearOne')) // const BI053BSSafeCheckYear = createLoadableComponent(() => import('../components/CustomPages/BI/BI053BSSafeCheckYearOne')) -// const BI056Performance = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Performance')) +const BI056Performance = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Performance')) // const BI056Dilg1_1 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg1_1')) // const BI056Dilg1_2 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg1_2')) // const BI056Dilg2_1 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg2_1')) @@ -189,7 +189,7 @@ const SE007ShowPrint = createLoadableComponent(() => import('../components/Custo // const BI056Dilg3_2 = createLoadableComponent(() => import('../components/CustomPages/BI/BI056Dilg3_2')) // const BI003StatiscialAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI003StatiscialAnalysis')) // const BI020ApproveAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI020ApproveAnalysis')) -// const BI014RiskPerformanceModel = createLoadableComponent(() => import('../components/CustomPages/BI/BI014RiskPerformanceModel')) +const BI014RiskPerformanceModel = createLoadableComponent(() => import('../components/CustomPages/BI/BI014RiskPerformanceModel')) // const BI012FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/BI/BI012FormRunAnalysis')) const PF136FormRunAnalysis = createLoadableComponent(() => import('../components/CustomPages/PF/PF136FormRunAnalysis')) @@ -373,7 +373,7 @@ export default function (componentName, formId, formParam, data, formCode, formD // CM045ShowPrint: , - // BIView: , + BIView: , // BI001: , // BI050BSSafeCheck: , // BI051BSCompanyYear: , @@ -381,7 +381,7 @@ export default function (componentName, formId, formParam, data, formCode, formD // BI053BSSafeCheckYear: , // BI054HomeDetail: , // BI055HomeDetail: , - // BI056Performance: , + BI056Performance: , // BI056Dilg1_1: , // BI056Dilg1_2: , // BI056Dilg2_1: , @@ -389,7 +389,7 @@ export default function (componentName, formId, formParam, data, formCode, formD // BI056Dilg3_1: , // BI056Dilg3_2: , // BI003StatiscialAnalysis: , - // BI001HomeDetail: , + BI001HomeDetail: , // BI002HomeDetail: , // BI004FormRunAnalysis: , // BI005LoginRecord: , @@ -400,8 +400,8 @@ export default function (componentName, formId, formParam, data, formCode, formD // BI008FormRunAnalysis: , // BI009RiskAnalysis: , // BI010FormRunAnalysis: , - // BI011FormRunAnalysis: , - // BI011TrainSafeAnalysis: , + BI011FormRunAnalysis: , + BI011TrainSafeAnalysis: , // BI012NotificationTaskAnalysis: , // BI013RiskAnalysisModel: , // BI014RiskPerformanceModel: , @@ -409,7 +409,7 @@ export default function (componentName, formId, formParam, data, formCode, formD // BI060MapeShow: , // BI060MapePoint: , // BI061MapeGISShow: , - // BI009FormRunAnalysis: , + BI009FormRunAnalysis: , // BI020ApproveAnalysis: , // BI012FormRunAnalysis: , PF136FormRunAnalysis: ,