From 7b037ccebd80c6905f86512b5014c66e338894ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 28 Dec 2021 16:14:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=BF=9D=E5=AD=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue | 1 + src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue | 1 + src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue | 1 + 3 files changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 8d7b18508..834de3ce9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -880,6 +880,7 @@ export default { }else{ this.qdform = item.form this.dataList =item.form.dataList + this.commentText = item.commentText this.detailedId = item.form.detailedListId; } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 009c75b08..4453cb081 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -889,6 +889,7 @@ export default { }else{ this.qdform = item.form this.dataList =item.form.dataList + this.commentText = item.commentText this.detailedId = item.form.detailedListId; } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index f8322e683..bcf44e540 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -883,6 +883,7 @@ export default { }else{ this.qdform = item.form this.dataList =item.form.dataList + this.commentText = item.commentText this.detailedId = item.form.detailedListId; } }); From 2c96ffe5dc51919d983f94e6bff3d98ffb1c2763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 28 Dec 2021 16:23:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzqdfb/step2.vue | 11 +++++------ .../processCenter/pages/creatProcess/bzqdfb/step4.vue | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 0f5cf113e..39463de6e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -382,14 +382,13 @@ export default { } }, downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); + if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { + this.$message.error('水印下载仅支持PDF,pdf格式文件') } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + if (attId != null && attId !== '') { + window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId } else { - this.$message.error("请选择要下载的文件"); + this.$message.error('请选择要下载的文件') } } }, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 260c2adec..0bb277f1a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -452,14 +452,13 @@ export default { } }, downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); + if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { + this.$message.error('水印下载仅支持PDF,pdf格式文件') } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + if (attId != null && attId !== '') { + window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId } else { - this.$message.error("请选择要下载的文件"); + this.$message.error('请选择要下载的文件') } } }, From ca4cb859d0d75fbceac31724f6906e89da9d0d77 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 28 Dec 2021 16:38:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzhHd-rh/step2.vue | 8 +++++--- .../processCenter/pages/creatProcess/bzhHy-ch/step2.vue | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 328d95fdd..90f200642 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -116,7 +116,7 @@ @@ -342,9 +342,11 @@ export default { }, /** 选择入会人员 */ - choiceRole(type,title,id) { + choiceRole() { this.nodeList = [] - this.nodeList.push(id) + if (this.rh_pageData.comityOpRoleId.length > 0) { + this.nodeList = this.rh_pageData.comityOpRoleId.split(',') + } this.roleShowflag = true }, drawerCheck(data) { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index bde8597c7..d056e26d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -112,7 +112,7 @@ @@ -303,9 +303,11 @@ export default { }, /** 选择入会人员 */ - choiceRole(type,title,id) { + choiceRole() { this.nodeList = [] - this.nodeList.push(id) + if (this.ch_pageData.meetingInRoleId.length > 0) { + this.nodeList = this.ch_pageData.meetingInRoleId.split(',') + } this.roleShowflag = true }, drawerCheck(data) { From 30cd0fb4650ec894e3f6db5c022d2a3fa60dbe9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 28 Dec 2021 16:38:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=86=92=E6=B3=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 39463de6e..a70f42992 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -40,16 +40,16 @@

{{ item.name }} + :key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }} diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 0bb277f1a..fe89b2cc7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -40,16 +40,16 @@

{{ item.name }} + :key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }} From b532fc3ac68bd0c596a4ea6ed62e88168c8ec5e2 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 28 Dec 2021 16:40:25 +0800 Subject: [PATCH 5/5] commit --- .../enterpriseStandardPlan/index.vue | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 375ea86a9..d93411e8d 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -596,7 +596,7 @@ useLevel: '', isRelate: '', esStandRelations: '', - area: '', + area: [], tsJson: '', tsJsonName: '', rqbJson: '', @@ -838,6 +838,8 @@ url = 'esRevisePlan/es-revise-plan/addPlan' tips = '添加' } + let arr = JSON.parse(JSON.stringify(this.addForm)) + arr.area = arr.area.join(',') this.$http.post(url, this.addForm, { _this: this }, res => { @@ -939,6 +941,16 @@ this.DrawerType = 'edit' this.addDrawer = true this.addForm = { + esMatingRelations: command[0].esMatingRelations, + technologic: command[0].technologic, + useLevel: command[0].useLevel, + isRelate: command[0].isRelate, + esStandRelations: command[0].esStandRelations, + area: command[0].area, + tsJson: command[0].tsJson, + tsJsonName: command[0].tsJsonName, + rqbJson: command[0].rqbJson, + rqbName: command[0].rqbName, unitName:command[0].unitName, id: command[0].id, unit: command[0].unit, // 单位 @@ -954,6 +966,9 @@ drafterName: command[0].drafterName, // 起草人 drafter: command[0].drafter, } + if (typeof (this.addForm.area) === 'string') { + this.addForm.area = command[0].area.split(',') + } break case '删除': this.$confirm('您是否确认删除选中数据?', '提示', { @@ -983,6 +998,9 @@ this.DrawerType = 'see' this.addDrawer = true this.addForm = command[0] + if (typeof (this.addForm.area) === 'string') { + this.addForm.area = command[0].area.split(',') + } break } }, @@ -1008,7 +1026,6 @@ this.QCDWList = res.data.QCDW // 起草单位 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.BZList = res.data.ENERGYTYPES - console.log(this.BZList); }, e => { }) },