刘恒 преди 1 година
родител
ревизия
a369f78f95
променени са 4 файла, в които са добавени 23 реда и са изтрити 14 реда
  1. 7 5
      src/pages/agreement/index.vue
  2. 8 7
      src/pages/business/index.vue
  3. 5 1
      src/pages/task/dianxiao.vue
  4. 3 1
      src/pages/task/insurance.vue

+ 7 - 5
src/pages/agreement/index.vue

@@ -78,10 +78,10 @@
             :filter-option="filterOption"
             :filter-option="filterOption"
             style="width: 200px"
             style="width: 200px"
           >
           >
-            <a-select-option value="1">
+            <a-select-option value="0">
               {{ "内部" }}
               {{ "内部" }}
             </a-select-option>
             </a-select-option>
-            <a-select-option value="0">
+            <a-select-option value="1">
               {{ "外部" }}
               {{ "外部" }}
             </a-select-option>
             </a-select-option>
           </a-select>
           </a-select>
@@ -304,16 +304,18 @@ export default {
       if (this.insurerId == item.insuranceCompanyId) {
       if (this.insurerId == item.insuranceCompanyId) {
         this.insurerId = "";
         this.insurerId = "";
         this.pagination.current = 1;
         this.pagination.current = 1;
-        this.pagination.defaultPageSize = 10;
+        // this.pagination.defaultPageSize = 10;
         this.getList();
         this.getList();
+        // this.onChange();
         return;
         return;
       }
       }
       this.insurerId = item.insuranceCompanyId;
       this.insurerId = item.insuranceCompanyId;
 
 
       // console.log(item,this.insurerId)
       // console.log(item,this.insurerId)
       this.pagination.current = 1;
       this.pagination.current = 1;
-      this.pagination.defaultPageSize = 10;
+      // this.pagination.defaultPageSize = 10;
       this.getList();
       this.getList();
+      // this.onChange();
     },
     },
     onClear() {
     onClear() {
       this.$message.info("您清空了勾选的所有行");
       this.$message.info("您清空了勾选的所有行");
@@ -321,7 +323,7 @@ export default {
 
 
     onChange(pagination) {
     onChange(pagination) {
       // this.$message.info('表格状态改变了')
       // this.$message.info('表格状态改变了')
-      // console.log(pagination, filters, sorter, { currentDataSource });
+      console.log(pagination);
       this.pagination = {
       this.pagination = {
         current: pagination.current,
         current: pagination.current,
         defaultPageSize: pagination.pageSize,
         defaultPageSize: pagination.pageSize,

+ 8 - 7
src/pages/business/index.vue

@@ -106,7 +106,7 @@
         <div>
         <div>
           省份:<a-select
           省份:<a-select
             style="width: 90%"
             style="width: 90%"
-            v-model="rankForm.provinceId"
+            v-model="rankForm.parterProvinceId"
             allowClear
             allowClear
           >
           >
             <a-select-option
             <a-select-option
@@ -123,7 +123,7 @@
           <span>城市:</span>
           <span>城市:</span>
           <a-select
           <a-select
             style="width: 90%"
             style="width: 90%"
-            v-model="rankForm.cityId"
+            v-model="rankForm.parterCityId"
             @change="cityChange"
             @change="cityChange"
             allowClear
             allowClear
           >
           >
@@ -142,7 +142,7 @@
 
 
           <a-select
           <a-select
             style="width: 90%"
             style="width: 90%"
-            v-model="rankForm.countyId"
+            v-model="rankForm.parterCountyId"
             @change="countyChange"
             @change="countyChange"
             allowClear
             allowClear
           >
           >
@@ -308,9 +308,9 @@ export default {
       cityList: [],
       cityList: [],
       countyList: [],
       countyList: [],
       rankForm: {
       rankForm: {
-        provinceId: "140000",
-        cityId: "",
-        countyId: "",
+        parterProvinceId: "140000",
+        parterCityId: "",
+        parterCountyId: "",
       },
       },
       columns,
       columns,
       amount: {},
       amount: {},
@@ -385,7 +385,7 @@ export default {
         }
         }
       });
       });
       this.countyList = [...arr];
       this.countyList = [...arr];
-      this.rankForm.countyId = "";
+      this.rankForm.parterCountyId = "";
       // this.getRankingList();
       // this.getRankingList();
     },
     },
     onClickRow(row) {
     onClickRow(row) {
@@ -440,6 +440,7 @@ export default {
       this.$API.business
       this.$API.business
         .getCountBusinessData({
         .getCountBusinessData({
           ...this.formState,
           ...this.formState,
+          ...this.rankForm,
         })
         })
         .then((res) => {
         .then((res) => {
           // console.log(res);
           // console.log(res);

+ 5 - 1
src/pages/task/dianxiao.vue

@@ -566,13 +566,17 @@ export default {
     },
     },
     getList(val) {
     getList(val) {
       this.loading = true;
       this.loading = true;
+
+      let leaderId =
+        this.formState.leaderId[this.formState.leaderId.length - 1];
+
       this.$API.task
       this.$API.task
         .getQueryPageElectric({
         .getQueryPageElectric({
           pageNum: this.pagination.current,
           pageNum: this.pagination.current,
           pageSize: this.pagination.defaultPageSize,
           pageSize: this.pagination.defaultPageSize,
           ...this.formState,
           ...this.formState,
-          leaderId: this.formState.leaderId[this.formState.leaderId.length - 1],
           ...val,
           ...val,
+          leaderId: leaderId,
         })
         })
         .then((res) => {
         .then((res) => {
           if (res.data.code === 200) {
           if (res.data.code === 200) {

+ 3 - 1
src/pages/task/insurance.vue

@@ -323,11 +323,13 @@ export default {
       if (this.companyId == item.insuranceCompanyId) {
       if (this.companyId == item.insuranceCompanyId) {
         this.companyId = "";
         this.companyId = "";
         this.pagination.current = 1;
         this.pagination.current = 1;
-        this.pagination.defaultPageSize = 10;
+        // this.pagination.defaultPageSize = 10;
         this.getBackLinePersonnel();
         this.getBackLinePersonnel();
         return;
         return;
       }
       }
       this.companyId = item.insuranceCompanyId;
       this.companyId = item.insuranceCompanyId;
+      this.pagination.current = 1;
+
       //   // console.log(item,this.companyId)
       //   // console.log(item,this.companyId)
       this.getBackLinePersonnel();
       this.getBackLinePersonnel();
     },
     },