From 2119620fd4df39250a2432b61e787b3de1fecd5a Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 27 Oct 2021 09:53:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=95=B4?= =?UTF-8?q?=E4=B8=AA=E6=B5=81=E7=A8=8B=E5=AE=9E=E7=8E=B0=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 22 +- .../pages/creatProcess/bzrk/step2.vue | 291 +++++++++++++----- .../pages/creatProcess/bzrk/step3.vue | 9 +- 3 files changed, 219 insertions(+), 103 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 90c8e7b01..c93f23518 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1896,7 +1896,6 @@ break; case 'jdwj': this.getFileList(value,this.jdwjFileList); - console.log("初始",this.jdwjFileList) break; case 'bpg': this.getFileList(value,this.bpgFileList); @@ -2370,7 +2369,6 @@ // this.form.zbjbdName += response.data.name+','; // } - switch (this.fileType){ case 'fbgbjbd': this.FBGBJBDFileList=fileList; @@ -2629,34 +2627,34 @@ //拼接文件名和id 提交到流程Activity this.form.fbgbjbd=this.FBGBJBDFileList.map(item => item.response.data.id).join(",") - this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.response.data.name).join(",") + this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.name).join(",") this.form.xgd=this.xgdFileList.map(item => item.response.data.id).join(",") - this.form.xgdName=this.xgdFileList.map(item => item.response.data.name).join(",") + this.form.xgdName=this.xgdFileList.map(item => item.name).join(",") this.form.bpg=this.bpgFileList.map(item => item.response.data.id).join(",") - this.form.bpgName=this.bpgFileList.map(item => item.response.data.name).join(",") + this.form.bpgName=this.bpgFileList.map(item => item.name).join(",") this.form.ssg=this.ssgFileList.map(item => item.response.data.id).join(",") - this.form.ssgName=this.ssgFileList.map(item => item.response.data.name).join(",") + this.form.ssgName=this.ssgFileList.map(item => item.name).join(",") this.form.zqyjg=this.zqyjgFileList.map(item => item.response.data.id).join(",") - this.form.zqyjgName=this.zqyjgFileList.map(item => item.response.data.name).join(",") + this.form.zqyjgName=this.zqyjgFileList.map(item => item.name).join(",") this.form.jdwj=this.jdwjFileList.map(item => item.response.data.id).join(",") - this.form.jdwjName=this.jdwjFileList.map(item => item.response.data.name).join(",") + this.form.jdwjName=this.jdwjFileList.map(item => item.name).join(",") this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",") - this.form.kwjName=this.kwjFileList.map(item => item.response.data.name).join(",") + this.form.kwjName=this.kwjFileList.map(item => item.name).join(",") this.form.ca=this.caFileList.map(item => item.response.data.id).join(",") - this.form.caName=this.caFileList.map(item => item.response.data.name).join(",") + this.form.caName=this.caFileList.map(item => item.name).join(",") this.form.zbjbd=this.zbjbdFileList.map(item => item.response.data.id).join(",") - this.form.zbjbdName=this.zbjbdFileList.map(item => item.response.data.name).join(",") + this.form.zbjbdName=this.zbjbdFileList.map(item => item.name).join(",") this.form.glwj=this.glwjFileList.map(item => item.response.data.id).join(",") - this.form.glwjName=this.glwjFileList.map(item => item.response.data.name).join(",") + this.form.glwjName=this.glwjFileList.map(item => item.name).join(",") }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index a2b44f516..34ecbacec 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -215,84 +215,164 @@
- - - -
- {{ form.xgdName }} -
-
- - - -
- - -
- {{ form.fbgbjbdName }} -
-
- - - -
- - -
- {{ form.zbjbdName }} -
-
- - - -
- - -
- {{ form.ssgName }} -
-
- - - -
- - -
- {{ form.caName }} -
-
- - - -
- - - - -
- {{ form.kwjName }} -
-
- - - -
- - -
- {{ form.jdwjName }} -
-
- - - -
- - -
- {{ form.bpgName }} -
-
- - - -
- - -
- {{ form.zqyjgName }} -
-
- - - -
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + + + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
+ {{value.name}} +
+
+ - - +
+ + +
@@ -692,7 +772,22 @@ name: "bzrkStep2", data () { return { - // 调整处理人抽屉状态 + xgdFileMap: [], + fbgbjbdFileMap: [], + bpgFileMap: [], + ssgFileMap: [], + zqyjgFileMap: [], + jdwjFileMap: [], + kwjFileMap: [], + glwjFileMap: [], + caFileMap: [], + zbjbdFileMap: [], + + + + + + // 调整处理人抽屉状态 drawerModal: false, drawerTitle: '', nodeList: [], @@ -895,7 +990,6 @@ 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'){ @@ -979,6 +1073,16 @@ this.detailData = res }, e => {}) }, + assemble(ids,names){ + let list= new Array(); + let idArray=ids.split(','); + let nameArray=names.split(','); + for(var i=0;i { inboundLiaisonDetail({ @@ -987,6 +1091,8 @@ }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + + console.log("processFrom",processForm) this.xgdFileId = processForm.xgd this.fbgbjbdFileId = processForm.fbgbjbd this.bpgFileId = processForm.bpg @@ -998,8 +1104,27 @@ this.caFileId = processForm.ca this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) - console.log(processForm); - console.log("processForm"); + + this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName); + + this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName); + // fbgbjbdFileMap: {}, + this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName); + // bpgFileMap: {}, + this.ssgFileMap=this.assemble(processForm.ssg,processForm.ssgName); + // ssgFileMap: {}, + this.zqyjgFileMap=this.assemble(processForm.zqyjg,processForm.zqyjgName); + // zqyjgFileMap: {}, + this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwjName); + // jdwjFileMap: {}, + this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName); + // kwjFileMap: {}, + this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName); + // glwjFileMap: {}, + this.caFileMap=this.assemble(processForm.ca,processForm.caName); + // caFileMap: {}, + this.zbjbdFileMap=this.assemble(processForm.zbjbd,processForm.zbjbdName); + // zbjbdFileMap: {}, } }).catch(e => { @@ -1013,7 +1138,6 @@ this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) this.defaultCheckedKeys = [this.form.standSystem] - console.log(this.defaultCheckedKeys) this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] this.defaultCheckedKeys3 = [this.form.dybxh] @@ -1082,7 +1206,6 @@ }, { _this: this }, res => { - console.log(res); if (res.success) { if(this.formTongGuo.approvalOpinion === '1'){ this.$message.warning("驳回成功") diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index c30de6592..254cbc5cd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -973,12 +973,9 @@ export default { }, e => {}) }, assemble(ids,names){ - console.log("name",names) - console.log("id",ids) let list= new Array(); let idArray=ids.split(','); let nameArray=names.split(','); - console.log("idarray",idArray); for(var i=0;i { this.form = JSON.parse(JSON.stringify(item)) - console.log("this.form"); - console.log(this.form); + console.log("this.form",this.form); this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm]