From cc7ff55e7fc334bd299fd9770f328f6390ebf2db Mon Sep 17 00:00:00 2001 From: zichen1019 <1510748736@qq.com> Date: Tue, 17 Aug 2021 23:38:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawerDialog/index.vue | 29 +++++++++++++++---- src/views/bggl/2000/jj/cyqp.vue | 4 +-- src/views/task/list.vue | 4 +-- src/views/ysjl/1000/dj/sy/sysy.vue | 17 +++++------ src/views/ysjl/1000/dj/wb/gywb.vue | 24 +++++---------- src/views/ysjl/2000/2200/zbg/dj/edit.vue | 6 ++-- src/views/ysjl/2000/2200/zbg/nd/tuoche.vue | 6 ++-- src/views/ysjl/2000/2300/zbg/jj/cyqp.vue | 4 +-- src/views/ysjl/2000/2400/common/ycjl.vue | 4 +-- src/views/ysjl/2000/2400/zbg/jj/edit.vue | 4 +-- src/views/ysjl/7000/jj/edit.vue | 2 +- .../ysjl/components/gascylinder_db_list.vue | 8 ----- .../ysjl/components/manufacture_db_list.vue | 4 +-- 13 files changed, 59 insertions(+), 57 deletions(-) diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue index 28d8287..6bc3664 100644 --- a/src/components/drawerDialog/index.vue +++ b/src/components/drawerDialog/index.vue @@ -188,7 +188,7 @@ - + @@ -537,7 +537,7 @@ - + 表格高度限制 @@ -639,7 +639,7 @@ label-width="150px" > - + {{ item }} @@ -761,7 +761,7 @@ export default { templateSettingId: '' // 配置id }, form: { - templateId: '', + templateId: undefined, writeMode: 0, tableIndex: 1, tableMode: 0, @@ -882,11 +882,30 @@ export default { getJylbList() { this.getNeibuList('jylb', null, null) }, + initTemplateSettingForm() { + this.form = { + templateId: this.id, + writeMode: 0, + tableIndex: 1, + tableMode: 0, + tableRowFindMode: 0, + tableStartRow: 0, + tableRowCount: 0, + affiliatedTableStartRow: 0, + affiliatedTableRowCount: 0, + sort: 1, + tableType: 0, + isChild: false, + jyxmMode: 0, + affiliatedAddMode: 0 + } + }, addTemFn() { + this.initTemplateSettingForm() this.dialogVisible1 = true }, editFnTem(row) { - this.form = row + this.form = this.common.deepCopy(row) this.dialogVisible1 = true }, addtemFn() { diff --git a/src/views/bggl/2000/jj/cyqp.vue b/src/views/bggl/2000/jj/cyqp.vue index c9a2250..2fc303b 100644 --- a/src/views/bggl/2000/jj/cyqp.vue +++ b/src/views/bggl/2000/jj/cyqp.vue @@ -379,13 +379,13 @@ export default { }, getYsjl() { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: this.$route.query.id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data if (this.ysjl.jianyanrenyuan) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } diff --git a/src/views/task/list.vue b/src/views/task/list.vue index 63be94a..577a9ed 100644 --- a/src/views/task/list.vue +++ b/src/views/task/list.vue @@ -295,7 +295,7 @@ export default { currentRenwuId: 0, dialogEnclosureVisible: false, isSysUser: this.$store.getters.clientType === 'System', - searchNblist:[] + searchNblist: [] } }, computed: { @@ -305,7 +305,7 @@ export default { allCategory: { handler(n, o) { console.log(n.filter(item => item.parentId)) - this.searchNblist = n.filter(item => item.parentId) + this.searchNblist = n.filter(item => item.parentId) }, deep: true } diff --git a/src/views/ysjl/1000/dj/sy/sysy.vue b/src/views/ysjl/1000/dj/sy/sysy.vue index 18ff044..4badb8b 100644 --- a/src/views/ysjl/1000/dj/sy/sysy.vue +++ b/src/views/ysjl/1000/dj/sy/sysy.vue @@ -374,7 +374,6 @@ export default { }) }, initYsjl() { - const tempTime = new Date() this.api({ url: '/ysjl/initYsjl', method: 'post', @@ -392,7 +391,7 @@ export default { this.param = (data.param !== null && data.param !== undefined) ? data.param : {} this.ysjl.jilubianhao = this.jilubianhao this.ysjl.baogaobianhao = null // 避免从设备中取值导致信息错误 - this.ysjl.bianzhiriqi = tempTime.getFullYear() + '-' + (tempTime.getMonth() + 1) + '-' + tempTime.getDate() + this.ysjl.bianzhiriqi = this.formatter.dateFormat('YYYY-MM-dd') this.ysjl.jianyanjielun = '合格' this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH this.ysjl.beizhu = '/' @@ -407,13 +406,13 @@ export default { }, getYsjl(id) { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } @@ -518,7 +517,7 @@ export default { let type = '' this.ysjl.bglx = 1 this.ysjl.cjState = 'ysjl' - this.ysjl.zfState = '0' + this.ysjl.zfState = 0 this.ysjl.jianyanxiangmu = 'sysy' this.ysjl.jlprintState = 0 if (operation === 'add') { @@ -556,8 +555,10 @@ export default { data: { ysjl: this.ysjl, param: this.param, - jyxm: jyxm, - bgjyxm: jyxm, + cyJyxm: { + jyxm: jyxm, + bgjyxm: jyxm + }, flag: operation } }).then(data => { @@ -567,8 +568,6 @@ export default { this.$message({ message: '保存成功, 请前往待办记录中查看。', type: 'success' }) this.ysjl.id = data this.param.ysjlId = data - // 修改16版任务状态 - this.common.updStateByNew(this.ysjl.renwuId, '2', false) // 刷新路由网址 this.$store.dispatch('delCurrentViews', { view: this.$route, diff --git a/src/views/ysjl/1000/dj/wb/gywb.vue b/src/views/ysjl/1000/dj/wb/gywb.vue index b8d6955..82ba80d 100644 --- a/src/views/ysjl/1000/dj/wb/gywb.vue +++ b/src/views/ysjl/1000/dj/wb/gywb.vue @@ -467,13 +467,13 @@ export default { }, getYsjl(id) { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } @@ -545,15 +545,7 @@ export default { }) }) } else { - data.forEach(row => { - this.sybjSData.push({ - id: row.id, - jianyanxiang: row.jianyanxiang, - jianyanmu: row.jianyanmu, - jianyanneirong: row.jianyanneirong, - D1: row.d1 - }) - }) + this.sybjSData = data } this.tableJs.getData(this.cols, this.rows, this.sybjSData) }) @@ -584,7 +576,7 @@ export default { let type = '' this.ysjl.bglx = 1 this.ysjl.cjState = 'ysjl' - this.ysjl.zfState = '0' + this.ysjl.zfState = 0 this.ysjl.jianyanxiangmu = 'gywb' this.ysjl.jlprintState = 0 if (this.ysjl.jianyanjielun === '不符合要求') { @@ -625,8 +617,10 @@ export default { data: { ysjl: this.ysjl, param: this.param, - jyxm: jyxm, - bgjyxm: jyxm, + cyJyxm: { + jyxm: jyxm, + bgjyxm: jyxm + }, flag: operation } }).then(data => { @@ -636,8 +630,6 @@ export default { this.$message({ message: '保存成功, 请前往待办记录中查看。', type: 'success' }) this.ysjl.id = data this.param.ysjlId = data - // 修改16版任务状态 - this.common.updStateByNew(this.ysjl.renwuId, '2', false) // 刷新路由网址 this.$store.dispatch('delCurrentViews', { view: this.$route, diff --git a/src/views/ysjl/2000/2200/zbg/dj/edit.vue b/src/views/ysjl/2000/2200/zbg/dj/edit.vue index 8d6b155..04205f8 100644 --- a/src/views/ysjl/2000/2200/zbg/dj/edit.vue +++ b/src/views/ysjl/2000/2200/zbg/dj/edit.vue @@ -948,13 +948,13 @@ export default { }, getYsjl() { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: this.$route.query.id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data if (this.ysjl.jianyanrenyuan) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } @@ -1103,7 +1103,7 @@ export default { let type = '' this.ysjl.bglx = 1 this.ysjl.cjState = 'ysjl' - this.ysjl.zfState = '0' + this.ysjl.zfState = 0 this.ysjl.jianyanxiangmu = this.jyxm this.ysjl.jlprintState = 0 this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH diff --git a/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue b/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue index bcdef85..f08a23b 100644 --- a/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue +++ b/src/views/ysjl/2000/2200/zbg/nd/tuoche.vue @@ -408,13 +408,13 @@ export default { }, getYsjl() { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: this.$route.query.id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data if (this.ysjl.jianyanrenyuan) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } @@ -549,7 +549,7 @@ export default { let type = '' this.ysjl.bglx = 1 this.ysjl.cjState = 'ysjl' - this.ysjl.zfState = '0' + this.ysjl.zfState = 0 this.ysjl.jianyanxiangmu = this.jyxm this.ysjl.jlprintState = 0 this.ysjl.jigouhezhunzhenghao = process.env.VUE_APP_HZZBH diff --git a/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue b/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue index 199d814..86d5706 100644 --- a/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue +++ b/src/views/ysjl/2000/2300/zbg/jj/cyqp.vue @@ -344,13 +344,13 @@ export default { }, getYsjl() { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: this.$route.query.id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data if (this.ysjl.jianyanrenyuan) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } diff --git a/src/views/ysjl/2000/2400/common/ycjl.vue b/src/views/ysjl/2000/2400/common/ycjl.vue index df683e4..55fcd85 100644 --- a/src/views/ysjl/2000/2400/common/ycjl.vue +++ b/src/views/ysjl/2000/2400/common/ycjl.vue @@ -720,13 +720,13 @@ export default { }, getYsjl() { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: this.$route.query.id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data if (this.ysjl.jianyanrenyuan) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } diff --git a/src/views/ysjl/2000/2400/zbg/jj/edit.vue b/src/views/ysjl/2000/2400/zbg/jj/edit.vue index 15f4e05..a024a27 100644 --- a/src/views/ysjl/2000/2400/zbg/jj/edit.vue +++ b/src/views/ysjl/2000/2400/zbg/jj/edit.vue @@ -599,13 +599,13 @@ export default { }, getYsjl() { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: this.$route.query.id } }).then(data => { - this.ysjl = data.ysjl + this.ysjl = data if (this.ysjl.jianyanrenyuan) { this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan) } diff --git a/src/views/ysjl/7000/jj/edit.vue b/src/views/ysjl/7000/jj/edit.vue index 826197f..0ee3d0a 100644 --- a/src/views/ysjl/7000/jj/edit.vue +++ b/src/views/ysjl/7000/jj/edit.vue @@ -535,7 +535,7 @@ export default { let type = '' this.ysjl.bglx = 1 this.ysjl.cjState = 'ysjl' - this.ysjl.zfState = '0' + this.ysjl.zfState = 0 this.ysjl.jlprintState = 0 if (operation === 'add') { type = 'post' diff --git a/src/views/ysjl/components/gascylinder_db_list.vue b/src/views/ysjl/components/gascylinder_db_list.vue index 6d4c66e..f5069c1 100644 --- a/src/views/ysjl/components/gascylinder_db_list.vue +++ b/src/views/ysjl/components/gascylinder_db_list.vue @@ -248,14 +248,6 @@ export default { ids: ids } }).then(() => { - // 锅炉根据16版renwuId修改16版和18版任务状态 - if (oldRwIds !== '') { - this.common.updStateByOld(oldRwIds, '0', false) - } - // 根据18版任务主键修改16版任务状态 - if (newRwIds !== '') { - this.common.updStateByNew(newRwIds, '0', false) - } this.$message({ message: '删除成功', type: 'success', diff --git a/src/views/ysjl/components/manufacture_db_list.vue b/src/views/ysjl/components/manufacture_db_list.vue index e654a17..4f38b00 100644 --- a/src/views/ysjl/components/manufacture_db_list.vue +++ b/src/views/ysjl/components/manufacture_db_list.vue @@ -685,13 +685,13 @@ export default { }, async showDataComparison(row) { this.api({ - url: '/ysjl/getYsjlById', + url: '/ysjl', method: 'get', params: { ysjlId: row.id } }).then(async data => { - this.selection = data.ysjl + this.selection = data await this.getParamByYsjlId(this.selection.id, this.selection.shebeizhongleidaima) this.api({ url: '/renwu/get',