diff --git a/src/views/task/list.vue b/src/views/task/list.vue index a671b58..f86054e 100644 --- a/src/views/task/list.vue +++ b/src/views/task/list.vue @@ -302,7 +302,6 @@ export default { methods: { getList() { getOwnList(this.listQuery).then(data => { - console.log(data.list) this.list = data.list this.totalCount = data.total }) @@ -519,7 +518,6 @@ export default { } this.sbxxList.sblbdm = this.shebeileibiedaima this.sbxxList.sbpzdm = this.shebeipinzhongdaima - console.log(this.path + '/null') this.$router.push({ path: this.path + '/null', query: { @@ -662,7 +660,6 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - console.log(111111111111) const arr = [] this.$refs.list.selection.map(rw => { arr.push(rw.id) diff --git a/src/views/ysjl/3000/common/index.vue b/src/views/ysjl/3000/common/index.vue index ebfb4ec..22c3db3 100644 --- a/src/views/ysjl/3000/common/index.vue +++ b/src/views/ysjl/3000/common/index.vue @@ -741,6 +741,12 @@ export default { // 该列用于比较的值的获取方法 return row.jianyanxiang } + }, + { + name: 'jianyanmu', + getValue(row) { + return row.jianyanmu + } } ], rows: [ @@ -827,9 +833,6 @@ export default { if (fubiao[2]) { this.fubiao3 = fubiao[2] } - console.log(this.fubiao1) - console.log(this.fubiao2) - console.log(this.fubiao3) }) }, getYsjl() { @@ -883,6 +886,9 @@ export default { }) } else { this.jyxmService.getCyJyxm(this.$route.query.templateId, sort).then((data) => { + data.forEach(row => { + row.dicJyxmId = row.id + }) this.bgfyData = data this.tableJs.getData(this.cols, this.rows, this.bgfyData) }) @@ -968,7 +974,7 @@ export default { tableData.push({ ysjlId: this.ysjlId, beizhu: row.beizhu, - dicJyxmId: row.id, + dicJyxmId: row.dicJyxmId, jianyanjieguo: row.jianyanjieguo ? row.jianyanjieguo : '', jianyanjielun: row.jianyanjielun ? row.jianyanjielun : '', jyxmMode: 0,