Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

zhengpz

2021-08-30 9a1a448d6bc80cb085e64f7117b2dfd53eceb779

 src/views/securityUnitOperation/economicTable.vue

@@ -33,7 +33,7 @@
        currentPage: 1,
        total: 0
      },
      query:{},
      query: {},
      value1: "",
      value2: "",
      tableData: [
@@ -137,6 +137,7 @@
            prop: "enterpriseName",
            search: true,
            searchSpan: 4,
            width:300,
            display: false
          },
          {
@@ -179,7 +180,10 @@
          {
            label: "社保缴纳总额（万）",
            prop: "sbcount",
            display: false
            display: false,
            formatter: function(row, value) {
              return (value = value / 10000);
            }
          },
          {
            label: "公司派遣人数",
@@ -187,9 +191,12 @@
            display: false
          },
          {
            label: "社保缴纳人数占比（%）",
            label: "社保缴纳人数占比",
            prop: "zb",
            display: false
            display: false,
            formatter: function(row, value) {
              return (value = value * 100 + "%");
            }
          },
          {
            label: "备注",
@@ -351,8 +358,11 @@
      }
      let jurisdiction = object["jurisdiction1"] || "";
      let enterpriseName = object["enterpriseName"] || "";
      let obj = { jurisdiction: jurisdiction, enterpriseName: enterpriseName };
      this.onLoad(this.page, obj);
      this.query = {
        jurisdiction: jurisdiction,
        enterpriseName: enterpriseName
      };
      this.onLoad(this.page, this.query);
    }
  },
  mounted() {