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

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -458,8 +458,22 @@ export default {
         _this: this
       }, res => {
         this.myLoading.loadData = false
-        this.nonList = res.data.records
         this.total = res.data.total
+        this.nonList = res.data.records
+        this.nonList.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(",");
+              }
+            }
+          }
+        });
       }, e => {
         this.myLoading.loadData = false
       })
@@ -665,18 +679,15 @@ export default {
     },
   },
   mounted () {
+
     // 从数据库中查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
-      this.allSelectOptions = res.data || {}
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.getGzzOption()
-      this.setMap(this.standStateOptions)
+      this.getTableByPage()
     }, e => {
     })
-    this.getTableByPage()
     // 加载所有的部门
     this.getOrgTreeSource()
   }