(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id} className="printDIV">
-
领导带班下井记录
+
动火作业工作票
{
data ?
- {data.CODE}
- {data.NAME}
- {data.DISCLOSURE_DATE}
- {data.JOB_LOCATION}
- {data.Nav_User ? data.Nav_User.NAME : ''}
- {
- data.Nav_Person && data.Nav_Person.map((item, i) => {
- if (i == (data.Nav_Person.length - 1)) {
- if (item.DEAL_STATUS == 0)
- return
- else
- return item.Nav_User?.NAME
- } else {
- if (item.DEAL_STATUS == 0)
- return
- else
- return item.Nav_User?.NAME + ' '
- }
- })
- }
- {data.DisclosureContent}
- {
- (data.Nav_User && data.Nav_User.FILE_PATH)?
- showUserSign(data.Nav_User, config.picServerHost):null
+ {data.Nav_Company?.NAME}
+ {data.Nav_ProductionUnit?.NAME}
+ {data.CREATE_TIME}
+
+ {data.Nav_ApplyDepartment?.NAME}
+ {data.Nav_ApplyUser?.NAME}
+ {data.CODE}
+ {data.Nav_OperationStep?.NAME}
+ {enums.HMOperationTaskAuditEnum.enums[data.AUDIT_LEVEL]}
+ {enums.SKEvaluateLevelEnum.enums[data.EVALUATE_LEVEL]}
+ {data.Nav_FireDepartment?.NAME}
+ {data.Nav_FireUser?.NAME}
+ {data.Nav_SafeUser?.NAME}
+ {data.Nav_Area?.NAME}
+ {data.JOB_CONTENT}
+ {data.Nav_Type?.NAME}
+ {data.JOB_CONTENT}
+ {data.Nav_MonitorUser?.NAME}
+ {data.JOB_DATE}
+ {data.JOB_END_DATE}
+ { data.Nav_Risks && data.Nav_Risks.map((item, i) => {
+ return item.RISK_NAME + ' '
+ })}
+ {showFiles(data.Nav_Files, config.picServerHost, this)}
+ {
+ data && data.Nav_Users?
+
+
+
+
+ | 序号 |
+ 作业人员类别 |
+ 姓名 |
+ 证书编号 |
+ 附件 |
+ 签名 |
+
+ {
+ data.Nav_Users && data.Nav_Users.map((item, i) => {
+ return
+ |
+ {i + 1}
+ |
+
+ {item.Nav_UserType?.NAME}
+ |
+
+ {item.Nav_User?.NAME}
+ |
+
+ {item.CERTIFICATE_CODE}
+ |
+
+ {showFiles(item.Nav_UserFiles, config.picServerHost, this)}
+ |
+
+ { item.DEAL_STATUS == 1?
+ showUserSign(item.Nav_User, config.picServerHost):null
+ }
+ |
+
+ })
+ }
+
+
: null
+ }
+ {
+ data && data.Nav_Details?
+
+
+
+
+ | 序号 |
+ 作业阶段 |
+ 作业流程及安全措施 |
+ 是否确认 |
+ 附件 |
+
+ {
+ data.Nav_Details && data.Nav_Details.map((item, i) => {
+ return
+ |
+ {i + 1}
+ |
+
+ {enums.FOJobStepEnum.enums[data.JOB_STEP]}
+ |
+
+ {item.CONTENT}
+ |
+
+ {enums.FOYesOrNoEnum.enums[data.IS_CONFIRM]}
+ |
+
+ {showFiles(item.Nav_DetailFiles, config.picServerHost, this)}
+ |
+
+
+ })
+ }
+
+
: 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.Nav_Person && data.Nav_Person.map((item, i) => {
- if (item.DEAL_STATUS == 1) {
- showUserSign(item.Nav_User, config.picServerHost)
- }
- })
+ {
+
+ 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 77104cc..00340a6 100644
--- a/src/components/CustomPages/FO/FO045ShowPrint.js
+++ b/src/components/CustomPages/FO/FO045ShowPrint.js
@@ -33,14 +33,14 @@ class FO045ShowPrint extends React.Component {
onTableBtnAgree() {
this.props.dispatch({
type: 'app/getDataByPost',
- url: 'FO/FOLeaderWellRecord/PersonalAgree',
+ url: 'FO/FOFireJobWb/IdentityUpdate',
payload: {
ID: this.props.data.id,
TaskID: this.props.data.TaskID,
},
onComplete: (ret) => {
if (ret) {
- message.success('确认成功！');
+ message.success('提交成功！');
this.setState({ BtnAgreeDisplay: 'none' })
this.BtnClose();
}
@@ -60,7 +60,7 @@ class FO045ShowPrint extends React.Component {
this.props.dispatch({
type: 'app/getDataByPost',
payload: json,
- url: 'FO/FOLeaderWellRecord/GetEdit',
+ url: 'FO/FOFireJobWb/GetEdit',
onComplete: (ret) => {
if (ret) {
if(this.props.data && this.props.data.loadDataDeal)
@@ -74,7 +74,7 @@ class FO045ShowPrint extends React.Component {
this.setState({ BtnAgreeDisplay: 'inline' })
}
}
-
+
}
});
}
@@ -83,7 +83,7 @@ class FO045ShowPrint extends React.Component {
let TableWrap = document.getElementById('tableId' + this.props.data.id);
let Table = TableWrap.getElementsByTagName('table')[0];
const wb = XLSX.utils.table_to_book(Table);
- XLSX.writeFile(wb, "领导带班下井记录.xlsx")
+ XLSX.writeFile(wb, "动火作业工作票(外包).xlsx")
}
render() {
@@ -96,50 +96,167 @@ class FO045ShowPrint extends React.Component {
pageStyle=".printDIV { padding:0 40px;} img{width :120px}"
/>
-
+
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id} className="printDIV">
-
领导带班下井记录
+
动火作业工作票动火作业工作票(外包)
{
data ?
- {data.CODE}
- {data.NAME}
- {data.DISCLOSURE_DATE}
- {data.JOB_LOCATION}
- {data.Nav_User ? data.Nav_User.NAME : ''}
- {
- data.Nav_Person && data.Nav_Person.map((item, i) => {
- if (i == (data.Nav_Person.length - 1)) {
- if (item.DEAL_STATUS == 0)
- return
- else
- return item.Nav_User?.NAME
- } else {
- if (item.DEAL_STATUS == 0)
- return
- else
- return item.Nav_User?.NAME + ' '
- }
- })
- }
- {data.DisclosureContent}
- {
- (data.Nav_User && data.Nav_User.FILE_PATH)?
- showUserSign(data.Nav_User, config.picServerHost):null
+ {data.Nav_Company?.NAME}
+ {data.Nav_ProductionUnit?.NAME}
+ {data.CREATE_TIME}
+
+ {data.Nav_ApplyDepartment?.NAME}
+ {data.Nav_ApplyUser?.NAME}
+ {data.CODE}
+ {data.Nav_OperationStep?.NAME}
+ {enums.HMOperationTaskAuditEnum.enums[data.AUDIT_LEVEL]}
+ {enums.SKEvaluateLevelEnum.enums[data.EVALUATE_LEVEL]}
+ {data.DPARTMENT_NAME}
+ {data.USER_NAME}
+ {data.USER_PHONE}
+ {data.SAFE_USER_NAME}
+ {data.SAFE_USER_PHONE}
+ {data.Nav_Area?.NAME}
+ {data.JOB_CONTENT}
+ {data.Nav_Type?.NAME}
+ {data.JOB_CONTENT}
+ {data.Nav_MonitorUser?.NAME}
+ {data.JOB_DATE}
+ {data.JOB_END_DATE}
+ { data.Nav_Risks && data.Nav_Risks.map((item, i) => {
+ return item.RISK_NAME + ' '
+ })}
+ {showFiles(data.Nav_Files, config.picServerHost, this)}
+ {
+ data && data.Nav_Users?
+
+
+
+
+ | 序号 |
+ 作业人员类别 |
+ 姓名 |
+ 证书编号 |
+ 附件 |
+ {/* 签名 | */}
+
+ {
+ data.Nav_Users && data.Nav_Users.map((item, i) => {
+ return
+ |
+ {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
+ }
+ | */}
+
+ })
+ }
+
+
: null
+ }
+ {
+ data && data.Nav_Details?
+
+
+
+
+ | 序号 |
+ 作业阶段 |
+ 作业流程及安全措施 |
+ 是否确认 |
+ 附件 |
+
+ {
+ data.Nav_Details && data.Nav_Details.map((item, i) => {
+ return
+ |
+ {i + 1}
+ |
+
+ {enums.FOJobStepEnum.enums[data.JOB_STEP]}
+ |
+
+ {item.CONTENT}
+ |
+
+ {enums.FOYesOrNoEnum.enums[data.IS_CONFIRM]}
+ |
+
+ {showFiles(item.Nav_DetailFiles, config.picServerHost, this)}
+ |
+
+
+ })
+ }
+
+
: 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.Nav_Person && data.Nav_Person.map((item, i) => {
- if (item.DEAL_STATUS == 1) {
- showUserSign(item.Nav_User, config.picServerHost)
- }
- })
+ {
+
+ 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
diff --git a/src/files/edit/FOO035.js b/src/files/edit/FO035.js
similarity index 100%
rename from src/files/edit/FOO035.js
rename to src/files/edit/FO035.js
diff --git a/src/files/edit/FO039.js b/src/files/edit/FO039.js
new file mode 100644
index 0000000..d38b0b4
--- /dev/null
+++ b/src/files/edit/FO039.js
@@ -0,0 +1,48 @@
+import { message } from "antd/lib/index";
+import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
+import moment from 'moment';
+/**
+ * @return {string}
+ */
+// 编辑
+export default {
+ onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => {
+ if (!(colInfo.FIELD_NAME == 'Nav_User.NAME'))
+ return;
+
+ let code = getFieldValue('USER_ID')
+ let json = initFilter(login.OrgId,code);
+ dispatch({
+ type: 'app/getDataByPost',
+ url: 'FO/FOProfessionalResume/GetUserAge',
+ payload: json,
+ onlyData: false,
+ onComplete: (re) => {
+ if (re && re.IsSuccessful && re.Data) {
+ setFieldValue('AGE',re.Data.AGE)
+ }
+ }
+ })
+ },
+ 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')
+ if(startDate && endDate)
+ {
+ const start = new Date(startDate);
+ const end = new Date(endDate);
+ const years = end.getFullYear() - start.getFullYear();
+ const months = end.getMonth() - start.getMonth();
+ let yearsWithDecimal = (years + (months / 12)).toFixed(1); // 保留一位小数
+ if (yearsWithDecimal.endsWith('.0')) {
+ // 去掉末尾的.0，但不四舍五入
+ yearsWithDecimal = yearsWithDecimal.substring(0, yearsWithDecimal.length - 2);
+
+ }
+ record["WORK_YEAR"] = parseDecimal(yearsWithDecimal);
+ saveRowRecord(record)
+ }
+ }
+}
+}
\ No newline at end of file
diff --git a/src/files/edit/FO043.js b/src/files/edit/FO043.js
new file mode 100644
index 0000000..6cbd8e7
--- /dev/null
+++ b/src/files/edit/FO043.js
@@ -0,0 +1,108 @@
+import { message } from "antd/lib/index";
+import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
+import moment from 'moment';
+/**
+ * @return {string}
+ */
+// 编辑
+export default {
+ onBeforeSaveHandleRecord(params) {
+ params.record.TaskID = params.data.TaskID //TaskID传递消息表ID
+ params.record.PUBLISH = params.customParams;
+ },
+ onBeforeEdit: ({ isNew,login,record, dispatch,stateData, setFieldEditable,setFieldVisible,setFieldValue,setFieldValueByBatch }) => {
+ if (isNew) {
+ let json = initFilter(login.OrgId);
+ extendRule(json, "ID", 1, login.userId);
+ extendInclude(json, 'Nav_Department.Nav_Unit');
+ dispatch({
+ type: 'app/getDataByPost',
+ url: 'FM/User/Get',
+ payload: json,
+ onComplete: (ret) => {
+ if (ret) {
+ let temps = [];
+ temps.push({ field: 'APPLY_USER_ID', value: ret.ID})
+ temps.push({ field: 'Nav_ApplyUser.NAME', value: ret.NAME })
+ temps.push({ field: 'APPLY_DEPARTMENT_ID', value: ret.DEPARTMENT_ID})
+ temps.push({ field: 'Nav_ApplyDepartment.NAME', value: ret.Nav_Department?.NAME })
+ temps.push({ field: 'PRODUCTION_UNIT_ID', value: ret.Nav_Department?.PRODUCTION_UNIT_ID})
+ temps.push({ field: 'Nav_ProductionUnit.NAME', value: ret.Nav_Department?.Nav_Unit?.NAME })
+ setFieldValueByBatch(temps);
+ }
+ }
+ });
+ ///发起人不能编辑
+ setFieldEditable('COMPLETED_CONDITION', false)
+ setFieldEditable('IS_FIRE', false)
+ setFieldEditable('ACT_DATE', false)
+ setFieldEditable('Nav_FireFiles', false)
+ setFieldEditable('Nav_DispatchUser', false)
+ setFieldEditable('COMPLETED_CONTENT', false)
+ setFieldEditable('IS_LEAVE', false)
+ setFieldEditable('ACT_END_DATE', false)
+ setFieldEditable('LEAVE_DATE', false)
+ setFieldEditable('Nav_MonitorFiles', false)
+ }
+ else if(stateData.FIRE_STATUS == 10)
+ {
+ setFieldEditable('COMPLETED_CONDITION', true)
+ setFieldEditable('IS_FIRE', true)
+ setFieldEditable('ACT_DATE', true)
+ setFieldEditable('Nav_FireFiles', true)
+ setFieldEditable('Nav_DispatchUser', true)
+ setFieldEditable('COMPLETED_CONTENT', false)
+ setFieldEditable('IS_LEAVE', false)
+ setFieldEditable('ACT_END_DATE', false)
+ setFieldEditable('LEAVE_DATE', false)
+ setFieldEditable('Nav_MonitorFiles', false)
+ }
+ 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', false)
+ setFieldEditable('COMPLETED_CONTENT', true)
+ setFieldEditable('IS_LEAVE', true)
+ setFieldEditable('ACT_END_DATE', true)
+ setFieldEditable('LEAVE_DATE', true)
+ setFieldEditable('Nav_MonitorFiles', true)
+ }else
+ {
+ setFieldEditable('COMPLETED_CONDITION', false)
+ setFieldEditable('IS_FIRE', false)
+ setFieldEditable('ACT_DATE', false)
+ setFieldEditable('Nav_FireFiles', false)
+ setFieldEditable('Nav_DispatchUser', false)
+ setFieldEditable('COMPLETED_CONTENT', false)
+ setFieldEditable('IS_LEAVE', false)
+ setFieldEditable('ACT_END_DATE', false)
+ setFieldEditable('LEAVE_DATE', false)
+ setFieldEditable('Nav_MonitorFiles', false)
+ }
+ },
+ onChange: ({ colInfo, getFieldValue, setFieldValueByBatch, dispatch,login,updateSubTableData }) => {
+ if (!(colInfo.FIELD_NAME == 'Nav_OperationStep.NAME'))
+ return;
+
+ let code = getFieldValue('OPERATION_STEP_ID')
+ let json = initFilter(login.OrgId,code);
+ dispatch({
+ type: 'app/getDataByPost',
+ url: 'FO/FOFireJob/GetAnalyzeDetail',
+ payload: json,
+ onlyData: false,
+ onComplete: (re) => {
+ if (re && re.IsSuccessful && re.Data) {
+ let temps = [];
+ temps.push({ field: 'Nav_Details', value: re.Data.Nav_Details })
+ temps.push({ field: 'EVALUATE_LEVEL', value: re.Data.EVALUATE_LEVEL })
+ temps.push({ field: 'AUDIT_LEVEL', value: re.Data.AUDIT_LEVEL})
+ setFieldValueByBatch(temps);
+ }
+ }
+ })
+ },
+}
From c82e7125c64ff570576857961a93cc7ebc79ff1c 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 01:42:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/CustomPages/FM/UserEditPage.js | 12 ++
.../CustomPages/FO/FO035ShowPrint.js | 2 +-
.../CustomPages/FO/FO037ShowPrint.js | 2 +-
.../CustomPages/FO/FO041ShowPrint.js | 198 +++++++++---------
.../CustomPages/FO/FO043ShowPrint.js | 18 +-
.../CustomPages/FO/FO045ShowPrint.js | 20 +-
src/files/edit/FO039.js | 17 +-
src/files/edit/FO043.js | 6 +-
8 files changed, 162 insertions(+), 113 deletions(-)
diff --git a/src/components/CustomPages/FM/UserEditPage.js b/src/components/CustomPages/FM/UserEditPage.js
index dd0805c..cb14934 100644
--- a/src/components/CustomPages/FM/UserEditPage.js
+++ b/src/components/CustomPages/FM/UserEditPage.js
@@ -720,6 +720,18 @@ class UserEditPage extends React.Component {
)}
+
+
+ { onChange('BORN_DATE', dateString, 0) }}
+ />
+
+
{data.CODE}
- {data.NAME}
+ {/* {data.NAME} */}
{data.DISCLOSURE_DATE}
{data.JOB_LOCATION}
{data.Nav_User ? data.Nav_User.NAME : ''}
diff --git a/src/components/CustomPages/FO/FO037ShowPrint.js b/src/components/CustomPages/FO/FO037ShowPrint.js
index 6296fb5..3873198 100644
--- a/src/components/CustomPages/FO/FO037ShowPrint.js
+++ b/src/components/CustomPages/FO/FO037ShowPrint.js
@@ -109,7 +109,7 @@ class FO037ShowPrint extends React.Component {
{data.CODE}
- {data.NAME}
+ {/* {data.NAME} */}
{data.DISCLOSURE_DATE}
{data.JOB_LOCATION}
{data.Nav_User ? data.Nav_User.NAME : ''}
diff --git a/src/components/CustomPages/FO/FO041ShowPrint.js b/src/components/CustomPages/FO/FO041ShowPrint.js
index 74d8807..36651d7 100644
--- a/src/components/CustomPages/FO/FO041ShowPrint.js
+++ b/src/components/CustomPages/FO/FO041ShowPrint.js
@@ -3,7 +3,7 @@ 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';
@@ -104,10 +104,10 @@ class FO041ShowPrint extends React.Component {
(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?
-
-
-
-
- | 序号 |
- 开始时间 |
- 结束时间 |
- 巡视区域 |
- 现场情况描述 |
- 发现问题 |
- 处置措施 |
- 附件 |
- 现场责任人 |
- 现场责任人签名 |
- 交接事项 |
-
- {
- data.Nav_Details && data.Nav_Details.map((item, i) => {
- return
- |
- {i + 1}
- |
-
- {item.START_DATE}
- |
-
- {item.END_DATE}
- |
-
- {
- item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => {
- return |
{item2?.Nav_Area?.NAME}
- })
- }
-
-
- {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?
+
+
+
+
+ | 序号 |
+ 开始时间 |
+ 结束时间 |
+ 巡视区域 |
+ 现场情况描述 |
+ 发现问题 |
+ 处置措施 |
+ 附件 |
+ 现场责任人 |
+ 现场责任人签名 |
+ 交接事项 |
+
+ {
+ data.Nav_Details && data.Nav_Details.map((item, i) => {
+ return
+ |
+ {i + 1}
+ |
+
+ {item.START_DATE}
+ |
+
+ {item.END_DATE}
+ |
+
+ {
+ item?.Nav_DetailAreas && item?.Nav_DetailAreas.map((item2, i) => {
+ return |
{item2?.Nav_Area?.NAME}
})
}
-
-
: 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
+ }
+
}
diff --git a/src/components/CustomPages/FO/FO043ShowPrint.js b/src/components/CustomPages/FO/FO043ShowPrint.js
index 527e191..2a2831f 100644
--- a/src/components/CustomPages/FO/FO043ShowPrint.js
+++ b/src/components/CustomPages/FO/FO043ShowPrint.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 FO043ShowPrint extends React.Component {
constructor(props) {
super(props);
@@ -73,12 +74,21 @@ class FO043ShowPrint 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 FO043ShowPrint extends React.Component {
render() {
const { data } = this.state;
+ const enums = this.props.data.enums ? this.props.data.enums : this.props.app.enums;
return
+
}
content={() => this.componentRef}
@@ -107,7 +119,7 @@ class FO043ShowPrint extends React.Component {
{
data ?
-
+
{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
+
}
content={() => this.componentRef}
@@ -103,11 +115,11 @@ class FO045ShowPrint extends React.Component {
{/* */}
(this.componentRef = el)} style={{ padding: '20px' }} id={'tableId' + this.props.data.id} className="printDIV">
-
动火作业工作票动火作业工作票(外包)
+
动火作业工作票(外包)
{
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)