Merge branch 'dhy' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/suzhouyingjiPC

src/views/yingji/enterprise.vue

@@ -75,7 +75,7 @@
             </el-select>
           </div>
 
-          <div class="input-input" style="margin-left: 10px;">
+          <div class="input-input" style="margin-left: 10px">
             <div class="select-span">统一社会信用代码:</div>
             <el-input
               v-model="form.uscCode"
@@ -129,7 +129,7 @@
           <template slot-scope="scope">
             <div>
               {{
-                filterTable(
+                filterTable1(
                   dict.type.major_hazard_level,
                   scope.row.majorHazardLevel
                 )
@@ -147,8 +147,8 @@
             <div>
               {{
                 scope.row.indusTypeClass != "null"
-                  ? filterTable(dict.type.category, scope.row.indusTypeClass)
-                  : ""
+                  ? filterTable1(dict.type.category, scope.row.indusTypeClass)
+                  : "/"
               }}
             </div>
           </template>
@@ -260,7 +260,7 @@ export default {
       },
       xzList: [],
       load1: true,
-      total: 0, 
+      total: 0,
       main: {
         height: "",
       },
@@ -616,9 +616,22 @@ export default {
     quhuadizhi(district) {
       this.option = district;
     },
-    filterTable(a, b) {
-      if (!b) return;
-      return this.selectDictLabel(a, b);
+    filterTable1(datas, value) {
+      if (!value) {
+        return "/";
+      }
+      var actions = [];
+      datas.forEach((value1, index1) => {
+        actions.push(value1.raw);
+      });
+      let newarr = actions.filter((value2) => {
+        return value2.dictValue == value;
+      });
+      if (newarr.length > 0) {
+        return newarr[0].dictLabel;
+      } else {
+        return "/";
+      }
     },
     shutDownDetail() {
       this.addShow = false;
@@ -638,28 +651,28 @@ export default {
       this.listDes.forEach((value1, index1) => {
         //重大危险源等级
         if (value1.eng == "majorHazardLevel") {
-          this.listDes[index1].value = this.filterTable(
+          this.listDes[index1].value = this.filterTable1(
             this.dict.type.major_hazard_level,
             value1.value
           );
         }
         //经济类型大类
         if (value1.eng == "ecoTypeLarge") {
-          this.listDes[index1].value = this.filterTable(
+          this.listDes[index1].value = this.filterTable1(
             this.dict.type.economic_categories,
             value1.value
           );
         }
         //经济类型小类
         if (value1.eng == "ecoTypeSmall") {
-          this.listDes[index1].value = this.filterTable(
+          this.listDes[index1].value = this.filterTable1(
             this.dict.type.economic_subcategory,
             value1.value
           );
         }
         //专项治理类别
         if (value1.eng == "specialGovernance") {
-          this.listDes[index1].value = this.filterTable(
+          this.listDes[index1].value = this.filterTable1(
             this.dict.type.special_governance,
             value1.value
           );
@@ -667,21 +680,21 @@ export default {
         //隶属关系
         //企业经营状态
         if (value1.eng == "operatingStatus") {
-          this.listDes[index1].value = this.filterTable(
+          this.listDes[index1].value = this.filterTable1(
             this.dict.type.enterprise_status,
             value1.value
           );
         }
         //标准化等级
         if (value1.eng == "standLevel") {
-          this.listDes[index1].value = this.filterTable(
+          this.listDes[index1].value = this.filterTable1(
             this.dict.type.standardization_level,
             value1.value
           );
         }
         //安全监管等级
         if (value1.eng == "safetySupervisionLevel") {
-          this.listDes[index1].value = this.filterTable(
+          this.listDes[index1].value = this.filterTable1(
             this.dict.type.safety_level,
             value1.value
           );
@@ -691,21 +704,21 @@ export default {
         // 检查方式
         // 企业分色
         if (value1.eng == "entprColor") {
-          this.listDes[index1].value = this.filterTable(
+          this.listDes[index1].value = this.filterTable1(
             this.dict.type.entpr_color,
             value1.value
           );
         }
         // 行业类型
         if (value1.eng == "indusTypeClass") {
-          this.listDes[index1].value = this.filterTable(
+          this.listDes[index1].value = this.filterTable1(
             this.dict.type.category,
             value1.value
           );
         }
         //是否重点
         if (value1.eng == "isPoint") {
-          this.listDes[index1].value = this.filterTable(
+          this.listDes[index1].value = this.filterTable1(
             this.dict.type.is_point,
             value1.value
           );