diff --git a/src/views/gf/breakground/breakground/components/detail.vue b/src/views/gf/breakground/breakground/components/detail.vue
index 3ed35f8..3619c5a 100644
--- a/src/views/gf/breakground/breakground/components/detail.vue
+++ b/src/views/gf/breakground/breakground/components/detail.vue
@@ -8,7 +8,7 @@
动土安全作业票
- 编号:{{ pd.CHECK_NO }}
+ 编号:{{ pd.CHECK_NO }}
|
@@ -77,7 +77,7 @@
{{ index + 1 }} |
{{ item.PROTECTIVE_MEASURES }} |
- 涉 及
+ 涉 及
不涉及
|
@@ -125,10 +125,10 @@
|
接受交底人 |
-
+
签字:
-
- {{ pd.ACCEPT_CONFESS_USER_SIGNER_TIME }}
+
+ {{ item.ACCEPT_CONFESS_USER_SIGNER_TIME }}
|
@@ -172,13 +172,13 @@
-
-
+ |
+
完工验收:{{ pd.ACCEPT_CONTENT }}
-
+
签字:
-
- {{ pd.ACCEPT_USER_SIGNER_TIME }}
+
+ {{ item.ACCEPT_USER_SIGNER_TIME }}
|
@@ -201,6 +201,8 @@ export default {
BREAKGROUND_ID: this.$parent.BREAKGROUND_ID, // 主键ID
pd: [], // 存放字段参数
measuresList: [],
+ imgList: [],
+ imgList1: [],
otherProtectiveMeasures: [],
hazardIdentification: []
}
@@ -240,6 +242,8 @@ export default {
).then((data) => {
this.listLoading = false
this.pd = data.pd // 参数map
+ this.imgList = data.imgList
+ this.imgList1 = data.imgList1
this.measuresList = data.measuresList // 参数map
this.pd.APPLY_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.CONSTRUCTION_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
@@ -272,6 +276,4 @@ export default {
img
width: 100%
height: 100%
-.app-container
- margin-bottom: 50px
diff --git a/src/views/gf/breakground/breakground/components/list.vue b/src/views/gf/breakground/breakground/components/list.vue
index 162eb95..44a017f 100644
--- a/src/views/gf/breakground/breakground/components/list.vue
+++ b/src/views/gf/breakground/breakground/components/list.vue
@@ -129,18 +129,52 @@
{{ pd.ACCEPT_USER_SIGNER_TIME }}
-
+
diff --git a/src/views/gf/breakground/pigeonhole/components/list.vue b/src/views/gf/breakground/pigeonhole/components/list.vue
index bba737c..fb3d845 100644
--- a/src/views/gf/breakground/pigeonhole/components/list.vue
+++ b/src/views/gf/breakground/pigeonhole/components/list.vue
@@ -90,7 +90,7 @@ export default {
edit: false,
listQuery: {
page: 1,
- limit: 20
+ limit: 10
},
total: 0,
KEYWORDS: '',
@@ -105,7 +105,7 @@ export default {
replyVarList: [], // REPLY
replyListQuery: {
page: 1,
- limit: 20
+ limit: 10
},
replyTotal: 0,
dialogFormHuifuShow: false,