From 0ed75aa5a11590e09a9a1e0b50f9a2a56018753f Mon Sep 17 00:00:00 2001 From: zyn Date: Sun, 23 Apr 2023 09:59:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 41 ++++++++++++++++++- .../pages/creatProcess/qbrk/step1.vue | 41 ++++++++++++++++++- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 9416e4277..58926e95b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -213,8 +213,12 @@
{{ item.name }} + style="color: #409eff;cursor:pointer" + class="fileClass"> + {{ item.name }} + + +
@@ -2919,6 +2923,39 @@ this.$preview(attId) } }, + handleFilePreview2(file, type) { + let attId = "" + if (file && file.id) { + attId = file.id + } else { + attId = file.response.data.id + } + if (file.name == this.form.standName) { + let fileName = "" + let fileNam2 = "" + if (this.form.standName && this.form.standName !== '') { + fileName = this.form.standName + '-企业标准.docx' + fileNam2 = this.form.standName + } else { + fileName = '企业标准.docx' + fileNam2 = '企业标准' + } + let form = JSON.parse(JSON.stringify(this.form)) + form.standCode = '' + form.issueDate = '' + this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form) + return + } + if (type === 'down') { + if (attId) { + window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId) + } else { + this.$message.warning('文件不存在,下载失败') + } + } else { + this.$preview(attId) + } + }, handleFilePreviewOne(file, type) { let id = "" let fileName = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index f7993f0d7..8c6a67db9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -209,8 +209,12 @@
{{ item.name }} + @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer;margin-left: 12px;" + class="fileClass"> + {{ item.name }} + + +
@@ -2889,6 +2893,39 @@ this.$preview(attId) } }, + handleFilePreview2(file, type) { + let attId = "" + if (file && file.id) { + attId = file.id + } else { + attId = file.response.data.id + } + if (file.name == this.form.standName) { + let fileName = "" + let fileNam2 = "" + if (this.form.standName && this.form.standName !== '') { + fileName = this.form.standName + '-企业标准.docx' + fileNam2 = this.form.standName + } else { + fileName = '企业标准.docx' + fileNam2 = '企业标准' + } + let form = JSON.parse(JSON.stringify(this.form)) + form.standCode = '' + form.issueDate = '' + this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form) + return + } + if (type === 'down') { + if (attId) { + window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId) + } else { + this.$message.warning('文件不存在,下载失败') + } + } else { + this.$preview(attId) + } + }, // 导入标准数据成功后执行 importFileSuccess(response, file, fileList) { // 上传成功后判断是否是两条数据是的话替换掉旧数据 From 00939fe7295b302871f445505375d26ce1a15b28 Mon Sep 17 00:00:00 2001 From: zyn Date: Sun, 23 Apr 2023 11:15:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 1e95821ba..48452eda6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -1726,6 +1726,9 @@ zrDeptIdName:this.$store.getters.userInfo.institutionName, children:[], }; + if(!this.form.modelData){ + this.form.modelData = [] + } this.form.modelData.push(list); this.$message.success("新增成功") this.showForm.modelNum = "" @@ -2915,7 +2918,7 @@ if (valid) { this.$refs['formTongGuo'].validate((valid) => { if (valid) { - if(this.form.modelData.length === 0){ + if(this.form.modelData === undefined || this.form.modelData.length === 0){ this.opinionDialogVisible = true }else{ this.commentTextHandle(); From 99c56936a15cf70009e3bb01e47f6b997e8ab3f0 Mon Sep 17 00:00:00 2001 From: zyn Date: Sun, 23 Apr 2023 11:16:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B5=B7=E8=8D=89-=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step1.vue | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 86d1a1840..a96f24657 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -218,7 +218,12 @@ >
-
{{ item.name }}
+
+ {{ item.name }} + + + +