Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/insurancePolicy/index.vue

@@ -3768,7 +3768,7 @@ const ruleFilterCompany = (item: any, obj: any) => {
           item.agreement = item.agreements[0].id
         }
       })
-      quoteData.value.map((item: any) => {
+      quoteData.value?.map((item: any) => {
         obj.insCompanyVo.map((a: any) => {
           if (item.id == a.id) {
             item.quoteResult = a;
@@ -4233,4 +4233,4 @@ onMounted(() => {
     }
   }
 }
-</style>
+</style>

src/views/platform/index.vue

@@ -123,7 +123,7 @@
           <span class="flex col-160 m-r-8 bg-F9">
             <el-checkbox class="p-w-12" @change="selectAll" v-model="selectAllValue"></el-checkbox>&nbsp;
             <el-select class="select-all width-100" placeholder="全选" v-model="selectType" @change="selectTypeChange">
-              <el-option key="all" value="all" :label="`选中所有数据${selectedTotal1}条`"></el-option>
+              <el-option key="all" value="all" :label="`选中所有数据${total1}条`"></el-option>
               <el-option key="cur" value="cur" label="选中本页数据"></el-option>
             </el-select>
           </span>
@@ -311,7 +311,7 @@
           <span class="flex col-160 m-r-8 bg-F9">
             <el-checkbox class="p-w-12" @change="selectAll" v-model="selectAllValue"></el-checkbox>&nbsp;
             <el-select class="select-all width-100" placeholder="全选" v-model="selectType" @change="selectTypeChange">
-              <el-option key="all" value="all" :label="`选中所有数据${selectedTotal2}条`"></el-option>
+              <el-option key="all" value="all" :label="`选中所有数据${total2}条`"></el-option>
               <el-option key="cur" value="cur" label="选中本页数据"></el-option>
             </el-select>
           </span>
@@ -600,8 +600,6 @@ let selectedList = ref([])
 let selectType = ref('')
 // 外部全选是否勾选
 let selectAllValue = ref(false)
-let selectedTotal1 = ref(0)
-let selectedTotal2 = ref(0)
 // 外部的全选
 const selectAll = (type: boolean) => {
   if (type) {

src/views/quoteConfig/agreement/agreementDetails.vue

@@ -592,6 +592,7 @@ const costitemEditInfo = ref();
 const RulesInfo = ref({});
 const columns = [
   { prop: "costRules", label: "费用规则", width: '200', },
+  { prop: "priorityLevel", label: "优先级", width: '60', },
   { prop: "costDescribe", label: "费用规则", width: '200', },
   {
     prop: "ptlAgreementCostTypeList", label: "交强险费用", width: '300', formatter: (row: any) => {

src/views/receivable/documentary/index.vue

@@ -561,6 +561,8 @@ let ReceiveDataRef1 = ref()
 let ReceiveDataRef2 = ref()
 // 选中的数据
 let selectedList = ref([])
+let allData = ref([])
+
 // 全选的类型
 let selectType = ref('')
 // 外部全选是否勾选
@@ -592,11 +594,12 @@ const selectTypeChange = (type) => {
   selectAllValue.value = true
   receiveData.value.forEach(item => {
     ReceiveDataRef1.value!.toggleRowSelection(item, true)
+    ReceiveDataRef2.value!.toggleRowSelection(item, true)
   })
   if (type == 'cur') {
     selectedList.value = receiveData.value
   } else {
-    selectedList.value = []
+    selectedList.value = allData.value
   }
 }
 // 编辑
@@ -908,8 +911,16 @@ const getOtherReceivableList = () => {
     pageSize: size.value
   }).then((res: any) => {
     if (res.code == 200) {
-      receiveData.value = res.data.records
-      total1.value = res.data.total
+      receiveData.value = res.data.insPlyIncomePage.records
+      allData.value = res.data.insPlyIncomeOrders
+      total1.value = res.data.insPlyIncomePage.total
+      receiveData.value.forEach(element => {
+        if (selectedList.value.find(v => v.id === element.id)) {
+          nextTick(() => {
+            ReceiveDataRef1.value!.toggleRowSelection(element, true)
+          })
+        }
+      });
     }
   })
 }
@@ -940,8 +951,16 @@ const getJyOtherReceivableList = () => {
     pageSize: size.value
   }).then((res: any) => {
     if (res.code == 200) {
-      receiveData.value = res.data.records
-      total2.value = res.data.total
+      receiveData.value = res.data.insPlyIncomePage.records
+      allData.value = res.data.insPlyIncomeOrders
+      total2.value = res.data.insPlyIncomePage.total
+      receiveData.value.forEach(element => {
+        if (selectedList.value.find(v => v.id === element.id)) {
+          nextTick(() => {
+            ReceiveDataRef2.value!.toggleRowSelection(element, true)
+          })
+        }
+      });
     }
   })
 }

src/views/receivable/handingFee/index.vue

@@ -146,7 +146,7 @@
           </span>
         </el-row>
         <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 246px)'"
-          style="width: 100%; margin-top: 20px;" ref="ReceiveDataRef1" @select="handleSelectChange1"
+          style="width: 100%; margin-top: 20px;" row-key="id" ref="ReceiveDataRef1" @select="handleSelectChange1"
           @select-all="handleSelectAll1">
           <el-table-column type="selection" width="80"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
@@ -565,6 +565,7 @@ let ReceiveDataRef1 = ref()
 let ReceiveDataRef2 = ref()
 // 选中的数据
 let selectedList = ref([])
+let allData = ref([])
 // 全选的类型
 let selectType = ref('')
 // 外部全选是否勾选
@@ -600,7 +601,7 @@ const selectTypeChange = (type) => {
   if (type == 'cur') {
     selectedList.value = receiveData.value
   } else if (type == 'all') {
-    selectedList.value = []
+    selectedList.value = allData.value
   }
 }
 
@@ -849,9 +850,19 @@ let pages = ref(1)
 let size = ref(10)
 const handleSizeChange = (size) => {
   size.value = size
+  if (activeName.value == '1') {
+    getCommissionReceivableList()
+  } else if (activeName.value == '2') {
+    getJyReceivableList()
+  }
 }
 const handleCurrentChange = (page) => {
   pages.value = page
+  if (activeName.value == '1') {
+    getCommissionReceivableList()
+  } else if (activeName.value == '2') {
+    getJyReceivableList()
+  }
 }
 
 // 编辑
@@ -948,12 +959,20 @@ const getCommissionReceivableList = () => {
   }
   api.financeApi.getCommissionReceivableList({
     ...params,
-    pageNo: pages.value,
-    pageSize: size.value
+    pages: pages.value,
+    size: size.value
   }).then((res: any) => {
     if (res.code == 200) {
-      receiveData.value = res.data.records
-      total1.value = res.data.total
+      receiveData.value = res.data.insPlyIncomePage.records
+      allData.value = res.data.insPlyIncomeOrders
+      total1.value = res.data.insPlyIncomePage.total
+      receiveData.value.forEach(element => {
+        if (selectedList.value.find(v => v.id === element.id)) {
+          nextTick(() => {
+            ReceiveDataRef1.value!.toggleRowSelection(element, true)
+          })
+        }
+      });
     }
   })
 }
@@ -980,12 +999,20 @@ const getJyReceivableList = () => {
   }
   api.financeApi.getJyCommissionReceivableList({
     ...params,
-    pageNo: pages.value,
-    pageSize: size.value
+    pages: pages.value,
+    size: size.value
   }).then((res: any) => {
     if (res.code == 200) {
-      receiveData.value = res.data.records
-      total2.value = res.data.total
+      receiveData.value = res.data.insPlyIncomePage.records
+      allData.value = res.data.insPlyIncomeOrders
+      total2.value = res.data.insPlyIncomePage.total
+      receiveData.value.forEach(element => {
+        if (selectedList.value.find(v => v.id === element.id)) {
+          nextTick(() => {
+            ReceiveDataRef2.value!.toggleRowSelection(element, true)
+          })
+        }
+      });
     }
   })
 }