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

src/views/platform/ticket.vue

@@ -34,8 +34,8 @@
             <el-option value="不在固定范围" label="不在固定范围"></el-option>
             <el-option value="为空" label="为空"></el-option>
           </el-select>
-          <el-select class="w-350px" v-if="item.name == 'contactPerson'" v-model="item.search" placeholder="请选择"
-            clearable :disabled="item.type == '为空'">
+          <el-select class="w-350px" v-if="item.name == 'contactPerson'" v-model="item.search" placeholder="请选择" filterable
+            clearable :disabled="item.type == '为空'" @change="handleContactPersonChange(index, $event)">
             <el-option v-for="item in options" :key="item.contactPerson" :value="item.contactPerson"
               :label="item.contactPerson"></el-option>
           </el-select>
@@ -289,7 +289,11 @@ const initCompany = () => {
     }
   })
 }
-
+  // 对接人改变时 赋值
+  const handleContactPersonChange = (index: number, val: string) => {
+    contactPerson.value = val
+    searchList.value[index].search = val
+  }
 //保险公司协议
 
 const initData = () => {
@@ -533,6 +537,13 @@ const handleBack = () => {
   }
 }
 const handleSettlement = () => {
+  if (contactPerson.value == '') {
+    ElMessage({
+      message: '请选择对接人！',
+      type: 'warning'
+    })
+    return
+  }
   // 查应收金额
   api.financeApi.getPlatformSettlementReceivableAmount({
     invoiceType: "5",

src/views/receivable/documentary/documentaryReport.vue

@@ -59,7 +59,7 @@
         <el-table height="500px" :data="recordData" row-key="id"
           :summary-method="val => getSummaries(val, ['totalSettlementAmount'])" show-summary>
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
-          <el-table-column prop="totalReceivable" label="累计应收"></el-table-column>
+          <el-table-column prop="totalReceivable" label="跟单费金额"></el-table-column>
           <el-table-column prop="totalReconciliationAmount" label="对账金额"></el-table-column>
           <el-table-column prop="year" label="年"></el-table-column>
           <el-table-column prop="month" label="月"></el-table-column>
@@ -72,6 +72,7 @@
               {{ scope.row.invoiceType == 2 ? '车险' : '非车险' }}
             </template>
           </el-table-column>
+          <el-table-column prop="totalPaymentDifference" label="回款差额"></el-table-column>
           <el-table-column label="操作" fixed="right" width="120">
             <template #default="scope">
               <div class="flex a-c">
@@ -830,4 +831,4 @@ onMounted(() => {
   color: var(--el-color-primary);
   cursor: pointer;
 }
-</style>
+</style>