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

src/views/finance/index.vue

@@ -172,7 +172,7 @@
           <el-table-column prop="orderType" label="订单类型" width="120"></el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
+          <el-table-column prop="partnerCompanyName" label="保险机构" width="220"></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>
@@ -494,7 +494,7 @@
           <el-table-column prop="mobile" label="业务员手机号" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanyIdName" label="保险机构" width="120"></el-table-column>
+          <el-table-column prop="partnerCompanyIdName" label="保险机构" width="220"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="insurName" label="被保人" width="120"></el-table-column>
           <el-table-column prop="createBy" label="录入人" width="120"></el-table-column>
@@ -620,27 +620,20 @@
           highlight-current-row>
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型" width="120">
-            <template #default="scope">
-              {{ scope.row.attrType == '5' ? '团队' : scope.row.attrType == '6' ? '个代' : scope.row.attrType ==
-                '7' ? '渠道' : scope.row.attrType == '8' ? '电销组' : '--' }}
-            </template>
           </el-table-column>
           <el-table-column prop="mobile" label="业务员手机号" width="120"></el-table-column>
           <el-table-column prop="name" label="业务员" width="120"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="120">
-            <template #default="scope">
-              {{ scope.row.orderType == '1' ? '车险录入' : scope.row.orderType == '2' ? '代客录单' : scope.row.orderType ==
-                '3' ? '外部订单' : '--' }}
-            </template>
           </el-table-column>
           <el-table-column prop="agreementName" label="出单协议" width="120"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanyName" label="保险机构" width="120"></el-table-column>
+          <el-table-column prop="partnerCompanyName" label="保险机构" width="220"></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="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>
+          <el-table-column prop="auditingUserName" label="审核人" width="120"></el-table-column>
           <el-table-column prop="problemReason" label="疑问原因" width="120"></el-table-column>
           <el-table-column prop="problemTime" label="疑问时间" width="120"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="120"></el-table-column>
@@ -735,7 +728,7 @@ function handleResize() {
     console.log(tableHeight.value)
   }
 }
-let activeName = ref(myRoute.query.activeindex as any || '1')
+let activeName = ref(myRoute.query.activeindex as any || '0')
 const handleClick = async (e) => {
   activeName.value = e.props.name
   pages.value = 1

src/views/platform/platformReport.vue

@@ -1,7 +1,7 @@
 <template>
   <PageMain class="vh100">
     <el-tabs v-model="activeName" style="height: 100%" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane style="height: 100%" name="1" label="保险公司报表">
+      <!-- <el-tab-pane style="height: 100%" name="1" label="保险公司报表">
         <el-form v-model="recordForm" label-width="120">
           <el-row :gutter="20">
             <el-col :span="8">
@@ -62,7 +62,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </el-tab-pane>
+      </el-tab-pane> -->
       <el-tab-pane style="height: 100%" name="2" label="对接人结算报表">
         <el-form v-model="recordForm1" label-width="120">
           <el-row :gutter="20">
@@ -192,7 +192,7 @@ let recordForm2 = ref({})
 let recordData = ref([])
 let recordData1 = ref([])
 let recordData2 = ref([])
-let activeName = ref('1')
+let activeName = ref('2')
 const handleClick = (e) => {
   pages.value = 1
   size.value = 10
@@ -439,7 +439,7 @@ onMounted(() => {
     activeName.value = '3'
     initData3();
   } else {
-    initData1();
+    initData2();
   }
   initCompany();
   initOption();

src/views/receivable/handingFee/invoiceRecord.vue

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