From e0fe6bd6010181f9f4d0cd3da89ca85917b0d40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 15 Dec 2021 10:54:58 +0800 Subject: [PATCH 01/13] commit --- .../processCenter/pages/newProcess/index.vue | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 726e0d607..a2ab247df 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -109,6 +109,21 @@ +
+ +
+
+
+ +
+
+
项目合规评估流程-项目
+
+
+
+
+ +
@@ -270,21 +285,6 @@
-
- -
-
-
- -
-
-
政策征求意见流程
-
-
-
-
- -
From 488b68ae350ce821decb94dda9fee3459f902e38 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 15 Dec 2021 11:05:22 +0800 Subject: [PATCH 02/13] commit --- .../pages/creatProcess/bzdy/step1-1.vue | 4 +- .../pages/creatProcess/bzdy/step1.vue | 6 +-- .../pages/creatProcess/bzdy/step3.vue | 6 +-- .../pages/creatProcess/bzdy/step5.vue | 6 +-- .../pages/creatProcess/bzdy/step6.vue | 6 +-- .../pages/creatProcess/bzdy/step7.vue | 6 +-- .../pages/creatProcess/bzdy/step8.vue | 6 +-- .../pages/creatProcess/bzdy/step9.vue | 6 +-- .../pages/creatProcess/bzzqyj/step1.vue | 4 +- .../pages/creatProcess/bzzqyj/step6.vue | 1 - .../components/workingGroup1/index.vue | 38 ++++++++++++++++++- .../components/workingGroup2/index.vue | 38 ++++++++++++++++++- 12 files changed, 99 insertions(+), 28 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index cbc6b1261..4478669ad 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -236,7 +236,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess2" :on-remove="importFileRemove2" @@ -442,7 +442,7 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 7b3be3269..67eba24cf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -237,7 +237,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess2" :on-remove="importFileRemove2" @@ -434,10 +434,10 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index c9e2b3e0d..9991a3e2e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -230,7 +230,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="true" @@ -408,11 +408,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 56db15162..160df19ce 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -209,7 +209,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="true" @@ -320,11 +320,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 8d5d6233e..87da7b48f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -199,7 +199,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="false" @@ -311,11 +311,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 0305ec5b7..e170af563 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -199,7 +199,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="false" @@ -311,11 +311,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index ac013d389..5024d3034 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -199,7 +199,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="false" @@ -311,11 +311,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 9079796c2..aaaab8fb0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -199,7 +199,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :show-file-list="false" @@ -311,11 +311,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index adb01fa52..bb5f72f62 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -51,7 +51,7 @@ style="display: none;" >
-
+
{{ item.fileName }}
@@ -557,7 +557,7 @@ export default { updataFj(item) { let id let type = item.fileName.split('.') - if (type[1] === 'pdf') { + if (type[1] === 'pdf' || type[1] === 'PDF') { id = item.attId } else { id = item.oriAttId diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index d5dd0855d..b95419445 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -481,7 +481,6 @@ export default { this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; - this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index 69b40fafe..991236c97 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -847,10 +847,14 @@ standerArea: '', // 标准化工作领域 mark: '', // 备注 wgNetInfos: [], // 秘书联系方式 + wgNetInfosDel: '', wgMeetingInfos: [], // 参会记录 + wgMeetingInfosDel: '', wgDepts: [], // 集团参与 - wgStandorpolicyInfos: [], // 标准政策 + wgDeptsDel: '', wgPayInfos: [], // 支付信息 + wgPayInfosDel: '', + wgStandorpolicyInfos: [], // 标准政策 }, addFormRules: { number: [ @@ -1235,6 +1239,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delNetInfos.length; s++) { + if (this.addForm.wgNetInfosDel) { + this.addForm.wgNetInfosDel += ',' + this.addForm.wgNetInfosDel += this.delNetInfos[s].id + } else { + this.addForm.wgNetInfosDel = this.delNetInfos[s].id + } + } for (let a = 0; a < this.addForm.wgNetInfos.length; a++) { this.delNetInfos.forEach(item => { if (this.addForm.wgNetInfos[a].joinId === item.joinId) { @@ -1256,6 +1268,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delDepts.length; s++) { + if (this.addForm.wgDeptsDel) { + this.addForm.wgDeptsDel += ',' + this.addForm.wgDeptsDel += this.delDepts[s].id + } else { + this.addForm.wgDeptsDel = this.delDepts[s].id + } + } for (let a = 0; a < this.addForm.wgDepts.length; a++) { this.delDepts.forEach(item => { if (this.addForm.wgDepts[a].joinId === item.joinId) { @@ -1277,6 +1297,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delPayInfos.length; s++) { + if (this.addForm.wgPayInfosDel) { + this.addForm.wgPayInfosDel += ',' + this.addForm.wgPayInfosDel += this.delPayInfos[s].id + } else { + this.addForm.wgPayInfosDel = this.delPayInfos[s].id + } + } for (let a = 0; a < this.addForm.wgPayInfos.length; a++) { this.delPayInfos.forEach(item => { if (this.addForm.wgPayInfos[a].joinId === item.joinId) { @@ -1298,6 +1326,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delMeetingInfos.length; s++) { + if (this.addForm.wgMeetingInfosDel) { + this.addForm.wgMeetingInfosDel += ',' + this.addForm.wgMeetingInfosDel += this.delMeetingInfos[s].id + } else { + this.addForm.wgMeetingInfosDel = this.delMeetingInfos[s].id + } + } for (let a = 0; a < this.addForm.wgMeetingInfos.length; a++) { this.delMeetingInfos.forEach(item => { if (this.addForm.wgMeetingInfos[a].joinId === item.joinId) { diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue index 243d764c0..ec9cbecd6 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue @@ -767,10 +767,14 @@ standerArea: '', // 标准化工作领域 mark: '', // 备注 wgNetInfos: [], // 秘书联系方式 + wgNetInfosDel: '', wgMeetingInfos: [], // 参会记录 + wgMeetingInfosDel: '', wgDepts: [], // 集团参与 - wgStandorpolicyInfos: [], // 标准政策 + wgDeptsDel: '', wgPayInfos: [], // 支付信息 + wgPayInfosDel: '', + wgStandorpolicyInfos: [], // 标准政策 }, addFormRules: { number: [ @@ -1112,6 +1116,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delNetInfos.length; s++) { + if (this.addForm.wgNetInfosDel) { + this.addForm.wgNetInfosDel += ',' + this.addForm.wgNetInfosDel += this.delNetInfos[s].id + } else { + this.addForm.wgNetInfosDel = this.delNetInfos[s].id + } + } for (let a = 0; a < this.addForm.wgNetInfos.length; a++) { this.delNetInfos.forEach(item => { if (this.addForm.wgNetInfos[a].joinId === item.joinId) { @@ -1133,6 +1145,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delDepts.length; s++) { + if (this.addForm.wgDeptsDel) { + this.addForm.wgDeptsDel += ',' + this.addForm.wgDeptsDel += this.delDepts[s].id + } else { + this.addForm.wgDeptsDel = this.delDepts[s].id + } + } for (let a = 0; a < this.addForm.wgDepts.length; a++) { this.delDepts.forEach(item => { if (this.addForm.wgDepts[a].joinId === item.joinId) { @@ -1154,6 +1174,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delPayInfos.length; s++) { + if (this.addForm.wgPayInfosDel) { + this.addForm.wgPayInfosDel += ',' + this.addForm.wgPayInfosDel += this.delPayInfos[s].id + } else { + this.addForm.wgPayInfosDel = this.delPayInfos[s].id + } + } for (let a = 0; a < this.addForm.wgPayInfos.length; a++) { this.delPayInfos.forEach(item => { if (this.addForm.wgPayInfos[a].joinId === item.joinId) { @@ -1175,6 +1203,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delMeetingInfos.length; s++) { + if (this.addForm.wgMeetingInfosDel) { + this.addForm.wgMeetingInfosDel += ',' + this.addForm.wgMeetingInfosDel += this.delMeetingInfos[s].id + } else { + this.addForm.wgMeetingInfosDel = this.delMeetingInfos[s].id + } + } for (let a = 0; a < this.addForm.wgMeetingInfos.length; a++) { this.delMeetingInfos.forEach(item => { if (this.addForm.wgMeetingInfos[a].joinId === item.joinId) { From 7324a82385431f92ac03e7fac947ff179ed76fb9 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 15 Dec 2021 11:16:37 +0800 Subject: [PATCH 03/13] commit --- .../workingGroup/components/workingGroup1/index.vue | 6 +++--- .../workingGroup/components/workingGroup2/index.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index 991236c97..40e39f1ab 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -156,7 +156,7 @@ width="150"> - + - + - + - + Date: Wed, 15 Dec 2021 14:30:55 +0800 Subject: [PATCH 04/13] commit --- .../pages/creatProcess/bzzqyj/step1-1.vue | 6 ++--- .../pages/creatProcess/bzzqyj/step1.vue | 6 ++--- .../pages/creatProcess/bzzqyj/step2.vue | 9 +------- .../pages/creatProcess/bzzqyj/step3.vue | 9 +------- .../pages/creatProcess/bzzqyj/step4-1.vue | 9 +------- .../pages/creatProcess/bzzqyj/step4-2.vue | 9 +------- .../pages/creatProcess/bzzqyj/step4.vue | 9 +------- .../pages/creatProcess/bzzqyj/step5.vue | 9 +------- .../pages/creatProcess/bzzqyj/step6.vue | 9 +------- .../pages/creatProcess/bzzqyj/step7.vue | 9 +------- .../pages/creatProcess/bzzqyj/step8.vue | 9 +------- .../pages/creatProcess/bzzqyj/step9.vue | 9 +------- .../components/workingGroup1/index.vue | 22 +++++++++++++++---- .../components/workingGroup2/index.vue | 21 +++++++++++------- 14 files changed, 47 insertions(+), 98 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index c82eb09dd..811f5d5b1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -327,7 +327,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :on-remove="importFileRemove" @@ -476,10 +476,10 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index bb5f72f62..6c38bb7cb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -342,7 +342,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :on-remove="importFileRemove" @@ -489,10 +489,10 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 3a573f99c..028661cc1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -255,14 +255,7 @@ export default { }) }, updataFj (item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 5dc8a02c7..e0062beed 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -464,14 +464,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 8a5edbd2d..6cbadc4ec 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -365,14 +365,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 5caae05e7..7eaad4088 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -357,14 +357,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 9ec1b19d8..1468ea86b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -550,14 +550,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 995ed952d..5e1e6bcca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -473,14 +473,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index b95419445..884d04912 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -364,14 +364,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 6e959ee91..3fe206cb5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -361,14 +361,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 31006296c..b3d4a40f9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -361,14 +361,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 95c0b267d..6055e3d72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -361,14 +361,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index 40e39f1ab..09b62375f 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -290,7 +290,7 @@ align="center">