From a341b2b20ebccdbb597afeeeeb43bcbac0882215 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 5 Aug 2021 11:26:42 +0800 Subject: [PATCH 1/6] commit --- .../pages/creatProcess/bzdy/step1.vue | 16 +++++++++- .../pages/creatProcess/bzjd/step3.vue | 29 +++++++++---------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 4bed4251c..dab32ce04 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -169,6 +169,7 @@ >
@@ -184,6 +186,7 @@

点击或拖拽上传文件

 + @@ -198,6 +201,8 @@ export default { name: "bzdyStep1", data() { return { + progressType: false, + loadProgress: 0, commentText: '', nodeList: [], nodeList2: [], @@ -310,6 +315,10 @@ export default { this.drawerTitle = title this.modalshowflag = true }, + progressFile (event, file, fileList) { + let loadProgress = Math.floor(event.percent) + this.loadProgress = loadProgress + }, // 导入按钮 上传之前的钩子 beginImportFile (file) { var filename = file.name @@ -318,11 +327,13 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 + this.progressType = true if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { this.spinShow = false this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.progressType = false return false } // 判断文件上传大小 @@ -331,6 +342,7 @@ export default { return true } else { this.$message.error('文件' + file.name + '大小不超过200M') + this.progressType = false return false } return true @@ -339,6 +351,8 @@ export default { importFileSuccess (response, file) { if (response.ok) { this.fileMadel = false + this.loadProgress = 0 + this.progressType = false this.form.model = response.data.id this.form.modelName = response.data.name this.$message({ @@ -412,7 +426,7 @@ export default { }) } }, - mounted () {} + mounted () {}, } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index ffb1fd8fe..162232581 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -102,12 +102,12 @@ width="100" align="center"> - - + + + + + + { item.unitDeptName = this.$store.getters.userInfo.orgName - item.onlineData = '' - item.newData = '' - item.complianceState = '' - item.oldNumber = '' - item.complianceRequir = '1' - item.changePoint = '' - item.technicalRequir = '' + item.onlineData = item.onlineData || '' + item.newData = item.newData || '' + item.complianceState = item.complianceState || '' + item.oldNumber = item.oldNumber || '' + item.complianceRequir = item.complianceRequir || '1' + item.changePoint = item.changePoint || '' + item.technicalRequir = item.technicalRequir || '' item.itemsTitle = item.itermsConditions }) - console.log(2); this.itemList = itemList + console.log(this.itemList) this.loading = false }).catch(e => { }) From bd4daea81bce111d345b244db015bbdd467efbb7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 13:52:56 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=EF=BC=8C=EF=BC=8C?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E6=8A=A5=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=88=E6=9C=AC=E5=9C=B0=EF=BC=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index dd5c530aa..f92ea5f99 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -862,8 +862,13 @@ }, methods: { downloadFile (fileType) { + //文件id中出现了','字符,去除掉 if(fileType === 'fbgbjbd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId }else if(fileType === 'bpg'){ @@ -964,6 +969,7 @@ this.caFileId = processForm.ca this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) + console.log(processForm); } }).catch(e => { }) From bb287587cd854612095c084d73041f6692182bb5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 13:57:26 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=EF=BC=8C=EF=BC=8C?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E6=8A=A5=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=88=E6=9C=AC=E5=9C=B0=EF=BC=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 4 ++++ src/pages/processCenter/pages/creatProcess/bzrk/step5.vue | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index e0b897644..26187ebbd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -836,6 +836,10 @@ export default { methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 2d414fb44..840e35e6e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -815,6 +815,10 @@ methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId From 959725449d116407c6b4df6d6f3988a54cb13325 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 5 Aug 2021 14:15:14 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81--=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=A0=B9=E6=8D=AE=E7=AB=A0=E8=8A=82=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E8=BF=9B=E8=A1=8C=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardForComments/pags/consultationDetails.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 2af3b6084..4a37819e5 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -43,6 +43,7 @@ From 2d441e65ab69bdcd993f558bebc868c06199f3e5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 14:24:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=BA=94=E8=AF=A5=E8=B7=9F=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BA=93=E4=B8=80=E8=87=B4=EF=BC=8C=E5=8F=AF=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=B8=8A=E4=BC=A0=E5=A4=9A=E4=B8=AA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step1.vue | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index dab32ce04..45ccf0b85 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -45,18 +45,23 @@ v-model="form.modelName" clearable > -
- {{ form.modelName }} -
-
- - 点击上传 + + + + + + + + + + + + + + + {{isFileUploadStr}} -
+ @@ -179,7 +184,7 @@ :before-upload="beginImportFile" :on-success="importFileSuccess" :on-progress="progressFile" - :show-file-list="false" + :show-file-list="true" >
@@ -201,6 +206,7 @@ export default { name: "bzdyStep1", data() { return { + isFileUploadStr:'点击上传', progressType: false, loadProgress: 0, commentText: '', @@ -350,7 +356,8 @@ export default { // 导入标准数据成功后执行 importFileSuccess (response, file) { if (response.ok) { - this.fileMadel = false + this.isFileUploadStr='点击查看已上传文件'; + this.fileMadel = true; this.loadProgress = 0 this.progressType = false this.form.model = response.data.id From 07e9255e5f4699ec7e38235db32c3b69ac645400 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 14:47:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=88=E7=BB=8F?= =?UTF-8?q?=E7=90=86=E4=BA=BA=E5=AE=A1=E6=89=B9=EF=BC=89=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=80=9A=E8=BF=87=EF=BC=8C=E5=BA=94=E4=B8=8D=E5=BF=85=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=84=8F=E8=A7=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index f92ea5f99..bdbc16be0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -890,11 +890,12 @@ } }, getRule(){ + if (this.formTongGuo.approvalOpinion === '0') { - this.rules.commentText.required = false + this.rules.commentText[0].required = false; this.$refs.formTongGuo.clearValidate('commentText') - } else { - this.rules.commentText.required = true + }else { + this.rules.commentText[0].required = true; } }, popoverHide (checkedIds, checkedData) {