From 97608821fb445766fe5a62a8b142cdbcdcc8992e Mon Sep 17 00:00:00 2001 From: limingyu Date: Fri, 26 Apr 2024 15:06:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=98=BE=E7=A4=BA=E5=85=B6=E5=AE=83=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigeonhole/components/detail.vue | 103 ++++++++++++++---- .../pigeonhole/components/list.vue | 26 +++-- 2 files changed, 94 insertions(+), 35 deletions(-) diff --git a/src/views/hotwork_cfd/pigeonhole/components/detail.vue b/src/views/hotwork_cfd/pigeonhole/components/detail.vue index dba6d39..7a570fe 100644 --- a/src/views/hotwork_cfd/pigeonhole/components/detail.vue +++ b/src/views/hotwork_cfd/pigeonhole/components/detail.vue @@ -34,6 +34,12 @@ 动火人及证书编号 {{ pd.WORK_USER }} + + 动火操作人图片 + + + + 作业单位 {{ pd.CONFIRM_DEPARTMENT_NAME }} @@ -51,7 +57,7 @@ 分析结果/% {{ item.ANALYZE_RESULT }} - 分析人 + 气体分析单位负责人 {{ item.ANALYZE_USER }} @@ -97,28 +103,33 @@ {{ item.CONFIRM_NAME }} - + {{ measuresList.length + 1 }} -
- 其他安全措施：{{ pd.CONFIRM_USER_MEASURES }} - 编制人：{{ pd.CONFIRM_USER_NAME }} +
+ 安全措施确认人：{{ pd.SAFETY_USER_MEASURES }}
+
+ 作业负责人：{{ pd.CONFIRM_OTHER_CONTENT }} +
+
+ 项目责任负责人：{{ pd.BELONGING_USER_MEASURES }} +
+ + +
- 其他安全措施：{{ pd.LEADER_USER_MEASURES }} - 编制人：{{ pd.LEADER_USER_NAME }} + 属地监管单位：{{ pd.LEADER_USER_MEASURES }}
- 其他安全措施：{{ pd.AUDIT_USER_MEASURES }} - 编制人：{{ pd.AUDIT_USER_NAME }} + 安全管理部门：{{ pd.AUDIT_USER_MEASURES }}
- 其他安全措施：{{ pd.APPROVE_USER_MEASURES }} - 编制人：{{ pd.APPROVE_USER_NAME }} + 动火审批人：{{ pd.APPROVE_USER_MEASURES }}
- 其他安全措施：{{ pd.MONITOR_USER_MEASURES }} - 编制人：{{ pd.MONITOR_USER_NAME }} + 动火前验票：{{ pd.MONITOR_USER_MEASURES }}
@@ -128,10 +139,10 @@ 安全交底人 -
+
签字： - - {{ pd.CONFESS_USER_SIGNER_TIME }} + + {{ item.APPROVAL_SIGNATURE_TIME }}
@@ -155,6 +166,16 @@
+ + 安全措施确认人 + +
+ 签字： + + {{ pd.SAFETY_SIGNATURE_TIME }} +
+ +
作业负责人意见：{{ pd.CONFIRM_CONTENT }}
@@ -165,9 +186,19 @@
+ + +
项目主管部门负责人意见：{{ pd.BELONGING_OPINIONS }}
+
+ 签字： + + {{ pd.BELONGING_SIGNATURE_TIME }} +
+ + -
所在单位意见：{{ pd.LEADER_CONTENT }}
+
属地监管单位意见：{{ pd.LEADER_CONTENT }}
签字： @@ -197,7 +228,7 @@ -
动火前，岗位当班班长验票情况：{{ pd.MONITOR_CONTENT }}
+
动火前验票负责人：{{ pd.MONITOR_CONTENT }}
签字： @@ -242,7 +273,8 @@ export default { gasList: [], imgList: [], imgList1: [], - otherProtectiveMeasures: [] + otherProtectiveMeasures: [], + confessList: [] } }, created() { @@ -362,6 +394,11 @@ export default { console.log(this.pd) this.imgList = data.imgList this.imgList1 = data.imgList1 + data.pd.confessList.forEach(item => { + if (item.APPROVAL_SIGNATURE_TIME !== undefined && item.APPROVAL_SIGNATURE_TIME.trim() !== '') { + this.confessList.push(item) + } + }) for (let i = 0; i < data.measuresList.length; i++) { // 将字符串转成数组 const PROTECTIVE_MEASURES = data.measuresList[i].PROTECTIVE_MEASURES.split('') @@ -381,11 +418,29 @@ export default { } this.measuresList = data.measuresList // 参数map this.gasList = data.gasList // 参数map - this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] - this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] - this.pd.AUDIT_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] - this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] - this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] + if (this.pd.WORK_LEVEL === '二级') { + this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] + this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] + this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] + } else if (this.pd.WORK_LEVEL === '一级') { + this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] + this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] + this.pd.AUDIT_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] + this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] + } else { + this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] + this.pd.LEADER_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1] + this.pd.AUDIT_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[2] + this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[3] + this.pd.MONITOR_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[4] + } + const dongHuoCaoZuoRenPic = data.imgList2 + if (dongHuoCaoZuoRenPic && dongHuoCaoZuoRenPic.length > 0) { + this.pd.dongHuoCaoZuoRenPic = [] + for (let i = 0; i < dongHuoCaoZuoRenPic.length; i++) { + this.pd.dongHuoCaoZuoRenPic.push(this.config.fileUrl + dongHuoCaoZuoRenPic[i].FILEPATH) + } + } }).catch((e) => { this.listLoading = false }) diff --git a/src/views/hotwork_cfd/pigeonhole/components/list.vue b/src/views/hotwork_cfd/pigeonhole/components/list.vue index ca18a88..3429519 100644 --- a/src/views/hotwork_cfd/pigeonhole/components/list.vue +++ b/src/views/hotwork_cfd/pigeonhole/components/list.vue @@ -25,9 +25,9 @@ - + - +