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

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

@@ -345,10 +345,21 @@ export default {
     addList() {
       dicTypeData().then(res => {
         this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      })
         standUnqualified(this.queryUnqualidiedData).then(res => {
           this.unqualidiedData = res.data.records
           this.unqualidiedData.forEach(item => {
+            // 责任部门转换
+            if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
+              let k = (item.responsibleUnit || "").split(',')
+              for (let i in this.zrbmOptions) {
+                for (let m = 0; m< k.length; m++) {
+                  if (this.zrbmOptions[i].value === k[m]) {
+                    k[m]  = this.zrbmOptions[i].label
+                  }
+                  item.responsibleUnit = k.join(',')
+                }
+              }
+            }
             this.$set(item,'engineer','')
             this.$set(item,'engineerId','')
             this.$set(item,'dutyPeopleInfo','')
@@ -361,6 +372,7 @@ export default {
           })
           this.total = res.data.total
         })
+      })
       this.standModel = true;
     },
     // 批量删除按钮table，选择数据