领导带班下井记录
+动火作业工作票动火作业工作票(外包)
{ data ?| 序号 | +作业人员类别 | +姓名 | +证书编号 | +附件 | + {/*签名 | */} +
| + {i + 1} + | ++ {item.Nav_UserType?.NAME} + | ++ {item.USER_NAME} + | ++ {item.CERTIFICATE_CODE} + | ++ {showFiles(item.Nav_UserFiles, config.picServerHost, this)} + | + {/*+ { item.DEAL_STATUS == 1? + showUserSign(item.Nav_User, config.picServerHost):null + } + | */} +
| 序号 | +作业阶段 | +作业流程及安全措施 | +是否确认 | +附件 | +
| + {i + 1} + | ++ {enums.FOJobStepEnum.enums[data.JOB_STEP]} + | ++ {item.CONTENT} + | ++ {enums.FOYesOrNoEnum.enums[data.IS_CONFIRM]} + | ++ {showFiles(item.Nav_DetailFiles, config.picServerHost, this)} + | + +
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id} className="printDIV">
领导带班下井记录
- { - data ? + { + data?
-
+
{data.Nav_Company?.NAME}
{data.Nav_ProductionUnit?.NAME}
{data.CREATE_TIME}
@@ -123,101 +123,105 @@ class FO041ShowPrint extends React.Component {
{data.JOB_END_DATE}
{data.Nav_Class?.NAME}
{showFiles(data.Nav_Files, config.picServerHost, this)}
- {
- data && data.Nav_Details?
-
-
-
-
+
+
+
: null
- }
- {data.PLACE}
- {
- data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => {
- return item.Nav_PreUser?.NAME + ' '
- })
- }
- {
- data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => {
- if (item.PRE_USER_DEAL_STATUS == 1) {
- showUserSign(item.Nav_PreUser, config.picServerHost)
- }
- })
-
- }
- {
- data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
- return item.Nav_AfterUser?.NAME + ' '
- })
-
- }
- {
- data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
- if (item.AFTER_USER_DEAL_STATUS == 1) {
- showUserSign(item.Nav_AfterUser, config.picServerHost)
- }
- })
- }
-
- : null
- }
-
+
+
+ {item.DESCRIPTION}
+
+
+ {item.QUESTION}
+
+
+ {item.MEASURE}
+
+
+ {showFiles(item.Nav_DetailFiles, config.picServerHost, this)}
+
+
+ {item.Nav_User?.NAME}
+
+
+ {item.USER_DEAL_STATUS == 1?showUserSign(item.Nav_User, config.picServerHost):null}
+
+
+ {item.ITEM}
+
+
+ })
+ }
+
+
: null
+ }
+
+
+ {data.PLACE}
+ {
+ data.Nav_Users && data.Nav_Users.map((item, i) => {
+ return item.Nav_User?.NAME + ' '
+ })
+ }
+ {
+ data.Nav_Users && data.Nav_Users.map((item, i) => {
+ if (item.DEAL_STATUS == 1) {
+ showUserSign(item.Nav_User, config.picServerHost)
+ }
+ })
+
+ }
+ {
+ data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
+ return item.Nav_AfterUser?.NAME + ' '
+ })
+
+ }
+ {
+ data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
+ if (item.AFTER_USER_DEAL_STATUS == 1) {
+ showUserSign(item.Nav_AfterUser, config.picServerHost)
+ }
+ })
+ }
+
+
:null
+ }
+ | 序号 | -开始时间 | -结束时间 | -巡视区域 | -现场情况描述 | -发现问题 | -处置措施 | -附件 | -现场责任人 | -现场责任人签名 | -交接事项 | -
| - {i + 1} - | -- {item.START_DATE} - | -- {item.END_DATE} - | -- { - item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => { - return | |||||||
| - {item.DESCRIPTION} - | -- {item.QUESTION} - | -- {item.MEASURE} - | -- {showFiles(item.Nav_DetailFiles, config.picServerHost, this)} - | -- {item.Nav_User?.NAME} - | -- {item.USER_DEAL_STATUS == 1?showUserSign(item.Nav_User, config.picServerHost):item.Nav_User?.NAME} - | -- {item.ITEM} - | - + + + { + data && data.Nav_Details? +
| 序号 | +开始时间 | +结束时间 | +巡视区域 | +现场情况描述 | +发现问题 | +处置措施 | +附件 | +现场责任人 | +现场责任人签名 | +交接事项 | +
| + {i + 1} + | ++ {item.START_DATE} + | ++ {item.END_DATE} + | ++ { + item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => { + return | |||||||
+
+
}
content={() => this.componentRef}
@@ -107,7 +119,7 @@ class FO043ShowPrint extends React.Component {
{
data ?
@@ -278,4 +285,4 @@ class FO045ShowPrint extends React.Component {
}
}
-export default connect(({ login }) => ({ login }))(FO045ShowPrint)
\ No newline at end of file
+export default connect(({ login,app }) => ({ login,app }))(FO045ShowPrint)
\ No newline at end of file
From 3bdb66b5eebd0f5c6b11ff1140493ca38a6146c4 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: Sat, 22 Nov 2025 17:16:28 +0800
Subject: [PATCH 05/12] =?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/files/edit/FO043.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/files/edit/FO043.js b/src/files/edit/FO043.js
index d86f811..f2ffa80 100644
--- a/src/files/edit/FO043.js
+++ b/src/files/edit/FO043.js
@@ -63,7 +63,7 @@ export default {
setFieldEditable('IS_FIRE', false)
setFieldEditable('ACT_DATE', false)
setFieldEditable('Nav_FireFiles', false)
- setFieldEditable('Nav_DispatchUser', false)
+ setFieldEditable('Nav_DispatchUser.NAME', false)
setFieldEditable('COMPLETED_CONTENT', true)
setFieldEditable('IS_LEAVE', true)
setFieldEditable('ACT_END_DATE', true)
From f573b58bd0340df32a5c6ceed70e50fc02ddfb3c 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: Sat, 22 Nov 2025 17:30:36 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=80=9A=E7=9F=A5?=
=?UTF-8?q?=E5=AD=90=E8=A1=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/files/edit/SK006.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/files/edit/SK006.js b/src/files/edit/SK006.js
index 841fe7b..4831e12 100644
--- a/src/files/edit/SK006.js
+++ b/src/files/edit/SK006.js
@@ -135,6 +135,10 @@ export default {
onComplete: (re) => {
if (re && re.IsSuccessful && re.Data) {
let temps = [];
+ let rets=re.Data?.map((item,i)=>{
+ item['ROW_NO'] = i+1;
+ return item;
+ });
temps.push({ field: 'Nav_CheckNoticeDetails', value: re.Data })
setFieldValueByBatch(temps);
// stateData.Nav_CheckNoticeDetails = re.Data
From 868bbbc5c0668d6d2a6bc320b759922026275575 Mon Sep 17 00:00:00 2001
From: ccy <55274652@qq.com>
Date: Sat, 22 Nov 2025 19:26:57 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=B8=8B=E6=8B=89?=
=?UTF-8?q?=E5=A4=9A=E9=80=89=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/common/MultiSelectPagination.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/components/common/MultiSelectPagination.js b/src/components/common/MultiSelectPagination.js
index f7ceb21..783628a 100644
--- a/src/components/common/MultiSelectPagination.js
+++ b/src/components/common/MultiSelectPagination.js
@@ -462,8 +462,7 @@ class MultiSelectPagination extends React.Component {
this.setState({
value: stateValue,
searchKey: ""
- //fetching: false,
- }, () => this.initFilterJson("", 1));
+ });
let retVal = this.getDataValue(stateValue);
this.state.baseNav.forEach(db => {
const index = stateValue.findIndex(i => i.key == db[this.state.saveId]);
From 58815d13836c88992ceaf89e6829707cca664e1c 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: Sat, 22 Nov 2025 22:16:30 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CustomPages/FO/FO043ShowPrint.js | 6 ++--
.../CustomPages/FO/FO045ShowPrint.js | 28 +++++++++----------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/components/CustomPages/FO/FO043ShowPrint.js b/src/components/CustomPages/FO/FO043ShowPrint.js
index 9d5dd39..8d30fe2 100644
--- a/src/components/CustomPages/FO/FO043ShowPrint.js
+++ b/src/components/CustomPages/FO/FO043ShowPrint.js
@@ -214,7 +214,7 @@ class FO043ShowPrint extends React.Component {
-
+
{data.Nav_Company?.NAME}
{data.Nav_ProductionUnit?.NAME}
{data.CREATE_TIME}
diff --git a/src/components/CustomPages/FO/FO045ShowPrint.js b/src/components/CustomPages/FO/FO045ShowPrint.js
index 00340a6..855a656 100644
--- a/src/components/CustomPages/FO/FO045ShowPrint.js
+++ b/src/components/CustomPages/FO/FO045ShowPrint.js
@@ -3,11 +3,12 @@ import { Button,Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table }
import React from 'react';
import { initFilter, extendRule, extendInclude,extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter,showFiles, GetFileModel,showUserSign } from "../../../utils/common";
import ReactToPrint from "react-to-print";
-import stylesStep from '../HI/StepForm.css';
+import styles from '../HI/StepForm.css';
import config from "../../../config";
import XLSX from 'xlsx';
import { connect } from 'dva';
import moment from 'moment';
+import FormPage from '../../../components/FormPage'
class FO045ShowPrint extends React.Component {
constructor(props) {
super(props);
@@ -73,12 +74,21 @@ class FO045ShowPrint extends React.Component {
}else{
this.setState({ BtnAgreeDisplay: 'inline' })
}
+ this.onClickApprove(false);
}
}
});
}
-
+ onClickApprove = (appVisible) => {
+ const newtmpData = {
+ data: { id: this.props.data.id, isShow: true, key: guid(), param: this.props.data.param, appVisible: appVisible, BtnAgreeDisplay: 'inline' },
+ formCode: "PF123",
+ }
+ this.setState({
+ tmpData: newtmpData,
+ });
+ }
onTableBtnExport() {
let TableWrap = document.getElementById('tableId' + this.props.data.id);
let Table = TableWrap.getElementsByTagName('table')[0];
@@ -88,8 +98,10 @@ class FO045ShowPrint extends React.Component {
render() {
const { data } = this.state;
+ const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
return
@@ -283,4 +291,4 @@ class FO043ShowPrint extends React.Component {
}
}
-export default connect(({ login }) => ({ login }))(FO043ShowPrint)
\ No newline at end of file
+export default connect(({ login,app }) => ({ login,app }))(FO043ShowPrint)
\ No newline at end of file
diff --git a/src/components/CustomPages/FO/FO045ShowPrint.js b/src/components/CustomPages/FO/FO045ShowPrint.js
index 855a656..9a63218 100644
--- a/src/components/CustomPages/FO/FO045ShowPrint.js
+++ b/src/components/CustomPages/FO/FO045ShowPrint.js
@@ -15,7 +15,11 @@ class FO045ShowPrint extends React.Component {
this.state = {
data: null,
enumData: null,
- BtnAgreeDisplay: 'none'
+ BtnAgreeDisplay: 'none',
+ fileForm: {
+ title: "",
+ visible: false,
+ },
};
};
@@ -146,7 +150,55 @@ 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?
+ showUserSign(data.Nav_FireUser, config.picServerHost)
+ :null
+
+ }
+ {
+
+ data.SAFE_DEAL_STATUS == 1?
+ showUserSign(data.Nav_SafeUser, 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
+ }
+
+
+
@@ -207,13 +259,14 @@ class FO045ShowPrint extends React.Component {
{i + 1}
: null
}
- {data.COMPLETED_CONDITION}
- {enums.FOYesOrNoEnum.enums[data.IS_FIRE]}
- {data.ACT_DATE}
- {showFiles(data.Nav_FireFiles, config.picServerHost, this)}
-
- {
-
- 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.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
}
+
}
content={() => this.componentRef}
@@ -103,11 +115,11 @@ class FO045ShowPrint extends React.Component {
{/* */}
{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
+ }
+
+
+
@@ -205,13 +264,14 @@ class FO043ShowPrint extends React.Component {
{i + 1}
: 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
}
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id} className="printDIV">
-
diff --git a/src/components/CustomPages/FO/FO043ShowPrint.js b/src/components/CustomPages/FO/FO043ShowPrint.js
index 2a2831f..9d5dd39 100644
--- a/src/components/CustomPages/FO/FO043ShowPrint.js
+++ b/src/components/CustomPages/FO/FO043ShowPrint.js
@@ -15,7 +15,11 @@ class FO043ShowPrint extends React.Component {
this.state = {
data: null,
enumData: null,
- BtnAgreeDisplay: 'none'
+ BtnAgreeDisplay: 'none',
+ fileForm: {
+ title: "",
+ visible: false,
+ },
};
};
@@ -144,7 +148,62 @@ class FO043ShowPrint extends React.Component {
return item.RISK_NAME + ' '
})}
动火作业工作票动火作业工作票(外包)
+动火作业工作票(外包)
{ data ?
-
+
{data.Nav_Company?.NAME}
{data.Nav_ProductionUnit?.NAME}
{data.CREATE_TIME}
diff --git a/src/files/edit/FO039.js b/src/files/edit/FO039.js
index d38b0b4..de1bee1 100644
--- a/src/files/edit/FO039.js
+++ b/src/files/edit/FO039.js
@@ -6,7 +6,7 @@ import moment from 'moment';
*/
// 编辑
export default {
- onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => {
+ onChange: ({ colInfo, getFieldValue, setFieldValueByBatch,setFieldValue, dispatch,login,updateSubTableData }) => {
if (!(colInfo.FIELD_NAME == 'Nav_User.NAME'))
return;
@@ -26,8 +26,8 @@ export default {
},
onSubChange: ({ row, getFieldValue, setFieldValueByBatch, pageCode, record, setDataState, colInfo, dispatch, stateData, saveRowRecord }) => {
if (colInfo.FIELD_NAME === "START_DATE" ||colInfo.FIELD_NAME === "END_DATE" ) {
- let startDate = getFieldValue('START_DATE')
- let endDate = getFieldValue('END_DATE')
+ let startDate = getDataFieldValue(record, 'START_DATE');
+ let endDate =getDataFieldValue(record, 'END_DATE');
if(startDate && endDate)
{
const start = new Date(startDate);
@@ -40,8 +40,17 @@ export default {
yearsWithDecimal = yearsWithDecimal.substring(0, yearsWithDecimal.length - 2);
}
- record["WORK_YEAR"] = parseDecimal(yearsWithDecimal);
+ record["WORK_YEAR"] = yearsWithDecimal;
saveRowRecord(record)
+ if(stateData && stateData.Nav_Details)
+ {
+ let year = 0;
+ stateData.Nav_Details.map(t=>{
+ year = Math.round(year + t.WORK_YEAR);
+ })
+ stateData.YEAR=year
+ setDataState(stateData)
+ }
}
}
}
diff --git a/src/files/edit/FO043.js b/src/files/edit/FO043.js
index 6cbd8e7..d86f811 100644
--- a/src/files/edit/FO043.js
+++ b/src/files/edit/FO043.js
@@ -37,7 +37,7 @@ export default {
setFieldEditable('IS_FIRE', false)
setFieldEditable('ACT_DATE', false)
setFieldEditable('Nav_FireFiles', false)
- setFieldEditable('Nav_DispatchUser', false)
+ setFieldEditable('Nav_DispatchUser.NAME', false)
setFieldEditable('COMPLETED_CONTENT', false)
setFieldEditable('IS_LEAVE', false)
setFieldEditable('ACT_END_DATE', false)
@@ -50,7 +50,7 @@ export default {
setFieldEditable('IS_FIRE', true)
setFieldEditable('ACT_DATE', true)
setFieldEditable('Nav_FireFiles', true)
- setFieldEditable('Nav_DispatchUser', true)
+ setFieldEditable('Nav_DispatchUser.NAME', true)
setFieldEditable('COMPLETED_CONTENT', false)
setFieldEditable('IS_LEAVE', false)
setFieldEditable('ACT_END_DATE', false)
@@ -75,7 +75,7 @@ export default {
setFieldEditable('IS_FIRE', false)
setFieldEditable('ACT_DATE', false)
setFieldEditable('Nav_FireFiles', false)
- setFieldEditable('Nav_DispatchUser', false)
+ setFieldEditable('Nav_DispatchUser.NAME', false)
setFieldEditable('COMPLETED_CONTENT', false)
setFieldEditable('IS_LEAVE', false)
setFieldEditable('ACT_END_DATE', false)
From 3641bac5f80a280c7fcf3ca27f0c9d54c634d9db Mon Sep 17 00:00:00 2001
From: ccy <55274652@qq.com>
Date: Sat, 22 Nov 2025 08:58:37 +0800
Subject: [PATCH 03/12] a
---
src/baseComponents/EditBaseComponent/index.js | 54 +++++++-------
src/baseComponents/EditComponent/index.js | 5 +-
src/components/Table/ListPage.js | 9 +++
src/feui/search/index.js | 25 +++++++
src/files/list/SK058.js | 71 ++++++++++++-------
5 files changed, 112 insertions(+), 52 deletions(-)
diff --git a/src/baseComponents/EditBaseComponent/index.js b/src/baseComponents/EditBaseComponent/index.js
index d80d0c9..4055532 100644
--- a/src/baseComponents/EditBaseComponent/index.js
+++ b/src/baseComponents/EditBaseComponent/index.js
@@ -22,7 +22,7 @@ import TableModal from '../../components/Table/TableModal';
import CombinationModal from '../../components/Combination/CombinationModal'
import { get, set } from 'lodash'
const TabPane = Tabs.TabPane;
-
+let clickQuery = "";
class EditBaseComponent extends ComponentBase {
constructor(props) {
super(props);
@@ -568,28 +568,29 @@ params【字段名称显示】
设置表头字段的文字提示
params【字段名称显示】
*/
-setRowFieldTooltip = (editCode, params) => {
- const detailColumnConfig = this.getEditConfig({ editCode });
- const cols = detailColumnConfig ? detailColumnConfig.columns : [];
- Object.keys(params).forEach((n) => {
- const temps = cols.filter(t => t.field === n);
- if (temps && temps.length) {debugger
- var temp=temps[0].label;
- temps[0].label =
- {temp}
-
- }
- });
- this.setEditConfig({
- editConfig: { columns: cols },
- editCode,
- });
-}
+ setRowFieldTooltip = (editCode, params) => {
+ const detailColumnConfig = this.getEditConfig({ editCode });
+ const cols = detailColumnConfig ? detailColumnConfig.columns : [];
+ Object.keys(params).forEach((n) => {
+ const temps = cols.filter(t => t.field === n);
+ if (temps && temps.length) {
+ debugger
+ var temp = temps[0].label;
+ temps[0].label =
+ {temp}
+
+ }
+ });
+ this.setEditConfig({
+ editConfig: { columns: cols },
+ editCode,
+ });
+ }
-/*
-设置表头字段的可见性
-params【字段名称】=是否可编辑
- */
+ /*
+ 设置表头字段的可见性
+ params【字段名称】=是否可编辑
+ */
setRowFieldDisable = (editCode, params) => {
const detailColumnConfig = this.getEditConfig({ editCode });
const cols = detailColumnConfig ? detailColumnConfig.columns : [];
@@ -2880,6 +2881,7 @@ params【字段属性】=值
}
type:0-行按钮 1-按钮 2-右侧按钮
*/
+
getRenderBtn(params) {
const { editCode, editConfig, record, btnConfig, type, parentId, parentRecord } = params ? params : {};
const isRow = record;
@@ -2937,8 +2939,13 @@ params【字段属性】=值
if (!content && btnParam) {
const that = this;
const clickKey = btnConfig.code ? btnConfig.code : btnConfig.id;
+
const regClick = async function () {
const ids = getIds();
+ if (btnConfig.customParams.indexOf('reset') > -1) {
+ clickQuery = guid();
+ }
+
let isError = false;
if (!ids && !isRow && btnConfig.checkSelected) {
message.error('请选择记录');
@@ -3028,8 +3035,7 @@ params【字段属性】=值
}
}
-
-
+ tempData.clearQuery = clickQuery;
btnParam.content = {data.JOB_START_DATE}
{data.JOB_END_DATE}
{data.Nav_Class?.NAME}
- {showFiles(data.Nav_Files, config.picServerHost, this)}
+ {showFiles(data.Nav_Files, config.picServerHost, this)}
+
+
+
+ {data.PLACE}
+ {
+ data.Nav_Users && data.Nav_Users.map((item, i) => {
+ return item.Nav_User?.NAME + ' '
+ })
+ }
+ {
+ data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
+ return item.Nav_AfterUser?.NAME + ' '
+ })
+ }
+
+
+
+ {
+ data.Nav_Users && data.Nav_Users.map((item, i) => {
+ if (item.DEAL_STATUS == 1) {
+ showUserSign(item.Nav_User, config.picServerHost)
+ }
+ })
+
+ }
+
+ {
+ data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
+ if (item.AFTER_USER_DEAL_STATUS == 1) {
+ showUserSign(item.Nav_AfterUser, config.picServerHost)
+ }
+ })
+ }
{
data && data.Nav_Details?
@@ -158,7 +195,7 @@ class FO041ShowPrint extends React.Component {
{
item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => {
- return {item2?.Nav_Area?.NAME}
+ return item2?.Nav_Area?.NAME +' '
})
}
@@ -189,36 +226,7 @@ class FO041ShowPrint extends React.Component {
: null
}
-
-
- {data.PLACE}
- {
- data.Nav_Users && data.Nav_Users.map((item, i) => {
- return item.Nav_User?.NAME + ' '
- })
- }
- {
- data.Nav_Users && data.Nav_Users.map((item, i) => {
- if (item.DEAL_STATUS == 1) {
- showUserSign(item.Nav_User, config.picServerHost)
- }
- })
-
- }
- {
- data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
- return item.Nav_AfterUser?.NAME + ' '
- })
-
- }
- {
- data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => {
- if (item.AFTER_USER_DEAL_STATUS == 1) {
- showUserSign(item.Nav_AfterUser, config.picServerHost)
- }
- })
- }
-
+
:null
}
-
| - {enums.FOJobStepEnum.enums[data.JOB_STEP]} + {enums.FOJobStepEnum.enums[item.JOB_STEP]} | {item.CONTENT} | - {enums.FOYesOrNoEnum.enums[data.IS_CONFIRM]} + {item.IS_CONFIRM_NEW ? "是" : "否"} + {/* {enums.FOYesOrNoEnum.enums[item.IS_CONFIRM]} */} | {showFiles(item.Nav_DetailFiles, config.picServerHost, this)} @@ -223,59 +283,7 @@ class FO043ShowPrint extends React.Component { |
| - {enums.FOJobStepEnum.enums[data.JOB_STEP]} + {enums.FOJobStepEnum.enums[item.JOB_STEP]} | {item.CONTENT} | - {enums.FOYesOrNoEnum.enums[data.IS_CONFIRM]} + {item.IS_CONFIRM_NEW ? "是" : "否"} + {/* {enums.FOYesOrNoEnum.enums[item.IS_CONFIRM]} */} | {showFiles(item.Nav_DetailFiles, config.picServerHost, this)} @@ -225,52 +278,6 @@ class FO045ShowPrint extends React.Component { |