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

src/views/finance/audit.vue

@@ -57,6 +57,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="投保人">
+                <el-input v-model="firstForm.policyholder" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="被保人">
                 <el-input v-model="firstForm.insurName" placeholder="请输入" clearable></el-input>
@@ -172,6 +177,7 @@
           <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
+          <el-table-column prop="policyholder" label="投保人" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="productName" label="投保险种" width="120"></el-table-column>
           <el-table-column prop="createBy" label="录入人" width="120"></el-table-column>
@@ -249,6 +255,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="投保人">
+                <el-input v-model="firstForm.policyholder" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="被保人">
                 <el-input v-model="firstForm.insurName" placeholder="请输入" clearable></el-input>
@@ -377,6 +388,7 @@
           <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
+          <el-table-column prop="policyholder" label="投保人" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="productName" label="投保险种" width="120"></el-table-column>
           <el-table-column prop="createBy" label="录入人" width="120"></el-table-column>

src/views/finance/index.vue

@@ -57,6 +57,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="投保人">
+                <el-input v-model="firstForm.policyholder" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="被保人">
                 <el-input v-model="firstForm.insurName" placeholder="请输入" clearable></el-input>
@@ -171,6 +176,7 @@
           <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
+          <el-table-column prop="policyholder" label="投保人" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="productName" label="投保险种" width="120"></el-table-column>
           <el-table-column prop="createBy" label="录入人" width="120"></el-table-column>
@@ -248,6 +254,11 @@
                   <el-option label="外部订单" value="3"></el-option>
                 </el-select>
               </el-form-item>
+            </el-col>
+             <el-col :span="8">
+              <el-form-item label="投保人">
+                <el-input v-model="firstForm.policyholder" placeholder="请输入" clearable></el-input>
+              </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="被保人">
@@ -382,6 +393,7 @@
           <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="120"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
+          <el-table-column prop="policyholder" label="投保人" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="productName" label="投保险种" width="120"></el-table-column>
           <el-table-column prop="createBy" label="录入人" width="120"></el-table-column>

src/views/platform/platformRecord.vue

@@ -54,14 +54,23 @@
             <el-input v-model="form.invoiceId"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="display: flex; justify-content: flex-end">
+        <el-col :span="8">
+          <el-form-item prop="contactPerson" label="对接人">
+            <el-select v-model="form.contactPerson" placeholder="请选择" clearable filterable>
+              <el-option v-for="item in contactPersonList" :key="item.contactPerson" :value="item.contactPerson"
+                :label="item.contactPerson"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" style="display: flex; justify-content: flex-end">
           <el-button type="primary" @click="search()">查询</el-button>
           <el-button plain type="primary" @click="reset()">重置</el-button>
           <el-button type="primary" @click="exportPlatformSettlementExcel()">导出结算记录</el-button>
         </el-col>
       </el-row>
     </el-form>
-    <el-table class="tableRecord" style="height: calc(100% - 192px)" :data="tableData" show-summary :summary-method="getSummaries">
+    <el-table class="tableRecord" style="height: calc(100% - 192px)" :data="tableData" show-summary
+      :summary-method="getSummaries">
       <el-table-column prop="settlementId" label="结算记录编号" width="200"></el-table-column>
       <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
       <el-table-column prop="contactPerson" label="对接人姓名" width="200"></el-table-column>
@@ -95,7 +104,7 @@
     </div>
 
   </PageMain>
-  <el-dialog  v-model="viewCredential" title="查看凭证" width="400">
+  <el-dialog v-model="viewCredential" title="查看凭证" width="400">
     <div class="text-center text-[14px] text-[#999] pb-[20px]">点击图片放大预览</div>
     <el-image style="width: 100%; height: 300px" :src="CredentialList[0]" :zoom-rate="1.2" :max-scale="7"
       :min-scale="0.2" :preview-src-list="CredentialList" show-progress :initial-index="4" alt="凭证图片" fit="cover" />
@@ -166,7 +175,15 @@ const exportPlatformSettlementExcel = () => {
     }
   })
 }
-
+// 对接人列表
+const contactPersonList = ref([])
+const getqueryContractVos = async () => {
+  api.financeApi.queryContractVos().then((res: any) => {
+    if (res.code == 200) {
+      contactPersonList.value = res.data
+    }
+  })
+}
 // 列表
 const initList = () => {
   api.settlementApi
@@ -252,7 +269,7 @@ const getSummaries = (param) => {
   const { columns, data } = param
   const sums: (string | VNode)[] = []
   // 指定需要计算的字段列表（可根据需求添加字段名）
-  const specifiedFields = ['receivableSupervisePremium', 'actualReceivedAmount','settlementPaymentDifference'] // 替换为您需要的字段名
+  const specifiedFields = ['receivableSupervisePremium', 'actualReceivedAmount', 'settlementPaymentDifference'] // 替换为您需要的字段名
 
   columns.forEach((column, index) => {
     if (index === 0) {
@@ -300,6 +317,7 @@ onMounted(() => {
   initList();
   initOption();
   initCompany();
+  getqueryContractVos();
 });
 </script>