行政区划

src/views/components/dialog/index.vue

@@ -58,7 +58,7 @@
                   </el-option>
                 </el-select>
               </div> -->
-              <div class="select-input">
+              <!-- <div class="select-input">
                 <div class="select-span">企业规模:</div>
                 <el-select v-model="form.ecoTypeLarge" placeholder="请选择">
                   <el-option
@@ -69,10 +69,10 @@
                   >
                   </el-option>
                 </el-select>
-              </div>
+              </div> -->
               <div class="select-input">
-                <div class="select-span">行业类型:</div>
-                <el-select v-model="form.indusTypeClass" placeholder="请选择">
+                <div class="select-span">行业监管大类:</div>
+                <el-select v-model="form.supervisionLarge" placeholder="请选择">
                   <el-option
                     v-for="item in dict.type.category"
                     :key="item.value"
@@ -98,7 +98,7 @@
               <!-- <div class="bottom"> -->
               <div class="input-input">
                 <el-input
-                  v-model="form.uscCode"
+                  v-model="form.uuitNo"
                   placeholder="请输入统一信用代码"
                 ></el-input>
               </div>
@@ -128,57 +128,47 @@
                 >
                 </el-table-column>
                 <el-table-column
-                  prop="entprName"
+                  prop="enterpriseName"
                   label="企业名称"
                   show-overflow-tooltip
                   header-align="center"
                 >
                 </el-table-column>
                 <el-table-column
-                  prop="subdistrict"
+                  prop="majorHazardLevel"
                   label="行政区划"
-                  show-overflow-tooltip
-                  width="150"
-                  header-align="center"
-                >
-                  <template slot-scope="scope">
-                    <span>{{ componendDistrict(scope.row.subdistrict) }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="indusTypeClass"
-                  label="行业类型"
-                  show-overflow-tooltip
+                  width="180"
                   header-align="center"
                 >
                   <template slot-scope="scope">
-                    <dict-tag
-                      :options="dict.type.category"
-                      :value="scope.row.indusTypeClass"
-                    >
-                    </dict-tag>
+                    <span>{{
+                      componendDistrict(scope.row.subdistrict) || "/"
+                    }}</span>
                   </template>
                 </el-table-column>
+                <!-- <el-table-column
+          prop="enterpristScale"
+          label="企业规模"
+          width="180"
+          header-align="center"
+        >
+        </el-table-column> -->
                 <el-table-column
-                  prop="ecoTypeLarge"
-                  label="企业规模"
-                  show-overflow-tooltip
+                  prop="supervisionLarge"
+                  label="行业监管大类"
+                  width="180"
                   header-align="center"
                 >
                   <template slot-scope="scope">
-                    <dict-tag
-                      :options="dict.type.economic_categories"
-                      :value="scope.row.ecoTypeLarge"
-                    >
-                    </dict-tag>
+                    <div>
+                      {{ scope.row.supervisionLarge | supervisionLarge }}
+                    </div>
                   </template>
                 </el-table-column>
 
                 <el-table-column
-                  prop="uscCode"
+                  prop="uuitNo"
                   label="统一社会信用代码"
-                  show-overflow-tooltip
-                  width="150"
                   header-align="center"
                 >
                 </el-table-column>
@@ -300,6 +290,8 @@ import myPagination from "@/views/components/myPagination/index.vue";
 import firmDialog from "@/views/components/firmDialog/index.vue";
 import { Loading } from "element-ui";
 import { mapState } from "vuex";
+import dictzh from "@/utils/dictzh.js";
+
 export default {
   dicts: [
     "category",
@@ -311,6 +303,7 @@ export default {
   components: { myPagination, firmDialog },
   data() {
     return {
+      dictzh: dictzh,
       dialogVisible: false,
       tableData: [],
       listOne: [],
@@ -396,6 +389,17 @@ export default {
   //     deep:true,
   //   }
   // },
+  filters: {
+    supervisionLarge: function (value) {
+      // console.log(value.split(","));
+      let array = value.split(",");
+      array.map((item, ind) => {
+        array[ind] = dictzh[item];
+      });
+      // console.log(array.join(","));
+      return array.join(",");
+    },
+  },
   methods: {
     // 返回上一步
     selectFirm() {
@@ -508,7 +512,7 @@ export default {
     },
     // 重置
     reset() {
-      (this.form = {
+      this.form = {
         subdistrict: this.workingArea,
         frimType: "",
         indusTypeClass: "",
@@ -516,8 +520,8 @@ export default {
         majorHazardLevel: "",
         entprColor: "",
         uscCode: "",
-      }),
-        (this.pages.pageNum = 1);
+      };
+      this.pages.pageNum = 1;
       this.pages.pageSize = 10;
       this.$refs.mypagination.defaultPages();
       // let obj = {...this.pages,...this.form}
@@ -529,7 +533,7 @@ export default {
       this.getTable({
         ...this.pages,
         ...this.form,
-        subdistrict: this.subdistrict,
+        SUBDISTRICT: this.subdistrict,
       });
     },
     // 当前行的checkBox是否可以勾选
@@ -583,12 +587,10 @@ export default {
         if (dept.ancestors.split(",").length == 3) {
           this.gettownNumbers();
         }
-        // this.getTable(this.pages);
       } else {
         this.amendId = item.id;
         this.isamend = true;
         this.getList(item);
-        // this.getTable(this.pages);
       }
     },
     // 关闭
@@ -635,6 +637,7 @@ export default {
     },
     // 查看/切换页码时的网络请求
     async getTable(pages) {
+      console.log(pages, "pages");
       this.loading = true;
       let data = await this.$api.yingji.basicList(pages);
       // console.log(data.data.count, '重点企业总数');
@@ -645,12 +648,13 @@ export default {
       //   : this.unselected == 0
       //   ? (this.unCount = 0)
       //   : (this.unCount = data.data.count - this.unselected);
-      this.total = data.data.total;
+      console.log(data);
+      this.total = data.total;
       // console.log(this.unselected,'this.unselected')
       if (data.code == 200) {
         this.loading = false;
       }
-      this.tableData = data.data.list;
+      this.tableData = data.rows;
       // console.log(isAncestors,'isAncestors')
       if (this.dept.ancestors.split(",").length == 3) {
         this.tableData.forEach((item) => {

src/views/components/dialogInfo/index.vue

@@ -352,25 +352,25 @@ export default {
           value: "",
         },
       ],
-      dialogVisible:false,
-    }
+      dialogVisible: false,
+    };
   },
-  methods:{
+  methods: {
     open(item) {
-      console.log(item)
+      console.log(item);
       this.dialogVisible = true;
     },
     Close() {
       this.dialogVisible = false;
     },
-    getList(){
+    getList() {
       businessList(this.searchBefore).then((res) => {
-        this.tableData = res.data.list;
-        this.total = res.data.total;
+        this.tableData = res.rows;
+        this.total = res.total;
       });
-    }
+    },
   },
-}
+};
 </script>
 <style lang="scss" scoped>
 .dialog-slot {

src/views/yingji/enterprise.vue

@@ -368,7 +368,7 @@ export default {
       this.infoData = e;
     },
     quhua(e) {
-      this.form.SUBDISTRICT = e;
+      this.form.subdistrict = e;
     },
     searchList() {
       this.searchBefore = {
@@ -381,7 +381,7 @@ export default {
     },
     chongzhiList() {
       this.form = {
-        SUBDISTRICT: "",
+        subdistrict: "",
         frimType: "",
         supervisionLarge: "",
         // isPoint: "",