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

src/views/platform/platformRecord.vue

@@ -64,6 +64,8 @@
     <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>
+      <el-table-column prop="contactPersonPhone" label="对接人手机号" width="200"></el-table-column>
       <el-table-column prop="invoiceType" label="应收项" width="200"></el-table-column>
       <el-table-column prop="receivableSupervisePremium" label="应收金额" width="150"></el-table-column>
       <el-table-column prop="actualReceivedAmount" label="实收金额" width="150"></el-table-column>

src/views/platform/platformReport.vue

@@ -47,8 +47,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 100px)" :data="recordData" row-key="companyId" :summary-method="getSummaries"
-          show-summary>
+        <el-table height="calc(100% - 190px)" :data="recordData" row-key="companyId"
+          :summary-method="val => getSummaries(val)" show-summary>
           <el-table-column prop="companyName" label="保险公司" width="240"></el-table-column>
           <el-table-column prop="totalReceivable" label="应收金额" width="240"></el-table-column>
           <el-table-column prop="contactPerson" label="对接人" width="240"></el-table-column>
@@ -92,9 +92,10 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 142px)" :data="recordData1">
-          <el-table-column prop="receiver" label="对接人" ></el-table-column>
-          <el-table-column prop="companyName" label="保险公司" ></el-table-column>
+        <el-table height="calc(100% - 142px)" :data="recordData1" show-summary
+          :summary-method="val => getSummaries(val, ['totalReceivable','settledAmount','unSettledAmount'])">
+          <el-table-column prop="receiver" label="对接人"></el-table-column>
+          <el-table-column prop="companyName" label="保险公司"></el-table-column>
           <el-table-column prop="totalReceivable" label="应收总计" width="150"></el-table-column>
           <el-table-column prop="settledAmount" label="已结算总计" width="150"></el-table-column>
           <el-table-column prop="unSettledAmount" label="未结算总计" width="150"></el-table-column>
@@ -123,8 +124,7 @@
             <el-col :span="8">
               <el-form-item prop="companyId" label="保险公司">
                 <el-select v-model="recordForm2.companyId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
-                    :label="item.name"></el-option>
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -155,7 +155,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 192px)" :data="recordData2">
+        <el-table height="calc(100% - 192px)" :data="recordData2" show-summary
+          :summary-method="val => getSummaries(val, ['receivableSuperviseCosts','jqPremium','syPremium','jyPremium','taxPremium','jqSuperviseCostsProportion','sySuperviseCostsProportion','jySuperviseCostsProportion'])">
           <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="150"></el-table-column>
@@ -240,33 +241,53 @@ const handleCurrentChange = (page) => {
   pages.value = page
 }
 
-const getSummaries = (param) => {
+const getSummaries = (param, list) => {
+  console.log(param)
   const { columns, data } = param
   const sums: (string | VNode)[] = []
+  // 指定需要计算的字段列表（可根据需求添加字段名）
+  const specifiedFields = list || [] // 替换为您需要的字段名
+
   columns.forEach((column, index) => {
     if (index === 0) {
-      sums[index] = h('div', [
+      sums[index] = h('div', { style: { textDecoration: 'underline' } }, [
         '',
       ])
       return
     }
-    const values = data.map((item) => Number(item[column.property]))
+    // 计算数字类型字段和指定字段
+    const values = data.map((item) => {
+      const val = item[column.property]
+      // 排除空值
+      if (val === '' || val === null || val === undefined) {
+        return NaN
+      }
+      // 如果是数字类型，直接参与计算
+      if (typeof val === 'number') {
+        return val
+      }
+      // 如果字段在指定列表中，尝试转换为数字
+      if (specifiedFields.includes(column.property)) {
+        const num = Number(val)
+        return Number.isNaN(num) ? NaN : num
+      }
+      // 其他情况不参与计算
+      return NaN
+    })
     if (!values.every((value) => Number.isNaN(value))) {
-      sums[index] = ` ${values.reduce((prev, curr) => {
-        const value = Number(curr)
-        if (!Number.isNaN(value)) {
+      const total = values.reduce((prev, curr) => {
+        if (!Number.isNaN(curr)) {
           return prev + curr
         } else {
           return prev
         }
-      }, 0)}`
+      }, 0)
+      // 保留五位小数
+      sums[index] = ` ${total.toFixed(5)}`
     } else {
-      if (index > 2) {
-        sums[index - 1] = '0'
-      }
+      sums[index] = '-'
     }
   })
-
   return sums
 }
 
@@ -416,7 +437,7 @@ const initOption = () => {
     })
   })
 }
-const  handleSettlementDetail = (row) => {
+const handleSettlementDetail = (row) => {
   activeName.value = '3'
   recordForm2.value.companyId = row.id
   initData3()

src/views/receivable/documentary/documentaryRecord.vue

@@ -435,7 +435,7 @@ const getSummaries = (param) => {
   const { columns, data } = param
   const sums: (string | VNode)[] = []
   // 指定需要计算的字段列表（可根据需求添加字段名）
-  const specifiedFields = ['taxPoint', 'actualReceivedAmount'] // 替换为您需要的字段名
+  const specifiedFields = ['taxPoint'] // 替换为您需要的字段名
 
   columns.forEach((column, index) => {
     if (index === 0) {

src/views/receivable/documentary/documentaryReport.vue

@@ -42,7 +42,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 100px)" :data="recordData" row-key="id" :summary-method="getSummaries"
+        <el-table height="calc(100% - 100px)" :data="recordData" row-key="id" :summary-method="val=>getSummaries(val,['settlementPaymentDifference'])"
           show-summary>
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
           <el-table-column prop="totalReceivable" label="累计应收"></el-table-column>
@@ -133,7 +133,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 192px)" :data="recordData1">
+        <el-table height="calc(100% - 192px)" :data="recordData1" show-summary :summary-method="val=>getSummaries(val,['taxPoint','actualReceivedAmount','settlementPaymentDifference'])">
           <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="invoiceParty" label="开票方" width="150"></el-table-column>
@@ -415,36 +415,57 @@ const handleCurrentChange = (page, type) => {
   }
 }
 
-const getSummaries = (param) => {
+const getSummaries = (param, list) => {
+  console.log(param)
   const { columns, data } = param
   const sums: (string | VNode)[] = []
+  // 指定需要计算的字段列表（可根据需求添加字段名）
+  const specifiedFields = list // 替换为您需要的字段名
+
   columns.forEach((column, index) => {
     if (index === 0) {
-      sums[index] = h('div', [
+      sums[index] = h('div', { style: { textDecoration: 'underline' } }, [
         '',
       ])
       return
     }
-    const values = data.map((item) => Number(item[column.property]))
+    // 计算数字类型字段和指定字段
+    const values = data.map((item) => {
+      const val = item[column.property]
+      // 排除空值
+      if (val === '' || val === null || val === undefined) {
+        return NaN
+      }
+      // 如果是数字类型，直接参与计算
+      if (typeof val === 'number') {
+        return val
+      }
+      // 如果字段在指定列表中，尝试转换为数字
+      if (specifiedFields.includes(column.property)) {
+        const num = Number(val)
+        return Number.isNaN(num) ? NaN : num
+      }
+      // 其他情况不参与计算
+      return NaN
+    })
     if (!values.every((value) => Number.isNaN(value))) {
-      sums[index] = ` ${values.reduce((prev, curr) => {
-        const value = Number(curr)
-        if (!Number.isNaN(value)) {
+      const total = values.reduce((prev, curr) => {
+        if (!Number.isNaN(curr)) {
           return prev + curr
         } else {
           return prev
         }
-      }, 0)}`
+      }, 0)
+      // 保留五位小数
+      sums[index] = ` ${total.toFixed(5)}`
     } else {
-      if (index > 2) {
-        sums[index - 1] = '0'
-      }
+      sums[index] = '-'
     }
   })
-
   return sums
 }
 
+
 // 结算记录
 let recordForm = ref({})
 let recordForm1 = ref({})

src/views/receivable/documentary/index.vue

@@ -164,7 +164,7 @@
           <el-table-column prop="agreementName" label="出单协议" width="150"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
-          <el-table-column prop="otherCostsPremiums" label="应收跟单费" width="100"></el-table-column>
+          <el-table-column prop="carInsuranceOtherCostsPremiums" label="应收跟单费" width="100"></el-table-column>
           <el-table-column prop="productName" label="险种" width="100"></el-table-column>
           <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
           <el-table-column prop="jqPremium" label="交强险保费" width="100"></el-table-column>
@@ -347,7 +347,7 @@
           <el-table-column prop="invoiceStatusName" label="开票状态" width="100"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
-          <el-table-column prop="otherCostsPremiums" label="应收跟单费" width="100"></el-table-column>
+          <el-table-column prop="nonCarInsuranceOtherCostsPremiums" label="应收跟单费" width="100"></el-table-column>
           <el-table-column prop="productName" label="险种" width="100"></el-table-column>
           <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
           <el-table-column prop="jyPremium" label="非车险保费" width="100">

src/views/receivable/handingFee/index.vue

@@ -170,7 +170,7 @@
           <el-table-column prop="invoiceId" label="关联发票" width="100"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
-          <el-table-column prop="superviseCostsPremiums" label="应收手续费" width="100"></el-table-column>
+          <el-table-column prop="carInsuranceSuperviseCostsPremiums" label="应收手续费" width="100"></el-table-column>
           <el-table-column prop="productName" label="险种" width="100"></el-table-column>
           <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
           <el-table-column prop="taxPremium" label="车船税" width="100"></el-table-column>
@@ -350,7 +350,7 @@
           <el-table-column prop="invoiceId" label="关联发票" width="100"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
-          <el-table-column prop="superviseCostsPremiums" label="应收总额" width="100"></el-table-column>
+          <el-table-column prop="nonCarInsuranceSuperviseCostsPremiums" label="应收总额" width="100"></el-table-column>
           <el-table-column prop="productName" label="险种" width="100"></el-table-column>
           <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
           <el-table-column prop="jyPremium" label="非车险保费" width="100"></el-table-column>

src/views/receivable/handingFee/report.vue

@@ -36,6 +36,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item prop="accountsReceivable" label="应收项">
+                <el-select v-model="recordForm.accountsReceivable" clearable>
+                  <el-option v-for="item in optionObj['invoice_risk_type']" :key="item.value" :value="item.value"
+                    :label="item.label"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item prop="invoiceStatus" label="开票状态">
                 <el-select v-model="recordForm.invoiceStatus" filterable clearable>
@@ -56,8 +64,8 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 100px)" :data="recordData" row-key="id" :summary-method="getSummaries"
-          show-summary>
+        <el-table height="calc(100% - 200px)" :data="recordData" show-summary
+          :summary-method="val => getSummaries(val, ['totalReceivable', 'totalOverinflatedAmount', 'superviseFee', 'SxfInvoicedAmount', 'sxfSettledAmount', 'SxfUnInvoicedAmount', 'sxfUnSettledAmount', 'settlementPaymentDifference'])">
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
           <el-table-column prop="totalReceivable" label="应收金额"></el-table-column>
           <el-table-column prop="totalOverinflatedAmount" label="虚增金额合计"></el-table-column>
@@ -148,13 +156,15 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 192px)" :data="recordData1">
+        <el-table height="calc(100% - 192px)" :data="recordData1" show-summary :summary-method="val=>getSummaries(val,['taxPoint', 'actualReceivedAmount'])">
           <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="invoiceParty" label="开票方" width="150"></el-table-column>
           <el-table-column prop="invoiceType" label="应收项" width="100"></el-table-column>
           <el-table-column prop="taxPoint" label="税点" width="100"></el-table-column>
           <el-table-column prop="actualReceivedAmount" label="实收金额" width="100"></el-table-column>
+          <el-table-column prop="settlementPaymentDifference" label="回款差额" width="100"></el-table-column>
+          <el-table-column prop="settlementPaymentReason" label="回款差额原因" width="200"></el-table-column>
           <el-table-column prop="receivePaymentDate" label="收款日期" width="150"></el-table-column>
           <el-table-column label="收款凭证" width="100">
             <template #default="scope">
@@ -228,7 +238,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 192px)" :data="recordData2">
+        <el-table height="calc(100% - 192px)" :data="recordData2" show-summary :summary-method="val=>getSummaries(val,['receivableSuperviseCosts', 'jqPremium','taxPremium','syPremium','jqSuperviseCostsProportion','sySuperviseCostsProportion'])">
           <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="invoiceParty" label="开票方" width="100"></el-table-column>
@@ -304,7 +314,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table height="calc(100% - 192px)" :data="recordData3">
+        <el-table height="calc(100% - 192px)" :data="recordData3" show-summary :summary-method="val=>getSummaries(val,['receivableSuperviseCosts','jyPremium','jySuperviseCostsProportion'])">
           <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="invoiceParty" label="开票方" width="100"></el-table-column>
@@ -455,33 +465,53 @@ const handleCurrentChange = (page, type) => {
   }
 }
 
-const getSummaries = (param) => {
+const getSummaries = (param, list) => {
+  console.log(param)
   const { columns, data } = param
   const sums: (string | VNode)[] = []
+  // 指定需要计算的字段列表（可根据需求添加字段名）
+  const specifiedFields = list // 替换为您需要的字段名
+
   columns.forEach((column, index) => {
     if (index === 0) {
-      sums[index] = h('div', [
+      sums[index] = h('div', { style: { textDecoration: 'underline' } }, [
         '',
       ])
       return
     }
-    const values = data.map((item) => Number(item[column.property]))
+    // 计算数字类型字段和指定字段
+    const values = data.map((item) => {
+      const val = item[column.property]
+      // 排除空值
+      if (val === '' || val === null || val === undefined) {
+        return NaN
+      }
+      // 如果是数字类型，直接参与计算
+      if (typeof val === 'number') {
+        return val
+      }
+      // 如果字段在指定列表中，尝试转换为数字
+      if (specifiedFields.includes(column.property)) {
+        const num = Number(val)
+        return Number.isNaN(num) ? NaN : num
+      }
+      // 其他情况不参与计算
+      return NaN
+    })
     if (!values.every((value) => Number.isNaN(value))) {
-      sums[index] = ` ${values.reduce((prev, curr) => {
-        const value = Number(curr)
-        if (!Number.isNaN(value)) {
+      const total = values.reduce((prev, curr) => {
+        if (!Number.isNaN(curr)) {
           return prev + curr
         } else {
           return prev
         }
-      }, 0)}`
+      }, 0)
+      // 保留五位小数
+      sums[index] = ` ${total.toFixed(5)}`
     } else {
-      if (index > 2) {
-        sums[index - 1] = '0'
-      }
+      sums[index] = '-'
     }
   })
-
   return sums
 }
 
@@ -505,6 +535,7 @@ const initData1 = () => {
     companyId: recordForm.value.companyId,
     startTime: recordForm.value.time?.[0],
     endTime: recordForm.value.time?.[1],
+    accountsReceivable: recordForm.value.accountsReceivable,
     invoiceStartTime: recordForm.value.invoiceTime?.[0],
     invoiceEndTime: recordForm.value.invoiceTime?.[1],
     settlementStartTime: recordForm.value.settlementTime?.[0],