diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 202c2844..d010f06e 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -193,3 +193,8 @@
font-size: 16px;
background-size: 16px;
}
+
+//设置 icon 的默认颜色
+.el-icon-folder-opened {
+ color: #f56c6c;
+}
diff --git a/src/views/hidden_check/index.vue b/src/views/hidden_check/index.vue
index 51bd13f4..b58e8215 100644
--- a/src/views/hidden_check/index.vue
+++ b/src/views/hidden_check/index.vue
@@ -41,7 +41,8 @@
-
+
+
{{ scope.row[d.prop] }}
@@ -246,6 +247,7 @@ export default {
})
}
this.list = JSON.parse(JSON.stringify(this.data))
+ console.log(this.list, 'this.list')
} else {
this.$message.error(data.message)
}
diff --git a/src/views/hidden_reform/api/index.js b/src/views/hidden_reform/api/index.js
index d69a12f8..7dd396ee 100644
--- a/src/views/hidden_reform/api/index.js
+++ b/src/views/hidden_reform/api/index.js
@@ -56,5 +56,12 @@ export default {
method: 'post',
data: `start=0&limit=10&where_sql=hidden_danger.hidden_danger_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0`
}).then(response => response.data)
+ },
+ queryAttach(keyids) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=queryevent&pagetype=grid&eventcode=query_attach&tablename=hidden_danger&keyids=${keyids}&is_queryrelat=0&user_id=${roles}&dataType=json&query_type=0&has_page=0`
+ }).then(response => response.data)
}
}
diff --git a/src/views/hidden_reform/index.vue b/src/views/hidden_reform/index.vue
index b8e79ef9..3cfd3378 100644
--- a/src/views/hidden_reform/index.vue
+++ b/src/views/hidden_reform/index.vue
@@ -10,7 +10,7 @@
-
+
+
{{ scope.row[d.prop] }}
@@ -92,8 +93,10 @@ export default {
parseDay,
loading: false,
data: [],
+ list: [],
deptTree: [],
ids: [],
+ keyids: [],
isBacklog: this.$route.query.isBacklog || false,
levels: [],
pager: {
@@ -221,6 +224,10 @@ export default {
if (data.success) {
this.data = data.data.root
this.pager.total = data.data.total
+ this.keyids = this.data.map(d => {
+ return d.hidden_danger__hidden_danger_id
+ }).join()
+ this.queryAttach()
setTimeout(() => {
this.loading = false
}, 200)
@@ -233,6 +240,23 @@ export default {
this.whereSql = sql
this.getList()
},
+ queryAttach() {
+ api.queryAttach(this.keyids).then(data => {
+ if (data.success) {
+ if (data.data.length > 0) {
+ this.attachData = data.data
+ this.data.forEach((d, i) => {
+ this.data[i].attach = this.attachData.filter(v => {
+ return v.data_id === d.hidden_danger__hidden_danger_id
+ })
+ })
+ }
+ this.list = JSON.parse(JSON.stringify(this.data))
+ } else {
+ this.$message.error(data.message)
+ }
+ })
+ },
editCreate() {
const param = `/hidden_danger/hidden_reform/create`
this.$router.push(param)
diff --git a/src/views/hidden_review/api/index.js b/src/views/hidden_review/api/index.js
index a05b2866..9b2722b4 100644
--- a/src/views/hidden_review/api/index.js
+++ b/src/views/hidden_review/api/index.js
@@ -56,5 +56,12 @@ export default {
method: 'post',
data: `start=0&limit=10&where_sql=hidden_danger.hidden_danger_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0`
}).then(response => response.data)
+ },
+ queryAttach(keyids) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=queryevent&pagetype=grid&eventcode=query_attach&tablename=hidden_danger&keyids=${keyids}&is_queryrelat=0&user_id=${roles}&dataType=json&query_type=0&has_page=0`
+ }).then(response => response.data)
}
}
diff --git a/src/views/hidden_review/index.vue b/src/views/hidden_review/index.vue
index 63432304..ac42d7ec 100644
--- a/src/views/hidden_review/index.vue
+++ b/src/views/hidden_review/index.vue
@@ -10,7 +10,7 @@
-
+
+
{{ scope.row[d.prop] }}
@@ -88,8 +89,10 @@ export default {
parseDay,
loading: false,
data: [],
+ list: [],
deptTree: [],
ids: [],
+ keyids: [],
isBacklog: this.$route.query.isBacklog || false,
levels: [],
pager: {
@@ -197,6 +200,10 @@ export default {
if (data.success) {
this.data = data.data.root
this.pager.total = data.data.total
+ this.keyids = this.data.map(d => {
+ return d.hidden_danger__hidden_danger_id
+ }).join()
+ this.queryAttach()
setTimeout(() => {
this.loading = false
}, 200)
@@ -209,6 +216,23 @@ export default {
this.whereSql = sql
this.getList()
},
+ queryAttach() {
+ api.queryAttach(this.keyids).then(data => {
+ if (data.success) {
+ if (data.data.length > 0) {
+ this.attachData = data.data
+ this.data.forEach((d, i) => {
+ this.data[i].attach = this.attachData.filter(v => {
+ return v.data_id === d.hidden_danger__hidden_danger_id
+ })
+ })
+ }
+ this.list = JSON.parse(JSON.stringify(this.data))
+ } else {
+ this.$message.error(data.message)
+ }
+ })
+ },
editCreate() {
const param = `/hidden_danger/hidden_review/create`
this.$router.push(param)