diff --git a/src/views/gf/confinedspace/confinedspace/components/detail.vue b/src/views/gf/confinedspace/confinedspace/components/detail.vue index ded0d85..66ead8b 100644 --- a/src/views/gf/confinedspace/confinedspace/components/detail.vue +++ b/src/views/gf/confinedspace/confinedspace/components/detail.vue @@ -8,7 +8,7 @@

受限空间安全作业票

-
编号:{{ pd.CHECK_NO }}
+
编号:{{ pd.CHECK_NO }}
@@ -122,7 +122,7 @@ {{ item.PROTECTIVE_MEASURES }} - 涉    及 + 涉   及 不涉及 @@ -158,10 +158,10 @@ 接受交底人 -
+
签字: - - {{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}
@@ -185,13 +185,13 @@
- +
完工验收:{{ pd.ACCEPT_CONTENT }}
-
+
签字: - - {{ pd.ACCEPT_USER_SIGNER_TIME }} + + {{ item.ACCEPT_USER_SIGNER_TIME }}
@@ -216,6 +216,8 @@ export default { measuresList: [], gasList: [], gas: {}, + imgList: [], + imgList1: [], otherProtectiveMeasures: [] } }, @@ -271,6 +273,8 @@ export default { // 将数组转回字符串 data.measuresList[i].PROTECTIVE_MEASURES = PROTECTIVE_MEASURES.join('') } + this.imgList = data.imgList + this.imgList1 = data.imgList1 this.measuresList = data.measuresList // 参数map this.gasList = data.gasList // 参数map this.gas = data.gas || {} // 参数map @@ -309,6 +313,4 @@ export default { img width: 100% height: 100% -.app-container - margin-bottom: 50px diff --git a/src/views/gf/confinedspace/confinedspace/components/list.vue b/src/views/gf/confinedspace/confinedspace/components/list.vue index 96d41f3..ebe97d3 100644 --- a/src/views/gf/confinedspace/confinedspace/components/list.vue +++ b/src/views/gf/confinedspace/confinedspace/components/list.vue @@ -45,6 +45,8 @@ 作业负责人审核打回 所在单位审核打回 验收打回 + 已作废(监护人未签字) + 已作废(未进行气体检测) @@ -98,6 +100,39 @@ +
+
+
+ 监护人:{{ pd.GUARDIAN_USER_NAME }}已签字 +
+
+
+
+ 监护人:{{ pd.GUARDIAN_USER_NAME }}未签字 +
+
+
+
+ 安全交底人:{{ pd.CONFESS_USER_NAME }}已签字 +
+
+
+
+ 安全交底人:{{ pd.CONFESS_USER_NAME }}未签字 +
+
+
+
+ 接受交底人:{{ pd.ACCEPT_CONFESS_USER_NAME }}已签字 +
+
+
+
+ 接受交底人:{{ pd.ACCEPT_CONFESS_USER_NAME }}未签字 +
+
+
+