From e038d6ab4805e662d26ee263d8c31e48c2010901 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 7 Nov 2021 14:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8E=20=E8=B5=8B=E5=80=BC=E5=88=B0?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E8=A1=A8=E5=8D=95=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step4.vue         | 96 ++++++++-----------
 1 file changed, 38 insertions(+), 58 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 95668c70b..ad5702bcb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1217,6 +1217,7 @@
               :before-upload="beginImportFile"
               :on-success="importFileSuccess"
               :on-change="fileChange"
+              :on-remove="removeOneFile"
               :show-file-list="true"
       >
         <div style="padding: 20px 0">
@@ -2007,6 +2008,7 @@ export default {
       }
     },removeOneFile(file, fileList) {
 
+
       switch (this.fileType){
         case 'fbgbjbd':
           this.FBGBJBDFileList=fileList;
@@ -2032,6 +2034,12 @@ export default {
         case 'ca':
           this.caFileList=fileList;
           break;
+        case 'zbjbd':
+          this.zbjbdFileList=fileList
+          break;
+        case 'glwj':
+          this.glwjFileList=fileList
+          break
         default : ;
       }
     },
@@ -2324,70 +2332,42 @@ export default {
     },
     fileInfoHandle(){
 
-      if(this.fileType === 'fbgbjbd'){
-        this.FBGBJBDFileList=fileList;
-        this.form.fbgbjbd += response.data.id+',';
-        if( this.form.fbgbjbdName=== undefined){
-          this.form.fbgbjbdName=''
-        }
-        this.form.fbgbjbdName += response.data.name+',';
-      }else if(this.fileType === 'xgd'){
-        this.xgdFileList=fileList;
-        console.log(this.xgdFileList)
+      //拼接文件名和id 提交到流程Activity
+      this.form.fbgbjbd=this.FBGBJBDFileList.map(item => item.response.data.id).join(",")
+      this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.name).join(",")
 
-        this.form.xgd += response.data.id+',';
-        if( this.form.xgdName=== undefined){
-          this.form.xgdName=''
-        }
-        this.form.xgdName += response.data.name+',';
-      }else if(this.fileType === 'bpg'){
-        this.bpgFileList=fileList;
-        this.form.bpg += response.data.id+',';
-        if( this.form.bpgName=== undefined){
-          this.form.bpgName=''
-        }
-        this.form.bpgName += response.data.name+',';
-      }else if(this.fileType === 'ssg'){
-        this.ssgFileList=fileList;
-        this.form.ssg += response.data.id+',';
-        if( this.form.ssgName=== undefined){
-          this.form.ssgName=''
-        }
-        this.form.ssgName += response.data.name+',';
-      }else if(this.fileType === 'zqyjg'){
-        this.zqyjgFileList=fileList;
-        this.form.zqyjg += response.data.id+',';
-        if( this.form.zqyjgName=== undefined){
-          this.form.zqyjgName=''
-        }
-        this.form.zqyjgName += response.data.name+',';
-      }else if(this.fileType === 'jdwj'){
-        this.jdwjFileList=fileList;
-        this.form.jdwj += response.data.id+',';
-        if( this.form.jdwjName=== undefined){
-          this.form.jdwjName=''
-        }
-        this.form.jdwjName += response.data.name+',';
-      }else if(this.fileType === 'kwj'){
-        this.kwjFileList=fileList;
-        this.form.kwj += response.data.id+',';
-        if( this.form.kwjName=== undefined){
-          this.form.kwjName=''
-        }
-        this.form.kwjName += response.data.name+',';
-      }else if(this.fileType === 'ca'){
-        this.caFileList=fileList;
-        this.form.ca += response.data.id+',';
-        if( this.form.caName=== undefined){
-          this.form.caName=''
-        }
-        this.form.caName += response.data.name+',';
-      }
+      this.form.xgd=this.xgdFileList.map(item => item.response.data.id).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.name).join(",")
+
+      this.form.ssg=this.ssgFileList.map(item => item.response.data.id).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.name).join(",")
+
+      this.form.jdwj=this.jdwjFileList.map(item => item.response.data.id).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.name).join(",")
+
+      this.form.ca=this.caFileList.map(item => item.response.data.id).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.name).join(",")
+
+      this.form.glwj=this.glwjFileList.map(item => item.response.data.id).join(",")
+      this.form.glwjName=this.glwjFileList.map(item => item.name).join(",")
     },
     handleSubmit() {
       this.form.country=this.countryArr;
       this.$refs['form'].validate((valid) => {
           if (valid) {
+            this.fileInfoHandle();
             this.isSubmit = true
             this.form.commentText = this.commentText
             this.form.approvalOpinion = this.approvalOpinion