Merge remote-tracking branch 'origin/develop' into develop

src/pages/personal/pages/my-questions/components/questionItemInfo.vue

@@ -48,6 +48,7 @@ export default {
       const attId = this.answer.appendixId
       this.$preview(attId)
     },
+    answerChang(){}
   },
   watch:{
     answer: {

src/pages/personal/pages/my-questions/components/questions-item.vue

@@ -11,7 +11,7 @@
     </div>
     <div class="row">
       <div class="item">
-        <div>{{userName}}
+        <div>{{question.questioner}}
           <span>{{question.questionTime}}</span>
         </div>
       </div>
@@ -36,6 +36,7 @@ export default {
       immediate: true,
       deep: true,
       handler(val){
+        console.log(val);
       }
     }
   }

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -2119,6 +2119,17 @@ export default {
         this.getFormFieldList(mes.form)
       })
     },
+    assemble(ids,names){
+      let list= new Array();
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     /**
      * @description: 动态表单读取
      */
@@ -2135,12 +2146,15 @@ export default {
         }
         this.form.standType = this.form.standInData === "0" ? 'INLAND' : 'FOREIGN'
         this.form.standYear = this.form.standYear ? this.form.standYear : ''
-        if (this.form.country) {
+        if (this.form.country && this.form.country.indexOf(",") !== -1) {
           this.form.country = this.form.country.split(",");
         }
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+
+
+        // zbjbdFileList: {},
         console.log(this.form);
 
         // 遍历对象初始化文件信息

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -2381,8 +2381,10 @@ export default {
           case 'ca':
             this.caFileList = fileList;
             break;
+          case 'glwj':
+            this.glwjFileList = fileList
+            break;
           default :
-            ;
         }
         // console.log("caNmae",this.form.caName);
         this.$message({

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -3647,6 +3647,7 @@ export default {
               this.$set(this.sarBussionessStandEO, key, item.attrInfoMap[key])
             }
           })
+          this.filterData(this.sarBussionessStandEO["QCDW"]);
           this.sarBussionessStandEO['id'] = item.id
           if (state === 'show') {
             this.formdisableflag = true
@@ -5167,13 +5168,7 @@ export default {
   },
   watch: {
     'sarBussionessStandEO.QCDW'(val) {
-      let arr = val.split(',')
-      arr.forEach((item, index) => {
-        if (item === undefined || item === 'undefined' || item === '') {
-          arr.splice(index, 1)
-        }
-      })
-      return arr.toString()
+      this.filterData(val);
     },
     filterText(val) {
       this.$refs.tree.filter(val);

src/pages/regulatoryRepository/standQA/components/questions-item.vue

@@ -14,7 +14,7 @@
     </div>
     <div class="row">
       <div class="item">
-        <div>{{userName}}
+        <div>{{answer.answerer}}
           <span>{{question.questionTime}}</span>
         </div>
       </div>