From 281d4858c80fa3a8faefd2c4754e0bf7534e3491 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Tue, 29 Mar 2022 15:00:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052187=20=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85=EF=BC=8C=E6=B5=B7=E5=A4=96=E5=BA=93=EF=BC=8C=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E5=BA=93=20=E5=8F=91=E5=B8=83=E7=A8=BF=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=99=84=E4=BB=B6=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherBussStandardDetails/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 4a88f9d6e..cdc08821f 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -354,9 +354,10 @@
                     <p class=""><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
                     <template v-for="(child, childIndex) in item.child1">
                       <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
-                        <label style="float: left;">{{ child.attrName }}</label>
-                        <div style="margin-left: 220px;">
-                          <div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="line-height: 50px;">
+                        <label style="float: left;min-height: 43px;line-height: 43px;">{{ child.attrName }}</label>
+                        <template style="margin-left: 220px;">
+                          <div style="position: relative;margin-left: 214px;">
+                            <div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex">
                             <!--                          单个文件-->
                             <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
                             <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis50 }}</a>
@@ -409,7 +410,8 @@
                             <!--                          <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
                             <!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>-->
                           </div>
-                        </div>
+                          </div>
+                        </template>
                         <template v-if="child.value === null" >-</template>
                       </div>
                     </template>

From f7ce5e4dcacf0bfda68539547857e832e0d4c5ff Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 29 Mar 2022 15:02:42 +0800
Subject: [PATCH 2/3] feat: There is no way the, bug #52159

---
 .../pages/creatProcess/qbrk-product/step1.vue | 37 ++++++++++++++++---
 .../creatProcess/qbrk-product/step10.vue      | 14 +++++++
 .../creatProcess/qbrk-product/step11.vue      | 14 +++++++
 .../creatProcess/qbrk-product/step12.vue      | 14 +++++++
 .../creatProcess/qbrk-product/step13.vue      | 16 ++++++++
 .../pages/creatProcess/qbrk-product/step2.vue | 17 ++++++++-
 .../pages/creatProcess/qbrk-product/step3.vue | 16 ++++++++
 .../pages/creatProcess/qbrk-product/step4.vue | 14 +++++++
 .../pages/creatProcess/qbrk-product/step5.vue | 18 ++++++++-
 .../pages/creatProcess/qbrk-product/step6.vue | 17 +++++++++
 .../pages/creatProcess/qbrk-product/step7.vue | 14 +++++++
 .../pages/creatProcess/qbrk-product/step8.vue | 13 +++++++
 .../pages/creatProcess/qbrk-product/step9.vue | 14 +++++++
 .../creatProcess/qbrk-product/stepC3.vue      | 17 +++++++++
 .../creatProcess/qbrk-product/stepC6.vue      | 18 +++++++++
 .../creatProcess/qbrk-product/stepDetail.vue  | 13 +++++++
 .../pages/creatProcess/qbrk/step1.vue         |  4 +-
 17 files changed, 260 insertions(+), 10 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index 7e90aa132..e62245482 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -372,6 +372,10 @@
                                 <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.DTQBBHBUSS"
+                                            type="textarea"
+                                            resize="none"
+                                            :autosize="true"
+                                            :title="form.DTQBBHBUSS"
                                             placeholder="请输入代替标准号"
                                             clearable
                                     ></el-input>
@@ -411,6 +415,10 @@
                                 <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS" class="add-form-item form-item-disabled">
                                   <el-input
                                       v-model="form.BDTQBBHBUSS"
+                                      type="textarea"
+                                      resize="none"
+                                      :autosize="true"
+                                      :title="form.BDTQBBHBUSS"
                                       placeholder="请输入被代替企标编号"
                                       clearable
                                   ></el-input>
@@ -1896,16 +1904,23 @@
                   }).then(res => {
                       this.verifySarStandard = this.$route.query.verifySarStandard
                       let mes = JSON.parse(res.mes)
+                      console.log(mes)
                       mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                       this.form = mes.form
-                      this.roleForm = mes.roleForm
-                      this.commentText = mes.commentText
+                      this.form['id'] = mes.form.id
+                      this.standardCheckedList = []
+                      this.standardCheckedList.push({id:mes.form.id})
+                      this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                      this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                      this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                       this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                       this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                       this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                       this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                       this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                       this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
+                      this.roleForm = mes.roleForm
+                      this.formTongGuo.commentText = mes.commentText
                   })
               }else {
                   this.form.XCSJBUSS = this.dateFormatter()
@@ -1980,6 +1995,16 @@
                     XCSJBUSS: '',
                 } // 标准信息
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             handleProcessStandardNext(status) {
                 switch (status) {
                     // 新增
@@ -2017,11 +2042,11 @@
                               this.form.WJSCRYBUSS= this.$store.getters.userInfo.userId
                               this.form.WJSCRYBUSSName= this.$store.getters.userInfo.userName
                               this.form['id'] = bringData.id
+                              this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                              this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                              this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                               this.standardDrawer = false
                               this.verifySarStandard = true
-                              this.busVsFunc()
-                              this.modelFunc()
-                              this.$forceUpdate()
                               this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                               this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                               this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
@@ -2036,7 +2061,7 @@
                               this.FBGBUSSFileList= []
                               this.FBGBUSS = ""
                               this.FBGBUSSName = ""
-                                console.log(this.form)
+                              this.$forceUpdate()
                             }
                             // 遍历对象初始化文件信息
                             for(const p in this.form) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
index c2dad4274..89424c813 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
@@ -2297,8 +2297,22 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
index 55c112319..6092cbc2c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
@@ -2297,8 +2297,22 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
index 57892b124..00a33ceff 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
@@ -2297,8 +2297,22 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index 3ced4bb12..edc1b2378 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -1370,6 +1370,9 @@
             getTaskId (mesg) {
                 this.form = mesg.form
                 this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
                 this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
                 this.getStandInfoByReviseStatus()
@@ -1384,6 +1387,16 @@
                 this.formTongGuo.commentText = mesg.commentText
                 this.formKey++
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             // 将文本状态的id与name对应
             setMap(data){
                 data.forEach(item => {
@@ -2513,6 +2526,9 @@
                     this.form.prcName = this.prcName
                     this.form.issueTime = this.dateFormatter()
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                     this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
                     this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
                     this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
index 55a108e37..140dfe15c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
@@ -1250,6 +1250,16 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             getTaskId () {
                 if(this.$route.query.bpnId){
                     queryTaskFirst({
@@ -1259,6 +1269,9 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
@@ -2357,6 +2370,9 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
             assemble(ids,names){
@@ -2380,7 +2396,6 @@
                             if (res) {
                                 this.taskInfo = '企标编写流程'
                                 const processForm = JSON.parse(res.mesg)
-                                console.log(processForm)
                                 const dateArr = []
                                 if(processForm.commentCycleStart && processForm.commentCycleEnd){
                                     dateArr[0] = processForm.commentCycleStart
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index 5071cb0a1..22a866061 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -1429,6 +1429,9 @@
             },
             getTaskId (mesg) {
                 this.form = mesg.form
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
                 this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                 this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
@@ -2566,6 +2569,9 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                     const dateArr = []
                     if(item.commentCycleStart && item.commentCycleEnd){
                         dateArr[0] = item.commentCycleStart
@@ -2583,6 +2589,16 @@
                     this.formKey++
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
index eb76b7f79..6ed333797 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
@@ -2296,8 +2296,22 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
index d95cf6c82..bd2884344 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
@@ -1666,7 +1666,10 @@
                 return data.name.indexOf(value) !== -1;
             },
             getTaskId (mesg) {
-                this.form = mes.form
+                this.form = mesg.form
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
                 this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                 this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
@@ -2713,6 +2716,9 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                     const dateArr = []
                     if(item.commentCycleStart && item.commentCycleEnd){
                         dateArr[0] = item.commentCycleStart
@@ -2729,6 +2735,16 @@
                     this.XGDFileList=this.assemble(item.XGD,item.XGDName);
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index 7a533d76a..1a9db3a6f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -1521,6 +1521,9 @@
             },
             getTaskId (mesg) {
                 this.form = mesg.form
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
                 this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                 this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
@@ -1533,6 +1536,16 @@
                 this.formTongGuo.commentText = mesg.commentText
                 this.formKey++
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             // 将文本状态的id与name对应
             setMap(data){
                 data.forEach(item => {
@@ -2657,6 +2670,10 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                     const dateArr = []
                     if(item.commentCycleStart && item.commentCycleEnd){
                         dateArr[0] = item.commentCycleStart
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
index 33fe91876..b04de202a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
@@ -2400,6 +2400,10 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
             assemble(ids,names){
@@ -2464,6 +2468,16 @@
                     })
                 }
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             processTable () {
                 this.$nextTick(() => {
                     Promise.all([this.getTaskId()]).then((value) => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
index c82f9be88..1d7d720aa 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
@@ -2297,8 +2297,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
index 8e6550331..990e44d99 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
@@ -2297,8 +2297,22 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index d6cf43e91..de25e97a3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -1430,6 +1430,9 @@
             },
             getTaskId (mesg) {
                 this.form = mesg.form
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
                 this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                 this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
@@ -2567,6 +2570,10 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                     const dateArr = []
                     if(item.commentCycleStart && item.commentCycleEnd){
                         dateArr[0] = item.commentCycleStart
@@ -2584,6 +2591,16 @@
                     this.formKey++
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index acc81f1fd..1d8eb8042 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -1530,6 +1530,10 @@
             },
             getTaskId (mesg) {
                 this.form = mesg.form
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
                 this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                 this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
@@ -1542,6 +1546,16 @@
                 this.formTongGuo.commentText = mesg.commentText
                 this.formKey++
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             // 将文本状态的id与name对应
             setMap(data){
                 data.forEach(item => {
@@ -2665,6 +2679,10 @@
                     this.form = JSON.parse(JSON.stringify(item))
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                     this.form['id'] = item.id
                     const dateArr = []
                     if(item.commentCycleStart && item.commentCycleEnd){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue
index 4ddfe6eaf..a91d8d5ed 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue
@@ -2228,8 +2228,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index c9dde49d5..bce6c5234 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -1862,13 +1862,13 @@
                       let mes = JSON.parse(res.mes)
                       mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                       this.form = mes.form
-                      this.roleForm = mes.roleForm
-                      this.commentText = mes.commentText
                       this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                       this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                       this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                       this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                       this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                      this.roleForm = mes.roleForm
+                      this.formTongGuo.commentText = mes.commentText
                   })
               }else {
                   this.form.XCSJBUSS = this.dateFormatter()

From aa6ac1e742ee3154a4a490d05a80e72b706c1e98 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Tue, 29 Mar 2022 15:06:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052230=20=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=88=A0=E9=99=A4=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/roleManage/index.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index ba5a71b0c..d26d3ab7a 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -535,6 +535,11 @@ export default {
               message: '删除成功!'
             });
             this.getTree()
+          } else if(!res.ok) {
+            this.$message({
+              type: 'warning',
+              message: res.message
+            });
           }
         })
       }).catch(() => {