Merge branch 'dev' of http://39.101.143.165:8090/sxzgd/vue-insagent-pc into dev

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/HandlingFees.vue

@@ -421,13 +421,13 @@
           <el-col :span="8">
             <el-form-item label="保司机构" prop="partnerCompaniesId">
               <el-cascader
-                ref="partnerCompaniesCascader"
+                ref="partnerCompaniesCascaderEdit"
                 v-model="formDataEdit.partnerCompaniesId"
                 size="small"
                 :show-all-levels="false"
                 ize="small"
                 :options="ztreeNodes"
-                @change="partnerCompaniesFun"
+                @change="partnerCompaniesEditFun"
                 :props="optionProps"
                 clearable
                 filterable
@@ -1356,6 +1356,17 @@ export default {
         default:
       }
     },
+    partnerCompaniesEditFun(val) {
+      if (val && val.length > 0) {
+        this.formDataEdit.partnerCompaniesId = val[val.length - 1];
+        this.formDataEdit.partnerCompaniesName =
+          this.$refs.partnerCompaniesCascaderEdit.getCheckedNodes()[0].label;
+      } else {
+        this.formDataEdit.partnerCompaniesId = "";
+        this.formDataEdit.partnerCompaniesName = "";
+      }
+      // this.formDataEdit.partnerCompaniesId = val[val.length - 1];
+    },
     partnerCompaniesFun(val) {
       if (val && val.length > 0) {
         this.formDataAdd.partnerCompaniesId = val[val.length - 1];

src/views/PeopleManage/InstitutionalExtraction.vue

@@ -117,8 +117,7 @@ export default {
           { prop: "sypremium", label: "商业险", type: "text" },
           { prop: "jypremium", label: "驾意险", type: "text" },
           { prop: "sumpremium", label: "总保费", type: "text" },
-
-          { prop: "createtime", label: "创建时间 ", type: "text" },
+          { prop: "createTime", label: "创建时间 ", type: "text" },
         ],
         tableHeight:450,
         loading: true,
@@ -185,10 +184,10 @@ export default {
         })
         .then((res) => {
           this.depttableConfig.loading = false;
-          this.pageResultdept = res.data.records;
-          this.pageDatadept.pageNum = res.data.current;
-          this.pageDatadept.pageSize = res.data.size;
-          this.pageDatadept.totalSize = res.data.total;
+          this.pageResultdept = res.data.content;
+          this.pageDatadept.pageNum = res.data.pageNum;
+          this.pageDatadept.pageSize = res.data.pageSize;
+          this.pageDatadept.totalSize = res.data.totalSize;
         });
     },
     // 查询Start

src/views/PeopleManage/PartnerExtraction.vue

@@ -166,7 +166,7 @@ export default {
           { prop: "sypremium", label: "商业险", type: "text" },
           { prop: "jypremium", label: "驾意险", type: "text" },
           { prop: "sumpremium", label: "总保费", type: "text" },
-          { prop: "createtime", label: "创建时间 ", type: "text" },
+          { prop: "createTime", label: "创建时间 ", type: "text" },
         ],
         tableHeight: 450,
         loading: true,
@@ -244,10 +244,10 @@ export default {
         })
         .then((res) => {
           this.depttableConfig.loading = false;
-          this.pageResultdept = res.data.records;
-          this.pageDatadept.pageNum = res.data.current;
-          this.pageDatadept.pageSize = res.data.size;
-          this.pageDatadept.totalSize = res.data.total;
+          this.pageResultdept = res.data.content;
+          this.pageDatadept.pageNum = res.data.pageNum;
+          this.pageDatadept.pageSize = res.data.pageSize;
+          this.pageDatadept.totalSize = res.data.totalSize;
         });
     },
     // 查询Start