diff --git a/src/views/gf/blindboard/blindboard/components/detail.vue b/src/views/gf/blindboard/blindboard/components/detail.vue index f6293f2..6bc9f64 100644 --- a/src/views/gf/blindboard/blindboard/components/detail.vue +++ b/src/views/gf/blindboard/blindboard/components/detail.vue @@ -8,7 +8,7 @@

盲板抽堵安全作业票

-
编号:{{ pd.CHECK_NO }}
+
编号:{{ pd.CHECK_NO }}
@@ -96,7 +96,7 @@ {{ index + 1 }} {{ item.PROTECTIVE_MEASURES }} - 涉    及 + 涉   及 不涉及 @@ -125,8 +125,8 @@ 安全交底人 - -
+ +
签字: {{ pd.CONFESS_USER_SIGNER_TIME }} @@ -135,11 +135,11 @@ 接受交底人 - -
+ +
签字: - - {{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }} + + {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}
@@ -163,19 +163,19 @@
- - + +
完工验收:{{ pd.ACCEPT_CONTENT }}
-
+
签字: - - {{ pd.ACCEPT_USER_SIGNER_TIME }} + + {{ item.ACCEPT_USER_SIGNER_TIME }}
- +
返 回
@@ -192,6 +192,8 @@ export default { BLINDBOARD_ID: this.$parent.BLINDBOARD_ID, // 主键ID pd: [], // 存放字段参数 boardList: [], + imgList: [], + imgList1: [], measuresList: [] } }, @@ -226,6 +228,8 @@ export default { ).then((data) => { this.listLoading = false this.pd = data.pd // 参数map + this.imgList = data.imgList + this.imgList1 = data.imgList1 this.boardList = data.boardList // 参数map this.measuresList = data.measuresList // 参数map this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0] @@ -249,13 +253,11 @@ export default { span vertical-align: middle - .print-approval-img - width: 200px - height: 97px - display: inline-block - img - width: 100% - height: 100% - .app-container - margin-bottom: 50px + .print-approval-img + width: 200px + height: 97px + display: inline-block + img + width: 100% + height: 100% diff --git a/src/views/gf/blindboard/blindboard/components/list.vue b/src/views/gf/blindboard/blindboard/components/list.vue index b43cd5b..f158290 100644 --- a/src/views/gf/blindboard/blindboard/components/list.vue +++ b/src/views/gf/blindboard/blindboard/components/list.vue @@ -108,6 +108,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 }}未签字 +
+
+