From 714cec44d036d3fb16aa1d50d2fdf60a911f901c Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sun, 5 Dec 2021 15:02:31 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=AC=AC=E5=9B=9B=E6=AD=A5=20-=20=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=8C=89=E9=92=AE=E5=92=8C=E5=A4=96=E9=9D=A2=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step4.vue | 349 +++++++----------- 1 file changed, 140 insertions(+), 209 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index c02764190..ecd30d3c3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -375,27 +375,20 @@ v-model="form.xgdName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -405,27 +398,20 @@ v-model="form.fbgbjbdName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -435,27 +421,20 @@ v-model="form.ssgName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -465,27 +444,20 @@ v-model="form.caName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -495,27 +467,20 @@ v-model="form.zbjbdName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -643,27 +608,20 @@ v-model="form.kwjName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -675,27 +633,20 @@ v-model="form.jdwjName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -705,27 +656,20 @@ v-model="form.bpgName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -735,27 +679,20 @@ v-model="form.zqyjgName" clearable > -
- - - - 查看已上传的文件 - -
-
- - - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
@@ -999,26 +936,20 @@ v-model="form.glwjName" clearable > -
- - - - 查看已上传的文件 - -
-
- - 点击上传 - +
+
+
{{ item.name }}
+
+
+ + + +
From 447e573b3b080165571326b21d1a69e899694150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 5 Dec 2021 15:03:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step1-1.vue | 10 +++++----- .../pages/creatProcess/xmqdqr/step1.vue | 10 +++++----- .../pages/creatProcess/xmqdqr/step2.vue | 2 +- .../pages/creatProcess/xmqdqr/step4.vue | 2 +- .../pages/creatProcess/xmqdqr/step5.vue | 2 +- .../localProductsOrProjectLibrary/pages/details.vue | 12 +++++++++++- 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 940d01219..bbf9fc527 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -96,15 +96,15 @@ - -

产品经理

+

产品工程经理

- +
@@ -449,7 +449,7 @@ export default { // 角色验证 roleFormRules: { confirmName: [ - { required: true, message: "请选择产品经理", trigger: "change" } + { required: true, message: "请选择产品工程经理", trigger: "change" } ] } }; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 55912d6bf..26c2a7824 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -103,15 +103,15 @@
- -

产品经理

+

产品工程经理

- +
@@ -461,7 +461,7 @@ export default { // 角色验证 roleFormRules: { confirmName: [ - { required: true, message: "请选择产品经理", trigger: "change" } + { required: true, message: "请选择产品工程经理", trigger: "change" } ], approveName: [ { required: true, message: "请选择审批人", trigger: "change" } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index ae447c6ff..3c6393c96 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index c8e90435c..b3842c57e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue index 72aada999..ab14aa929 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 5f0242084..f7142f3af 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -10,7 +10,7 @@
- 产品平台1: {{ localProEO.projectPlatfor }} + 产品平台: {{ localProEO.projectPlatfor }} 项目编号: {{ localProEO.projectNumber }} @@ -36,6 +36,7 @@ 项目级别: {{ localProEO.projectLevel }} + 产品线: {{ localProEO.productLine }} 项目经理: {{ localProEO.uname }} 项目计划开始时间: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }} @@ -168,6 +169,15 @@
+ + + Date: Sun, 5 Dec 2021 15:18:38 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=20-=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E5=87=86=20=E5=A4=8D=E9=80=89?= =?UTF-8?q?=E6=A1=86=E7=A6=81=E7=94=A8=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 9 ++++----- .../accessStandardsAndRegulations/pages/otherAddEit.vue | 9 ++++----- .../pages/projectAddEit.vue | 7 +++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 70fc8aaae..421616ad0 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -177,7 +177,6 @@ type="selection" width="55" align="center" - :selectable="selectable" > Date: Sun, 5 Dec 2021 15:20:20 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E5=8F=82=E4=BC=9A?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step2.vue | 9 ++ .../pages/creatProcess/bzhHd-rh/step3.vue | 100 ++++++++++++++++-- .../pages/creatProcess/bzhHd-rh/step4.vue | 9 +- .../pages/creatProcess/bzhHd-rh/step5.vue | 9 +- .../pages/creatProcess/bzhHd-rh/step6-1.vue | 9 +- .../pages/creatProcess/bzhHd-rh/step6.vue | 9 +- .../pages/creatProcess/bzhHy-ch/step2.vue | 21 +++- .../pages/creatProcess/bzhHy-ch/step3.vue | 11 +- .../pages/creatProcess/bzhHy-ch/step4.vue | 9 +- .../pages/creatProcess/bzhHy-ch/step5.vue | 11 +- .../pages/creatProcess/bzhHy-ch/step6.vue | 9 +- 11 files changed, 186 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index cb3106e91..f4db8da41 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -241,6 +241,15 @@ export default { comityTel: [], comityOpRole: '', comityInRoleId: '', + fillPeople: '', + fillPeopleId: '', + fillUnit: '', + fillDept: '', + fillPost: '', + fillTel: '', + fillMail: '', + fillLeader: '', + fillLeaderId: '', }, roleForm: {}, commentText: '', diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index c2e5c78b5..797572dab 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -153,7 +153,7 @@ - + - + class="upload_style" + :disabled="acceptShow" + multiple + ref="uploadFile" + :action="uploadPath" + name="file" + :file-list="fillFileList" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + :before-upload="handleBeforeUpload" + :before-remove="handleBeforeRemove" + :on-success="handleOnsuccess" + > + + 点击上传 + + @@ -323,7 +339,7 @@ export default { fillMail: '', fillLeader: '', fillLeaderId: '', - fillFile: '', + fillFile: [], }, rh_rules: { fillLeader: [ @@ -345,7 +361,15 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, commentText: '', - infoSourcesLength: '' + infoSourcesLength: '', + + /** 上传相关 */ + acceptShow: false, + // 上传路径 + uploadPath: 'api/att/attFile/upload', + // 上传所储存文件数组 + fillFileList: [], + newDataList: [], } }, computed: { @@ -385,11 +409,12 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData + this.rh_pageData.fillLeader = '' this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.infoSourcesLength = this.rh_pageData.infoSources.length - // this.rh_pageData.comityFileNum = this.fileTextList + // this.rh_pageData.comityFileNum = this.fillFileList }) }, // 右上标签页面切换 @@ -458,6 +483,65 @@ export default { }) }, + // 文件上传限制条件 + handleBeforeUpload(file) { + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + // 判断上传文件格式 + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + return true + } else { + this.spinShow = false + this.$message.error('文件' + file.name + '格式不正确,请上传ZIP/DOCX或XLS文件') + return false + } + // 判断文件上传大小 + // eslint-disable-next-line no-unreachable + if (file.size / 1024 / 1024 <= 200) { + return true + } else { + this.$message.error('文件' + file.name + '大小不超过200M') + return false + } + return true + }, + // 移除上传的文件 + handleBeforeRemove(file, fileList) { + this.fileData = fileList + this.fillFileList.forEach((item, index) => { + if (item.name === file.name || item.id === file.id) { + this.fillFileList.splice(index, 1) + } + }) + this.rh_pageData.fillFile = this.fillFileList + }, + // 文件上传成功 + handleOnsuccess(res, file, fileList) { + if (res.ok) { + if (this.fillFileList !== null) { + this.newDataList = this.fillFileList + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + } else { + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + } + this.rh_pageData.fillFile = this.newDataList + this.$message({ + showClose: true, + message: res.message, + type: 'success' + }) + this.fileMadel = false + } + }, /** 点击对应附件进行下载*/ previews(val) { let attId = val diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 267544012..a14e003f4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -107,7 +107,14 @@ - + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index befd2b275..b73c5af0d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -146,7 +146,14 @@ - + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue index dbf22f849..d6ea134a5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue @@ -109,7 +109,14 @@ - + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index 964339473..1bcb3f53c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -112,7 +112,14 @@ - + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index ac5a459f5..76aa8a5dd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -214,7 +214,17 @@ export default { active: '1', acceptShow: false, - ch_pageData: {}, + ch_pageData: { + fillPeopleId: '', + fillPeople: '', + fillUnit: '', + fillDept: '', + fillPost: '', + fillTel: '', + fillMail: '', + fillLeader: '', + fillFile: '', + }, ch_rules: {}, nodeList: [], commentText: '', @@ -335,7 +345,14 @@ export default { } }) - } + }, + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 1fd7e6aa1..45db1b442 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -123,7 +123,7 @@ - + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index 4375af7cf..40e385017 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -349,7 +349,14 @@ export default { }); } }) - } + }, + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index 7d8a47e04..262e08058 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -318,7 +318,7 @@ export default { this.deleteDataList.map(item => { let index; index = this.ch_pageData.myPartRole.findIndex(items => { - return items.id === item; + return items === item; }); if (index > -1) { this.ch_pageData.myPartRole.splice(index, 1); @@ -377,7 +377,14 @@ export default { } }) - } + }, + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue index 4a5d3fb91..a11847ce6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -414,7 +414,14 @@ export default { } }) - } + }, + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } From c3a4aba65c4b24ccf7f4ddac37410d43eacb1cdf Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 15:28:40 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/bzhHd-ch/step2.vue | 21 ++++++++++++++-- .../pages/phone/bzhHd-ch/step4.vue | 9 ++++++- .../pages/phone/bzhHd-ch/step6.vue | 25 ++++++++++++++++++- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue index 2812bd18b..0652e0c00 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue @@ -213,7 +213,17 @@ export default { active: '1', acceptShow: false, - ch_pageData: {}, + ch_pageData: { + fillPeopleId: '', + fillPeople: '', + fillUnit: '', + fillDept: '', + fillPost: '', + fillTel: '', + fillMail: '', + fillLeader: '', + fillFile: '', + }, ch_rules: {}, nodeList: [], commentText: '', @@ -334,7 +344,14 @@ export default { } }) - } + }, + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue index b7343b99e..589e3dc2a 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue @@ -348,7 +348,14 @@ export default { }); } }) - } + }, + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue index 893916f36..999b32bbc 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue @@ -276,6 +276,10 @@ export default { }, getData() { + if (this.taskInfo === '标准法规工程师修订完毕') { + this.passTitle = '回执说明', + this.passHolder = '请输入回执说明' + } const params = { taskIds: this.taskIds, pId: this.pId, @@ -343,6 +347,12 @@ export default { json.president = this.roleForm.engineerUserId } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { json.engineerSumDone = this.roleForm.startUser + } else { + json = { + ch_pageData: this.ch_pageData, + commentText: this.textarea, + roleList: this.roleForm + } } this.$refs['ch_pageData'].validate((valid) => { if (valid) { @@ -377,6 +387,12 @@ export default { json.president = this.roleForm.engineerUserId } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { json.engineerSumDone = this.roleForm.startUser + } else { + json = { + ch_pageData: this.ch_pageData, + commentText: this.textarea, + roleList: this.roleForm + } } this.$refs['ch_pageData'].validate((valid) => { if (valid) { @@ -395,7 +411,14 @@ export default { } }) - } + }, + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } From 5a26f6486ba315ca93a675ca8fa0ddc47fdcb57d Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sun, 5 Dec 2021 15:35:15 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=20-=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E5=87=86=20=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 5 +++-- .../accessStandardsAndRegulations/pages/otherAddEit.vue | 4 +++- .../accessStandardsAndRegulations/pages/projectAddEit.vue | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 421616ad0..0558a4442 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -187,8 +187,9 @@ width="150px" label="标准号"> + {{ scope.row.standNumber}} + {{ scope.row.lawsNumber}} + {{scope.row.standCode}} Date: Sun, 5 Dec 2021 15:36:46 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 898f3592e..15c999546 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -79,7 +79,8 @@