From df2d5ecc93ac7e841cd78f36f19a94f34e3465c4 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 13 Oct 2021 11:20:45 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93,?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 435 ++++++---
 .../pages/creatProcess/bzrk/step3.vue         | 112 ++-
 .../pages/creatProcess/bzrk/step4.vue         | 875 ++++++++++++++----
 3 files changed, 1122 insertions(+), 300 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 1ec709505..da2503594 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1,5 +1,4 @@
-<template>
-    <div class="bzrkStep1">
+<template><div class="bzrkStep1">
         <!--        标准入库流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准入库流程</template>
@@ -221,14 +220,14 @@
                     <div class="prc-content-border" v-show="verifySarStandard">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item v-show="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
+                              <el-form-item v-show="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"
                                             v-model="form.xgdName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="form.xgdName">
+                                    <div v-if="xgdFileList.length>0">
 <!--                                        {{ form.xgdName }}-->
                                         <el-button
                                                 type="primary"
@@ -251,14 +250,14 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
-                                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                              <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"
                                             v-model="form.fbgbjbdName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="form.fbgbjbdName">
+                                    <div v-if="FBGBJBDFileList.length>0">
 <!--                                        {{ form.fbgbjbdName }}-->
                                         <el-button
                                                 type="primary"
@@ -288,7 +287,7 @@
                                     v-model="form.ssgName"
                                     clearable
                                 ></el-input>
-                                <div v-if="form.ssgName">
+                                <div v-if="ssgFileList.length>0">
                                   <!--                                        {{ form.ssgName }}-->
                                   <el-button
                                       type="primary"
@@ -318,7 +317,7 @@
                                     v-model="form.caName"
                                     clearable
                                 ></el-input>
-                                <div v-if="form.caName">
+                                <div v-if="caFileList.length>0">
                                   <!--                                        {{ form.caName }}-->
                                   <el-button
                                       type="primary"
@@ -341,14 +340,14 @@
                                   </el-button>
                                 </div>
                               </el-form-item>
-                                <el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
+                              <el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"
                                             v-model="form.zbjbdName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="form.zbjbdName">
+                                    <div v-if="zbjbdFileList.length>0">
 <!--                                        {{ form.zbjbdName }}-->
                                         <el-button
                                                 type="primary"
@@ -373,14 +372,14 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item v-show="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
+                              <el-form-item v-show="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"
                                             v-model="form.kwjName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="form.kwjName">
+                                    <div v-if="kwjFileList.length>0">
 <!--                                        {{ form.kwjName }}-->
                                         <el-button
                                                 type="primary"
@@ -410,7 +409,7 @@
                                     v-model="form.jdwjName"
                                     clearable
                                 ></el-input>
-                                <div v-if="form.jdwjName">
+                                <div v-if="jdwjFileList.length>0">
                                   <!--                                        {{ form.jdwjName }}-->
                                   <el-button
                                       type="primary"
@@ -440,7 +439,7 @@
                                     v-model="form.bpgName"
                                     clearable
                                 ></el-input>
-                                <div v-if="form.bpgName">
+                                <div v-if="bpgFileList.length>0">
                                   <!--                                        {{ form.bpgName }}-->
                                   <el-button
                                       type="primary"
@@ -470,7 +469,7 @@
                                     v-model="form.zqyjgName"
                                     clearable
                                 ></el-input>
-                                <div v-if="form.zqyjgName">
+                                <div v-if="zqyjgFileList.length>0">
                                   <!--                                        {{ form.zqyjgName }}-->
                                   <el-button
                                       type="primary"
@@ -910,6 +909,7 @@
                     accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
+                    :on-remove="removeOneFile"
                     :show-file-list="true"
             >
                 <div style="padding: 20px 0">
@@ -1269,7 +1269,7 @@
               jdwjFileList: [],
               zbjbdFileList: [],
               kwjFileList: [],
-              qlwjFileList: [],
+              glwjFileList: [],
               filterText:'',
               textStatusMap: {}, // 文本状态id与name对应
                 standardDrawer: false,
@@ -1726,7 +1726,7 @@
             data.forEach(item => {
               this.$set(this.textStatusMap, item.value, item.label)
             })
-      
+
           },
             clearFormData(data){
                 this.form = {
@@ -1817,7 +1817,7 @@
                             const bringData = this.standardCheckedList[0]
                             bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
                             bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
-             
+
                             const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                             this.form = JSON.parse(JSON.stringify(json))
 
@@ -1847,6 +1847,15 @@
                             this.busVsFunc()
                             this.modelFunc()
                             this.$forceUpdate()
+
+                          console.log("this.form",this.form);
+                          // 遍历对象初始化文件信息
+                          for(const p in this.form) {
+                            if (typeof (this.form[p]) != "function") {
+                              this.initializeFileList(p,this.form[p]);
+                            }
+                          }
+
                         } else if (this.standardCheckedList.length > 1) {
                             this.$message.warning('最多可以带入一条标准信息')
                         } else {
@@ -1860,7 +1869,63 @@
                         this.standardDrawer = false
                         break
                 }
-            },
+            },initializeFileList(property ,value){
+            switch (property){
+              case 'xgd':
+                this.getFileList(value,this.xgdFileList);
+                break;
+              case 'fbgbjbd':
+                this.getFileList(value,this.FBGBJBDFileList);
+                break;
+              case 'ssg':
+                this.getFileList(value,this.ssgFileList);
+                break;
+              case 'ca':
+                this.getFileList(value,this.caFileList);
+                break;
+              case 'zbjbd':
+                this.getFileList(value,this.zbjbdFileList);
+                break;
+              case 'kwj':
+                this.getFileList(value,this.kwjFileList);
+                break;
+              case 'jdwj':
+                debugger
+                this.getFileList(value,this.jdwjFileList);
+                break;
+              case 'bpg':
+                this.getFileList(value,this.bpgFileList);
+                break;
+              case 'zqyjg':
+                this.getFileList(value,this.zqyjgFileList);
+                break;
+              default: ;
+            }
+          },getFileList(fileIds,defaultFileList){
+
+            // 对象为引用传递
+            this.$http.get('att/attFile/getMultiFileInfos', {
+              fileIds: fileIds
+            }, {
+              _this: this
+            }, res => {
+              debugger
+              let fileList = res.data
+              if (fileList != null && fileList.length > 0) {
+                for (let i = 0; i < fileList.length; i++) {
+                  let obj = {name: '', response: {}}
+                  obj.name = fileList[i].oldFileName
+                  obj.response.data = fileList[i]
+
+
+                  //根据以‘，’分割的id查询到的文件信息，放入对应的文件list中
+                  defaultFileList.push(obj)
+                  console.log("defaultFileList",defaultFileList);
+                }
+              }
+            }, e => {
+            })
+          },
             handleStandardPageChange (page) {
                 this.standardSearchForm.page = page
                 this.handleSearchStandard()
@@ -2219,83 +2284,122 @@
                 if (response.ok) {
                     // this.fileMadel = false
                     // this.fileList = []
-                    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;
-                        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 === 'xgd'){
-                    //   this.xgdFileList=fileList;
+                    // 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;
                     //     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 === 'glwj'){
-                      this.qlwjFileList=fileList;
-                        this.form.glwj += response.data.id+',';
-                             if( this.form.glwjName=== undefined){
-                            this.form.glwjName=''
-                        }
-                        this.form.glwjName += response.data.name+',';
-                    }else if(this.fileType === 'ca'){
+                    // // else if(this.fileType === 'xgd'){
+                    // //   this.xgdFileList=fileList;
+                    // //     this.form.xgd += response.data.id+',';
+                    // //     this.form.xgdName += response.data.name+',';
+                    // // }
+                    // else if(this.fileType === 'glwj'){
+                    //   this.qlwjFileList=fileList;
+                    //     this.form.glwj += response.data.id+',';
+                    //          if( this.form.glwjName=== undefined){
+                    //         this.form.glwjName=''
+                    //     }
+                    //     this.form.glwjName += response.data.name+',';
+                    // }else if(this.fileType === 'ca'){
+                    //   this.caFileList=fileList;
+                    //   console.log(this.caFieList)
+                    //     this.form.ca += response.data.id+',';
+                    //          if( this.form.caName=== undefined){
+                    //         this.form.caName=''
+                    //     }
+                    //     this.form.caName += response.data.name+',';
+                    // }else if(this.fileType === 'zbjbd'){
+                    //   this.zbjbdFileList=fileList;
+                    //     this.form.zbjbd += response.data.id+',';
+                    //          if( this.form.zbjbdName=== undefined){
+                    //         this.form.zbjbdName=''
+                    //     }
+                    //     this.form.zbjbdName += response.data.name+',';
+                    // }
+
+
+                  switch (this.fileType){
+                    case 'fbgbjbd':
+                      this.FBGBJBDFileList=fileList;
+                      console.log("FBGJBDFileList",this.FBGBJBDFileList);
+                      break;
+                    case 'xgd' :
+                      this.xgdFileList=fileList;
+                      break;
+                    case 'bpg':
+                      this.bpgFileList=fileList;
+                      break;
+                    case 'ssg':
+                      this.ssgFileList=fileList;
+                      break;
+                    case 'zqyjg':
+                      this.zqyjgFileList=fileList;
+                      break;
+                    case 'jdwj':
+                      this.jdwjFileList=fileList;
+                      break;
+                    case 'kwj':
+                      this.kwjFileList=fileList;
+                      break;
+                    case 'ca':
                       this.caFileList=fileList;
-                        this.form.ca += response.data.id+',';
-                             if( this.form.caName=== undefined){
-                            this.form.caName=''
-                        }
-                        this.form.caName += response.data.name+',';
-                    }else if(this.fileType === 'zbjbd'){
-                      this.zbjbdFileList=fileList;
-                        this.form.zbjbd += response.data.id+',';
-                             if( this.form.zbjbdName=== undefined){
-                            this.form.zbjbdName=''
-                        }
-                        this.form.zbjbdName += response.data.name+',';
-                    }
+                      break;
+                    case 'zbjbd':
+                      this.zbjbdFileList=fileList
+                      break;
+                    case 'glwj':
+                      this.glwjFileList=fileList
+                      break
+                    default : ;
+                  }
                   this.$message({
                         showClose: true,
                         message: response.message,
@@ -2308,30 +2412,101 @@
                 // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
 
                 this.fileType = type;
-                if (type==='ca'){
-                  this.fileList=this.caFileList;
-                }else if (type==='fbgbjbd'){
-                  this.fileList=this.FBGBJBDFileList;
-                }else if (type==='xgd'){
-                  this.fileList=this.xgdFileList;
-                }else if(type==='bpg'){
-                  this.fileList=this.bpgFileList;
-                }else if (type==='ssg'){
-                  this.fileList=this.ssgFileList;
-                }else if (type==='zqyjg'){
-                  this.fileList=this.zqyjgFileList;
-                }else if (type==='jdwj'){
-                  this.fileList=this.jdwjFileList;
-                }else if (type==='zbjbd'){
+                // if (type==='ca'){
+                //   this.fileList=this.caFileList;
+                // }else if (type==='fbgbjbd'){
+                //   this.fileList=this.FBGBJBDFileList;
+                // }else if (type==='xgd'){
+                //   this.fileList=this.xgdFileList;
+                // }else if(type==='bpg'){
+                //   this.fileList=this.bpgFileList;
+                // }else if (type==='ssg'){
+                //   this.fileList=this.ssgFileList;
+                // }else if (type==='zqyjg'){
+                //   this.fileList=this.zqyjgFileList;
+                // }else if (type==='jdwj'){
+                //   this.fileList=this.jdwjFileList;
+                // }else if (type==='zbjbd'){
+                //   this.fileList=this.zbjbdFileList;
+                // }else if (type==='kwj'){
+                //   this.fileList=this.kwjFileList;
+                // }else if (type==='glwj'){
+                //   this.fileList=this.qlwjFileList;
+                // }
+
+
+
+              switch (this.fileType){
+                case 'fbgbjbd':
+                  this.fileList=this.FBGBJBDFileList
+                  break;
+                case 'xgd' :
+                  this.fileList=this.xgdFileList
+                  break;
+                case 'bpg':
+                  this.fileList=this.bpgFileList
+                  break;
+                case 'ssg':
+                  this.fileList=this.ssgFileList
+                  break;
+                case 'zqyjg':
+                  this.fileList=this.zqyjgFileList
+                  break;
+                case 'jdwj':
+                  this.fileList=this.jdwjFileList
+                case 'kwj':
+                  this.fileList=this.kwjFileList
+                  break;
+                case 'ca':
+                  this.fileList=this.caFileList
+                  break;
+                case 'zbjbd':
                   this.fileList=this.zbjbdFileList;
-                }else if (type==='kwj'){
-                  this.fileList=this.kwjFileList;
-                }else if (type==='glwj'){
-                  this.fileList=this.qlwjFileList;
-                }
+                  break;
+                case 'glwj':
+                  this.fileList=this.glwjFileList;
+                  break
+                default : ;
+              }
               this.fileMadel = true;
 
             },
+          removeOneFile(file, fileList) {
+
+            switch (this.fileType){
+              case 'fbgbjbd':
+                this.FBGBJBDFileList=fileList;
+                break;
+              case 'xgd' :
+                this.xgdFileList=fileList;
+                break;
+              case 'bpg':
+                this.bpgFileList=fileList;
+                break;
+              case 'ssg':
+                this.ssgFileList=fileList;
+                break;
+              case 'zqyjg':
+                this.zqyjgFileList=fileList;
+                break;
+              case 'jdwj':
+                this.jdwjFileList=fileList;
+                break;
+              case 'kwj':
+                this.kwjFileList=fileList;
+                break;
+              case 'ca':
+                this.caFileList=fileList;
+                break;
+              case 'zbjbd':
+                this.zbjbdFileList=fileList
+                break;
+              case 'glwj':
+                this.glwjFileList=fileList
+                break
+              default : ;
+            }
+          },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if(checkedData.length > 0 && checkedData.length != 0){
@@ -2444,12 +2619,48 @@
                     this.saveLoading = false
                 })
             },
+          fileInfoHandle(){
+
+            //拼接文件名和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.xgd=this.xgdFileList.map(item => item.response.data.id).join(",")
+            this.form.xgdName=this.xgdFileList.map(item => item.response.data.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.ssg=this.ssgFileList.map(item => item.response.data.id).join(",")
+            this.form.ssgName=this.ssgFileList.map(item => item.response.data.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.jdwj=this.jdwjFileList.map(item => item.response.data.id).join(",")
+            this.form.jdwjName=this.jdwjFileList.map(item => item.response.data.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.ca=this.caFileList.map(item => item.response.data.id).join(",")
+            this.form.caName=this.caFileList.map(item => item.response.data.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.glwj=this.glwjFileList.map(item => item.response.data.id).join(",")
+            this.form.glwjName=this.glwjFileList.map(item => item.response.data.name).join(",")
+
+
+          },
             handleSubmit() {
               // this.form.country=this.countryArr;
                 this.$refs['form'].validate((valid) => {
                     if (valid) {
                         this.$refs['userForm'].validate((valid) => {
                             if (valid) {
+                                this.fileInfoHandle()
                                 this.isSubmit = true
                                 this.form.country=this.countryArr;
                                 var json = Object.assign(this.form, this.roleForm)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 9fdc7c346..c30de6592 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -211,40 +211,41 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
-                  <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
-                    {{ form.xgdName }}
+                  <div  v-if="xgdFileMap.length>0" v-for="(value,index)  in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile('xgd',value.id)">
+                    <!-- {{ value.name }} -->
+                    {{value.name}}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
-                  <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
-                    {{ form.fbgbjbdName }}
+                  <div v-if="form.fbgbjbdName" v-for="(value,index)  in this.fbgbjbdFileMap" :key="index"  style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
+                   {{value.name}}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
-                  <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
-                    {{ form.zbjbdName }}
+                  <div  v-if="form.zbjbdName"  v-for="(value,index)  in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
+                   {{value.name}}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
-                    {{ form.ssgName }}
+                  <div v-if="form.ssgName"  v-for="(value,index)  in this.ssgFileMap" :key="index"  style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
+                    {{value.name}}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                  <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
-                    {{ form.caName }}
+                  <div v-if="form.caName" v-for="(value,index)  in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
+                     {{value.name}}
                   </div>
                   <div v-else>
                     - -
@@ -253,32 +254,32 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
-                    {{ form.kwjName }}
+                  <div v-if="form.kwjName" v-for="(value,index)  in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
+                    {{value.name}}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
-                    {{ form.jdwjName }}
+                  <div v-if="form.jdwjName" v-for="(value,index)  in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
+                 {{value.name}}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
-                    {{ form.bpgName }}
+                  <div v-if="form.bpgName" v-for="(value,index)  in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
+                       {{value.name}}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
-                    {{ form.zqyjgName }}
+                  <div v-if="form.zqyjgName" v-for="(value,index)  in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
+                      {{value.name}}
                   </div>
                   <div v-else>
                     - -
@@ -693,6 +694,17 @@ export default {
   name: "bzrkStep3",
   data () {
     return {
+      xgdFileMap: [],
+      fbgbjbdFileMap: [],
+      bpgFileMap: [],
+      ssgFileMap: [],
+      zqyjgFileMap: [],
+      jdwjFileMap: [],
+      kwjFileMap: [],
+      glwjFileMap: [],
+      caFileMap: [],
+      zbjbdFileMap: [],
+
       xgdFileId: '',
       fbgbjbdFileId: '',
       bpgFileId: '',
@@ -883,28 +895,28 @@ export default {
         }
       })
     },
-    downloadFile (fileType) {
+    downloadFile (fileType,fileId) {
       if(fileType === 'fbgbjbd'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
       }else if(fileType === 'xgd'){
 
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'bpg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'ssg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'zqyjg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'jdwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'kwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'glwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'ca'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }else if(fileType === 'zbjbd'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId.replace(",","");
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
       }
     },
     popoverHide (checkedIds, checkedData) {
@@ -960,6 +972,19 @@ export default {
         this.detailData = res
       }, 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<idArray.length;i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+
+        return list;
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -978,6 +1003,35 @@ export default {
             this.glwjFileId = processForm.glwj
             this.caFileId = processForm.ca
             this.zbjbdFileId = processForm.zbjbd
+
+
+
+      this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName);
+      console.log("xgdName",this.xgdFileMap);
+
+      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.jdwj);
+      // 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: {},
+
+
+
+
+
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 1b3fc3a6a..f655b1e19 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -208,134 +208,254 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+<!--                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                          disabled-->
+<!--                          style="display: none;"-->
+<!--                          v-model="form.xgdName"-->
+<!--                          clearable-->
+<!--                  ></el-input>-->
+<!--                  <div v-if="form.xgdName">-->
+<!--                    {{ form.xgdName }}-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            style="margin-left: 10px"-->
+<!--                            @click="fileUpload('xgd')">-->
+<!--                      重新上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                  <div v-else>-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            @click="fileUpload('xgd')">-->
+<!--                      点击上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                          disabled-->
+<!--                          style="display: none;"-->
+<!--                          v-model="form.fbgbjbdName"-->
+<!--                          clearable-->
+<!--                  ></el-input>-->
+<!--                  <div v-if="form.fbgbjbdName">-->
+<!--                    {{ form.fbgbjbdName }}-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            style="margin-left: 10px"-->
+<!--                            @click="fileUpload('fbgbjbd')">-->
+<!--                      重新上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                  <div v-else>-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            @click="fileUpload('fbgbjbd')">-->
+<!--                      点击上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                          disabled-->
+<!--                          style="display: none;"-->
+<!--                          v-model="form.zbjbdName"-->
+<!--                          clearable-->
+<!--                  ></el-input>-->
+<!--                  <div v-if="form.zbjbdName">-->
+<!--                    {{ form.zbjbdName }}-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            style="margin-left: 10px"-->
+<!--                            @click="fileUpload('zbjbd')">-->
+<!--                      重新上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                  <div v-else>-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            @click="fileUpload('zbjbd')">-->
+<!--                      点击上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                          disabled-->
+<!--                          style="display: none;"-->
+<!--                          v-model="form.ssgName"-->
+<!--                          clearable-->
+<!--                  ></el-input>-->
+<!--                  <div v-if="form.ssgName">-->
+<!--                    {{ form.ssgName }}-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            style="margin-left: 10px"-->
+<!--                            @click="fileUpload('ssg')">-->
+<!--                      重新上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                  <div v-else>-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            @click="fileUpload('ssg')">-->
+<!--                      点击上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                      disabled-->
+<!--                      style="display: none;"-->
+<!--                      v-model="form.caName"-->
+<!--                      clearable-->
+<!--                  ></el-input>-->
+<!--                  <div v-if="form.caName">-->
+<!--                    {{ form.caName }}-->
+<!--                    <el-button-->
+<!--                        type="primary"-->
+<!--                        class="common-button-primary"-->
+<!--                        size="mini"-->
+<!--                        style="margin-left: 10px"-->
+<!--                        @click="fileUpload('ca')">-->
+<!--                      重新上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                  <div v-else>-->
+<!--                    <el-button-->
+<!--                        type="primary"-->
+<!--                        class="common-button-primary"-->
+<!--                        size="mini"-->
+<!--                        @click="fileUpload('ca')">-->
+<!--                      点击上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                </el-form-item>-->
+<!--                修改为多文件上传-->
+                <el-form-item v-show="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
                   <el-input
-                          disabled
-                          style="display: none;"
-                          v-model="form.xgdName"
-                          clearable
+                      disabled
+                      style="display: none;"
+                      v-model="form.xgdName"
+                      clearable
                   ></el-input>
-                  <div v-if="form.xgdName">
-                    {{ form.xgdName }}
+                  <div v-if="xgdFileList.length>0">
+                    <!--                                        {{ form.xgdName }}-->
                     <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            style="margin-left: 10px"
-                            @click="fileUpload('xgd')">
-                      重新上传
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px"
+                        @click="fileUpload('xgd')">
+                      <i class="el-icon-upload el-icon--right"></i>
+                      查看已上传的文件
                     </el-button>
                   </div>
                   <div v-else>
                     <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            @click="fileUpload('xgd')">
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        @click="fileUpload('xgd')">
+                      <i class="el-icon-upload el-icon--right"></i>
                       点击上传
                     </el-button>
                   </div>
                 </el-form-item>
                 <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
                   <el-input
-                          disabled
-                          style="display: none;"
-                          v-model="form.fbgbjbdName"
-                          clearable
+                      disabled
+                      style="display: none;"
+                      v-model="form.fbgbjbdName"
+                      clearable
                   ></el-input>
-                  <div v-if="form.fbgbjbdName">
-                    {{ form.fbgbjbdName }}
+                  <div v-if="FBGBJBDFileList.length>0">
+                    <!--                                        {{ form.fbgbjbdName }}-->
                     <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            style="margin-left: 10px"
-                            @click="fileUpload('fbgbjbd')">
-                      重新上传
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px"
+                        @click="fileUpload('fbgbjbd')">
+                      <i class="el-icon-upload el-icon--right"></i>
+                      查看已上传的文件
                     </el-button>
                   </div>
                   <div v-else>
                     <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            @click="fileUpload('fbgbjbd')">
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        @click="fileUpload('fbgbjbd')">
+                      <i class="el-icon-upload el-icon--right"></i>
                       点击上传
                     </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+                <el-form-item v-show="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
                   <el-input
-                          disabled
-                          style="display: none;"
-                          v-model="form.zbjbdName"
-                          clearable
+                      disabled
+                      style="display: none;"
+                      v-model="form.ssgName"
+                      clearable
                   ></el-input>
-                  <div v-if="form.zbjbdName">
-                    {{ form.zbjbdName }}
+                  <div v-if="ssgFileList.length>0">
+                    <!--                                        {{ form.ssgName }}-->
                     <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            style="margin-left: 10px"
-                            @click="fileUpload('zbjbd')">
-                      重新上传
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px"
+                        @click="fileUpload('ssg')">
+                      <i class="el-icon-upload el-icon--right"></i>
+                      查看已上传的文件
                     </el-button>
                   </div>
                   <div v-else>
                     <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            @click="fileUpload('zbjbd')">
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        @click="fileUpload('ssg')">
+                      <i class="el-icon-upload el-icon--right"></i>
                       点击上传
                     </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                  <el-input
-                          disabled
-                          style="display: none;"
-                          v-model="form.ssgName"
-                          clearable
-                  ></el-input>
-                  <div v-if="form.ssgName">
-                    {{ form.ssgName }}
-                    <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            style="margin-left: 10px"
-                            @click="fileUpload('ssg')">
-                      重新上传
-                    </el-button>
-                  </div>
-                  <div v-else>
-                    <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            @click="fileUpload('ssg')">
-                      点击上传
-                    </el-button>
-                  </div>
-                </el-form-item>
-                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
                   <el-input
                       disabled
                       style="display: none;"
                       v-model="form.caName"
                       clearable
                   ></el-input>
-                  <div v-if="form.caName">
-                    {{ form.caName }}
+                  <div v-if="caFileList.length>0">
+                    <!--                                        {{ form.caName }}-->
                     <el-button
                         type="primary"
                         class="common-button-primary"
                         size="mini"
                         style="margin-left: 10px"
                         @click="fileUpload('ca')">
-                      重新上传
+                      <i class="el-icon-upload el-icon--right"></i>
+                      查看已上传的文件
                     </el-button>
                   </div>
                   <div v-else>
@@ -344,56 +464,206 @@
                         class="common-button-primary"
                         size="mini"
                         @click="fileUpload('ca')">
+                      <i class="el-icon-upload el-icon--right"></i>
+                      点击上传
+                    </el-button>
+                  </div>
+                </el-form-item>
+                <el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      style="display: none;"
+                      v-model="form.zbjbdName"
+                      clearable
+                  ></el-input>
+                  <div v-if="zbjbdFileList.length>0">
+                    <!--                                        {{ form.zbjbdName }}-->
+                    <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px"
+                        @click="fileUpload('zbjbd')">
+                      <i class="el-icon-upload el-icon--right"></i>
+                      查看已上传的文件
+                    </el-button>
+                  </div>
+                  <div v-else>
+                    <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        @click="fileUpload('zbjbd')">
+                      <i class="el-icon-upload el-icon--right"></i>
                       点击上传
                     </el-button>
                   </div>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+<!--                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                          disabled-->
+<!--                          style="display: none;"-->
+<!--                          v-model="form.kwjName"-->
+<!--                          clearable-->
+<!--                  ></el-input>-->
+<!--                  <div v-if="form.kwjName">-->
+<!--                    {{ form.kwjName }}-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            style="margin-left: 10px"-->
+<!--                            @click="fileUpload('kwj')">-->
+<!--                      重新上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                  <div v-else>-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            @click="fileUpload('kwj')">-->
+<!--                      点击上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                      disabled-->
+<!--                      style="display: none;"-->
+<!--                      v-model="form.jdwjName"-->
+<!--                      clearable-->
+<!--                  ></el-input>-->
+<!--                  <div v-if="form.jdwjName">-->
+<!--                    {{ form.jdwjName }}-->
+<!--                    <el-button-->
+<!--                        type="primary"-->
+<!--                        class="common-button-primary"-->
+<!--                        size="mini"-->
+<!--                        style="margin-left: 10px"-->
+<!--                        @click="fileUpload('jdwj')">-->
+<!--                      重新上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                  <div v-else>-->
+<!--                    <el-button-->
+<!--                        type="primary"-->
+<!--                        class="common-button-primary"-->
+<!--                        size="mini"-->
+<!--                        @click="fileUpload('jdwj')">-->
+<!--                      点击上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                      disabled-->
+<!--                      style="display: none;"-->
+<!--                      v-model="form.bpgName"-->
+<!--                      clearable-->
+<!--                  ></el-input>-->
+<!--                  <div v-if="form.bpgName">-->
+<!--                    {{ form.bpgName }}-->
+<!--                    <el-button-->
+<!--                        type="primary"-->
+<!--                        class="common-button-primary"-->
+<!--                        size="mini"-->
+<!--                        style="margin-left: 10px"-->
+<!--                        @click="fileUpload('bpg')">-->
+<!--                      重新上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                  <div v-else>-->
+<!--                    <el-button-->
+<!--                        type="primary"-->
+<!--                        class="common-button-primary"-->
+<!--                        size="mini"-->
+<!--                        @click="fileUpload('bpg')">-->
+<!--                      点击上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">-->
+<!--                  <el-input-->
+<!--                          disabled-->
+<!--                          style="display: none;"-->
+<!--                          v-model="form.zqyjgName"-->
+<!--                          clearable-->
+<!--                  ></el-input>-->
+<!--                  <div v-if="form.zqyjgName">-->
+<!--                    {{ form.zqyjgName }}-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            style="margin-left: 10px"-->
+<!--                            @click="fileUpload('zqyjg')">-->
+<!--                      重新上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                  <div v-else>-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            class="common-button-primary"-->
+<!--                            size="mini"-->
+<!--                            @click="fileUpload('zqyjg')">-->
+<!--                      点击上传-->
+<!--                    </el-button>-->
+<!--                  </div>-->
+<!--                </el-form-item>-->
+
+
+
+
+                <el-form-item v-show="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
                   <el-input
-                          disabled
-                          style="display: none;"
-                          v-model="form.kwjName"
-                          clearable
+                      disabled
+                      style="display: none;"
+                      v-model="form.kwjName"
+                      clearable
                   ></el-input>
-                  <div v-if="form.kwjName">
-                    {{ form.kwjName }}
+                  <div v-if="kwjFileList.length>0">
+                    <!--                                        {{ form.kwjName }}-->
                     <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            style="margin-left: 10px"
-                            @click="fileUpload('kwj')">
-                      重新上传
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px"
+                        @click="fileUpload('kwj')">
+                      <i class="el-icon-upload el-icon--right"></i>
+                      查看已上传的文件
                     </el-button>
                   </div>
                   <div v-else>
                     <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            @click="fileUpload('kwj')">
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        @click="fileUpload('kwj')">
+                      <i class="el-icon-upload el-icon--right"></i>
                       点击上传
                     </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                <el-form-item v-show="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
                   <el-input
                       disabled
                       style="display: none;"
                       v-model="form.jdwjName"
                       clearable
                   ></el-input>
-                  <div v-if="form.jdwjName">
-                    {{ form.jdwjName }}
+                  <div v-if="jdwjFileList.length>0">
+                    <!--                                        {{ form.jdwjName }}-->
                     <el-button
                         type="primary"
                         class="common-button-primary"
                         size="mini"
                         style="margin-left: 10px"
                         @click="fileUpload('jdwj')">
-                      重新上传
+                      <i class="el-icon-upload el-icon--right"></i>
+                      查看已上传的文件
                     </el-button>
                   </div>
                   <div v-else>
@@ -402,26 +672,28 @@
                         class="common-button-primary"
                         size="mini"
                         @click="fileUpload('jdwj')">
+                      <i class="el-icon-upload el-icon--right"></i>
                       点击上传
                     </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                <el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
                   <el-input
                       disabled
                       style="display: none;"
                       v-model="form.bpgName"
                       clearable
                   ></el-input>
-                  <div v-if="form.bpgName">
-                    {{ form.bpgName }}
+                  <div v-if="bpgFileList.length>0">
+                    <!--                                        {{ form.bpgName }}-->
                     <el-button
                         type="primary"
                         class="common-button-primary"
                         size="mini"
                         style="margin-left: 10px"
                         @click="fileUpload('bpg')">
-                      重新上传
+                      <i class="el-icon-upload el-icon--right"></i>
+                      查看已上传的文件
                     </el-button>
                   </div>
                   <div v-else>
@@ -430,34 +702,37 @@
                         class="common-button-primary"
                         size="mini"
                         @click="fileUpload('bpg')">
+                      <i class="el-icon-upload el-icon--right"></i>
                       点击上传
                     </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                <el-form-item v-show="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
                   <el-input
-                          disabled
-                          style="display: none;"
-                          v-model="form.zqyjgName"
-                          clearable
+                      disabled
+                      style="display: none;"
+                      v-model="form.zqyjgName"
+                      clearable
                   ></el-input>
-                  <div v-if="form.zqyjgName">
-                    {{ form.zqyjgName }}
+                  <div v-if="zqyjgFileList.length>0">
+                    <!--                                        {{ form.zqyjgName }}-->
                     <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            style="margin-left: 10px"
-                            @click="fileUpload('zqyjg')">
-                      重新上传
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px"
+                        @click="fileUpload('zqyjg')">
+                      <i class="el-icon-upload el-icon--right"></i>
+                      查看已上传的文件
                     </el-button>
                   </div>
                   <div v-else>
                     <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            @click="fileUpload('zqyjg')">
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        @click="fileUpload('zqyjg')">
+                      <i class="el-icon-upload el-icon--right"></i>
                       点击上传
                     </el-button>
                   </div>
@@ -925,13 +1200,15 @@
       <el-upload
               multiple
               drag
+              :file-list="fileList"
               :action="fileUrl"
               ref="importfile"
               name="file"
               accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
               :before-upload="beginImportFile"
               :on-success="importFileSuccess"
-              :show-file-list="false"
+              :on-change="fileChange"
+              :show-file-list="true"
       >
         <div style="padding: 20px 0">
           <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -1071,6 +1348,17 @@ export default {
   },
   data () {
     return {
+      fileList: [],
+      caFileList: [],
+      FBGBJBDFileList: [],
+      xgdFileList: [],
+      bpgFileList: [],
+      ssgFileList: [],
+      zqyjgFileList: [],
+      jdwjFileList: [],
+      zbjbdFileList: [],
+      kwjFileList: [],
+      glwjFileList: [],
       textStatus:'',//文本状态
       textStatusMap: {}, // 文本状态id与name对应
       countryArr:'',
@@ -1577,51 +1865,196 @@ export default {
       return true
     },
     // 导入标准数据成功后执行
-    importFileSuccess (response, file) {
+    importFileSuccess (response, file,fileList) {
       if (response.ok) {
-        this.fileMadel = false
-        if(this.fileType === 'fbgbjbd'){
-          this.form.fbgbjbd = response.data.id;
-          this.form.fbgbjbdName = response.data.name;
-        }else if(this.fileType === 'xgd'){
-          this.form.xgd = response.data.id;
-          this.form.xgdName = response.data.name;
-        }else if(this.fileType === 'bpg'){
-          this.form.bpg = response.data.id;
-          this.form.bpgName = response.data.name;
-        }else if(this.fileType === 'ssg'){
-          this.form.ssg = response.data.id;
-          this.form.ssgName = response.data.name;
-        }else if(this.fileType === 'zqyjg'){
-          this.form.zqyjg = response.data.id;
-          this.form.zqyjgName = response.data.name;
-        }else if(this.fileType === 'jdwj'){
-          this.form.jdwj = response.data.id;
-          this.form.jdwjName = response.data.name;
-        }else if(this.fileType === 'kwj'){
-          this.form.kwj = response.data.id;
-          this.form.kwjName = response.data.name;
-        }else if(this.fileType === 'xgd'){
-          this.form.xgd = response.data.id;
-          this.form.xgdName = response.data.name;
-        }else if(this.fileType === 'glwj'){
-          this.form.glwj = response.data.id;
-          this.form.glwjName = response.data.name;
-        }else if(this.fileType === 'ca'){
-          this.form.ca = response.data.id;
-          this.form.caName = response.data.name;
+        // this.fileMadel = false
+        // if(this.fileType === 'fbgbjbd'){
+        //   this.form.fbgbjbd = response.data.id;
+        //   this.form.fbgbjbdName = response.data.name;
+        // }else if(this.fileType === 'xgd'){
+        //   this.form.xgd = response.data.id;
+        //   this.form.xgdName = response.data.name;
+        // }else if(this.fileType === 'bpg'){
+        //   this.form.bpg = response.data.id;
+        //   this.form.bpgName = response.data.name;
+        // }else if(this.fileType === 'ssg'){
+        //   this.form.ssg = response.data.id;
+        //   this.form.ssgName = response.data.name;
+        // }else if(this.fileType === 'zqyjg'){
+        //   this.form.zqyjg = response.data.id;
+        //   this.form.zqyjgName = response.data.name;
+        // }else if(this.fileType === 'jdwj'){
+        //   this.form.jdwj = response.data.id;
+        //   this.form.jdwjName = response.data.name;
+        // }else if(this.fileType === 'kwj'){
+        //   this.form.kwj = response.data.id;
+        //   this.form.kwjName = response.data.name;
+        // }else if(this.fileType === 'xgd'){
+        //   this.form.xgd = response.data.id;
+        //   this.form.xgdName = response.data.name;
+        // }else if(this.fileType === 'glwj'){
+        //   this.form.glwj = response.data.id;
+        //   this.form.glwjName = response.data.name;
+        // }else if(this.fileType === 'ca'){
+        //   this.form.ca = response.data.id;
+        //   this.form.caName = response.data.name;
+        // }
+
+
+
+        // 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)
+        //
+        //   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+',';
+        // }
+
+
+        switch (this.fileType){
+          case 'fbgbjbd':
+            this.FBGBJBDFileList=fileList;
+            break;
+          case 'xgd' :
+            this.xgdFileList=fileList;
+            break;
+          case 'bpg':
+            this.bpgFileList=fileList;
+            break;
+          case 'ssg':
+            this.ssgFileList=fileList;
+            break;
+          case 'zqyjg':
+            this.zqyjgFileList=fileList;
+            break;
+          case 'jdwj':
+            this.jdwjFileList=fileList;
+            break;
+          case 'kwj':
+            this.kwjFileList=fileList;
+            break;
+          case 'ca':
+            this.caFileList=fileList;
+            break;
+          default : ;
         }
+        console.log("caNmae",this.form.caName);
         this.$message({
           showClose: true,
           message: response.message,
           type: 'success'
         })
       }
+    },removeOneFile(file, fileList) {
+
+      switch (this.fileType){
+        case 'fbgbjbd':
+          this.FBGBJBDFileList=fileList;
+          break;
+        case 'xgd' :
+          this.xgdFileList=fileList;
+          break;
+        case 'bpg':
+          this.bpgFileList=fileList;
+          break;
+        case 'ssg':
+          this.ssgFileList=fileList;
+          break;
+        case 'zqyjg':
+          this.zqyjgFileList=fileList;
+          break;
+        case 'jdwj':
+          this.jdwjFileList=fileList;
+          break;
+        case 'kwj':
+          this.kwjFileList=fileList;
+          break;
+        case 'ca':
+          this.caFileList=fileList;
+          break;
+        default : ;
+      }
     },
     fileUpload (type) {
+      if (type==='ca'){
+        this.fileList=this.caFileList;
+      }else if (type==='fbgbjbd'){
+        this.fileList=this.FBGBJBDFileList;
+      }else if (type==='xgd'){
+        this.fileList=this.xgdFileList;
+      }else if(type==='bpg'){
+        this.fileList=this.bpgFileList;
+      }else if (type==='ssg'){
+        this.fileList=this.ssgFileList;
+      }else if (type==='zqyjg'){
+        this.fileList=this.zqyjgFileList;
+      }else if (type==='jdwj'){
+        this.fileList=this.jdwjFileList;
+      }else if (type==='zbjbd'){
+        this.fileList=this.zbjbdFileList;
+      }else if (type==='kwj'){
+        this.fileList=this.kwjFileList;
+      }else if (type==='glwj'){
+        this.fileList=this.glwjFileList;
+      }
       this.fileType = '';
-      this.fileMadel = true
       this.fileType = type;
+      this.fileMadel = true
+
+    },fileChange(fileList){
+      console.log("fileList",fileList);
     },
     popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
       if(checkedData) {
@@ -1711,7 +2144,69 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
-        this.$forceUpdate()
+
+        console.log("this.form",this.form);
+
+        // 遍历对象
+        for(const p in this.form) {
+          if (typeof (this.form[p]) != "function") {
+            this.initializeFileList(p,this.form[p]);
+          }
+        }
+
+          this.$forceUpdate()
+      })
+    },initializeFileList(property ,value){
+      switch (property){
+           case 'xgd':
+             this.getFileList(value,this.xgdFileList);
+             break;
+           case 'fbgbjbd':
+             this.getFileList(value,this.FBGBJBDFileList);
+             break;
+          case 'ssg':
+            this.getFileList(value,this.ssgFileList);
+            break;
+          case 'ca':
+            this.getFileList(value,this.caFileList);
+            break;
+          case 'zbjbd':
+            this.getFileList(value,this.zbjbdFileList);
+            break;
+          case 'kwj':
+            this.getFileList(value,this.kwjFileList);
+            break;
+          case 'jdwj':
+            this.getFileList(value,this.jdwjFileList);
+            break;
+          case 'bpg':
+            this.getFileList(value,this.bpgFileList);
+            break;
+          case 'zqyjg':
+            this.getFileList(value,this.zqyjgFileList);
+            break;
+          default: ;
+      }
+    },getFileList(fileIds,defaultFileList){
+      let fileList
+      this.$http.get('att/attFile/getMultiFileInfos', {
+        fileIds: fileIds
+      }, {
+        _this: this
+      }, res => {
+        fileList = res.data
+        if (fileList != null && fileList.length > 0) {
+          for (let i = 0; i < fileList.length; i++) {
+            let obj = {name: '', response: {}}
+            obj.name = fileList[i].oldFileName
+            obj.response.data = fileList[i]
+
+
+            //根据以‘，’分割的id查询到的文件信息，放入对应的文件list中
+            defaultFileList.push(obj)
+          }
+        }
+      }, e => {
       })
     },
     closeDrawer() {
@@ -1753,6 +2248,68 @@ export default {
         this.saveLoading = false
       })
     },
+    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)
+
+        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+',';
+      }
+    },
     handleSubmit() {
       this.form.country=this.countryArr;
       this.$refs['form'].validate((valid) => {

From a686c7f0d69e111a4f2392bae599a414708040bf Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 13 Oct 2021 18:42:24 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B/?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BC=96=E8=BE=91=20=E6=A0=91=E5=BD=A2?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=20=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step4.vue         | 149 +++++++++++++-----
 .../domesticStandardsAndRegulations/index.vue |   5 +-
 .../foreignStandardsAndRegulations/index.vue  |  17 +-
 3 files changed, 123 insertions(+), 48 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index f655b1e19..bac4125da 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -137,7 +137,7 @@
                           width = "800"
                           :data="standSystemOptions"
                           :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                          :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+                          :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                   <el-input
@@ -791,7 +791,7 @@
                           :url="url"
                           :urlChild="urlChild"
                           :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"  @popoverHideCancel="popoverHideBusVsCancel" ></tree-select-new>
                 </el-form-item>
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
                   <el-input v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
@@ -805,7 +805,7 @@
                           :url="url"
                           :urlChild="urlChild"
                           :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
+                          :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
                 </el-form-item>
                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
                   <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
@@ -819,7 +819,7 @@
                           :url="url"
                           :urlChild="urlChild"
                           :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                          :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
+                          :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel" ></tree-select-new>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
@@ -2056,52 +2056,117 @@ export default {
     },fileChange(fileList){
       console.log("fileList",fileList);
     },
-    popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
-      if(checkedData) {
-        if(checkedData.length > 0){
-          this.form.standSystem = checkedData.map(item => item.menuName).join(",")
-        }else {
-          this.form.standSystem = checkedData.menuName
-        }
+    // popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    //   if(checkedData) {
+    //     if(checkedData.length > 0){
+    //       this.form.standSystem = checkedData.map(item => item.menuName).join(",")
+    //     }else {
+    //       this.form.standSystem = checkedData.menuName
+    //     }
+    //   }
+    //   this.modalShowFlag1 = false
+    // },popoverHideCancel(){
+    //
+    // },
+    // popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    //   if(checkedData) {
+    //     if(checkedData.length > 0){
+    //       this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+    //       this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+    //     }else {
+    //       this.form.cycvppsbm = checkedData.code
+    //       this.form.cycvppscn = checkedData.chineseName
+    //     }
+    //   }
+    //   this.modalShowFlag2 = false
+    // },
+    // popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    //   if(checkedData) {
+    //     if(checkedData.length > 0){
+    //       this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
+    //       this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
+    //     }else {
+    //       this.form.kccvppsbm = checkedData.code
+    //       this.form.kccvppscn = checkedData.chineseName
+    //     }
+    //   }
+    //   this.modalShowFlag3 = false
+    // },
+    // popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    //   if(checkedData) {
+    //     if(checkedData.length > 0){
+    //       this.form.dybxh = checkedData.map(item => item.model).join(",")
+    //       this.form.dymc = checkedData.map(item => item.name).join(",")
+    //     }else {
+    //       this.form.dybxh = checkedData.model
+    //       this.form.dymc = checkedData.name
+    //     }
+    //   }
+    //   this.modalShowFlag4 = false
+    // },
+
+  popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    if(checkedData) {
+      if(checkedData.length > 0 && checkedData.length != 0){
+        this.form.standSystem = checkedData.map(item => item.menuName).join(",")
+      }else {
+        this.form.standSystem = checkedData.menuName
       }
       this.modalShowFlag1 = false
-    },
-    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-      if(checkedData) {
-        if(checkedData.length > 0){
-          this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
-          this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
-        }else {
-          this.form.cycvppsbm = checkedData.code
-          this.form.cycvppscn = checkedData.chineseName
-        }
+    }
+
+  },
+  popoverHideCancel(){
+    this.modalShowFlag1  = false
+  },
+  popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    if(checkedData && checkedData.length != 0) {
+      if(checkedData.length > 0 && checkedData.length != 0){
+        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+      }else {
+        this.form.cycvppsbm = checkedData.code
+        this.form.cycvppscn = checkedData.chineseName
       }
       this.modalShowFlag2 = false
-    },
-    popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-      if(checkedData) {
-        if(checkedData.length > 0){
-          this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
-          this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
-        }else {
-          this.form.kccvppsbm = checkedData.code
-          this.form.kccvppscn = checkedData.chineseName
-        }
+    }
+
+  },
+  popoverHideBusVsCancel(){
+    this.modalShowFlag2 = false
+  },
+  popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    if(checkedData && checkedData.length != 0) {
+      if(checkedData.length > 0){
+        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
+        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
+      }else {
+        this.form.kccvppsbm = checkedData.code
+        this.form.kccvppscn = checkedData.chineseName
       }
       this.modalShowFlag3 = false
-    },
-    popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-      if(checkedData) {
-        if(checkedData.length > 0){
-          this.form.dybxh = checkedData.map(item => item.model).join(",")
-          this.form.dymc = checkedData.map(item => item.name).join(",")
-        }else {
-          this.form.dybxh = checkedData.model
-          this.form.dymc = checkedData.name
-        }
+
+    }
+  },
+  popoverHideCarVsCancel(){
+    this.modalShowFlag3 = false
+  },
+  popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    if(checkedData && checkedData.length != 0) {
+      if(checkedData.length > 0){
+        this.form.dybxh = checkedData.map(item => item.model).join(",")
+        this.form.dymc = checkedData.map(item => item.name).join(",")
+      }else {
+        this.form.dybxh = checkedData.model
+        this.form.dymc = checkedData.name
       }
       this.modalShowFlag4 = false
-    },
+    }
+
+  },
+  popoverHideModelCancel(){
+    this.modalShowFlag4 = false
+  },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 692c4f843..4445e07b3 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1072,7 +1072,7 @@
         width="500"
         :data="standSystemOptions"
         :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-        :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+        :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
       <tree-select-new
         width="500"
         :lazy=true
@@ -2406,6 +2406,9 @@ export default {
       this.modalShowFlag1 = false
       this.$forceUpdate()
     },
+    popoverHideCancel(){
+      this.modalShowFlag1  = false
+    },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 0ed618eaf..ffce99992 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -882,7 +882,8 @@
                       class="add-form-item"
                     >
                       <template slot="label">关联模块--乘用车VPPS编码</template>
-                      <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
+                      <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码"
+                                @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'KCCVPPSBM'">
@@ -1422,7 +1423,7 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-        :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+        :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
       <tree-select-new
         width="500"
         :lazy=true
@@ -1433,7 +1434,7 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-        :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
+        :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"  @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
       <tree-select-new
         width="500"
         :lazy=true
@@ -1444,7 +1445,7 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-        :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
+        :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
       <!-- 导入失败 -->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -2220,7 +2221,6 @@ export default {
       this.urlChild = "sarModelTree/childByList"
     },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      debugger
       if (checkedData) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",")
@@ -2233,6 +2233,9 @@ export default {
       this.modalShowFlag2 = false
       this.$forceUpdate()
     },
+    popoverHideBusVsCancel(){
+      this.modalShowFlag2 = false
+    },
     popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData) {
         if (checkedData.length > 0) {
@@ -2245,6 +2248,8 @@ export default {
       }
       this.modalShowFlag3 = false
       this.$forceUpdate()
+    },popoverHideCarVsCancel(){
+      this.modalShowFlag3 = false
     },
     popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData) {
@@ -2258,6 +2263,8 @@ export default {
       }
       this.modalShowFlag4 = false
       this.$forceUpdate()
+    },popoverHideModelCancel(){
+      this.modalShowFlag4 = false
     },
     // 将文本状态的id与name对应
     setMap(data) {

From 23837b645e0926876dc5f62a114f95ce06c3f4e9 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, 13 Oct 2021 21:47:58 +0800
Subject: [PATCH 3/5] commit

---
 src/pages/processCenter/pages/creatProcess/xmpg/step6.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 46b9a6e41..faf53a340 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -593,12 +593,11 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
-        this.dataList = item.step3DTOS
+        this.dataList = item.dataList
         this.listForm.id = item.step3DTOS[0].id
         this.listForm.standName = item.step3DTOS[0].standName
         this.listForm.standNumber = item.step3DTOS[0].standNumber

From 68e398064562d9d2f32190e35c2b65976b23ad07 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Thu, 14 Oct 2021 10:33:03 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=20=20=E6=B3=A8=E6=8E=89?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index b35cd2736..cb073b0ba 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -386,7 +386,6 @@
       show-transfer
       show-affirm
       show-confirm
-      :show-submit="submitShow"
       :show-confirm="acceptShow"
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"

From a5b6748732235631ce2f02009c844a6ea3280b5f Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 14 Oct 2021 14:22:22 +0800
Subject: [PATCH 5/5] commit

---
 src/assets/images/shangqi/img/logo5.png | Bin 0 -> 33752 bytes
 src/components/navMenu/index.vue        |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/images/shangqi/img/logo5.png

diff --git a/src/assets/images/shangqi/img/logo5.png b/src/assets/images/shangqi/img/logo5.png
new file mode 100644
index 0000000000000000000000000000000000000000..4db0cdf9a9954cf80b6968daa51afd33be02d39e
GIT binary patch
literal 33752
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
L`)ZN0_5J?`INw1;

literal 0
HcmV?d00001

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 6d99f893f..8bf0d2e3c 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -463,7 +463,7 @@
     },
     computed: {
       logo () {
-        return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png')
+        return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png')
       },
       ...mapGetters(['getDynamicTotal', 'isCollapse'])
     },
@@ -509,7 +509,7 @@
         text-align: left;
         img {
           width: 115px;
-          height: 45px;
+          height: 40px;
         }
       }
     }