diff --git a/src/views/gf/highwork/highwork/components/detail.vue b/src/views/gf/highwork/highwork/components/detail.vue index 3d5e168..a442620 100644 --- a/src/views/gf/highwork/highwork/components/detail.vue +++ b/src/views/gf/highwork/highwork/components/detail.vue @@ -8,7 +8,7 @@

高处安全作业票

-
编号:{{ pd.CHECK_NO }}
+
编号:{{ pd.CHECK_NO }}
@@ -79,7 +79,7 @@ {{ index + 1 }} {{ item.PROTECTIVE_MEASURES }} - 涉    及 + 涉   及 不涉及 @@ -123,10 +123,10 @@ 接受交底人 -
+
签字: - - {{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}
@@ -170,13 +170,13 @@
- - + +
完工验收:{{ pd.ACCEPT_CONTENT }}
-
+
签字: - - {{ pd.ACCEPT_USER_SIGNER_TIME }} + + {{ item.ACCEPT_USER_SIGNER_TIME }}
@@ -200,6 +200,8 @@ export default { pd: [], // 存放字段参数 measuresList: [], otherProtectiveMeasures: [], + imgList: [], + imgList1: [], hazardIdentification: [] } }, @@ -237,6 +239,8 @@ export default { } ).then((data) => { this.listLoading = false + this.imgList = data.imgList + this.imgList1 = data.imgList1 this.pd = data.pd // 参数map this.measuresList = data.measuresList // 参数map this.pd.CONFIRM_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] @@ -269,6 +273,4 @@ export default { img width: 100% height: 100% -.app-container - margin-bottom: 50px diff --git a/src/views/gf/highwork/highwork/components/list.vue b/src/views/gf/highwork/highwork/components/list.vue index b18a3a8..57f015c 100644 --- a/src/views/gf/highwork/highwork/components/list.vue +++ b/src/views/gf/highwork/highwork/components/list.vue @@ -127,6 +127,38 @@ +
+
+
+ 监护人:{{ 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 }}未签字 +
+
+