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

src/views/platform/index.vue

@@ -170,7 +170,7 @@
           <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
           <el-table-column prop="jqPremium" label="交强险保费" width="100"></el-table-column>
           <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例" width="150"></el-table-column>
-          <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例" width="150"></el-table-column>
+          <el-table-column prop="jqTotalProportion" label="交强险总比例" width="150"></el-table-column>
           <el-table-column prop="jqReceivablePremium" label="交强应收金额" width="150"></el-table-column>
 
           <!-- <el-table-column prop="jqSuperviseCostsProportion" label="交强入口比例" width="120">
@@ -181,6 +181,7 @@
           <el-table-column prop="taxPremium" label="车船税" width="100"></el-table-column>
           <el-table-column prop="syPremium" label="商业险保费" width="100"></el-table-column>
           <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例" width="150"></el-table-column>
+          <el-table-column prop="syTotalProportion" label="商业险总比例" width="150"></el-table-column>
           <el-table-column prop="syReceivablePremium" label="商业应收金额" width="150"></el-table-column>
           <!-- <el-table-column prop="sySuperviseCostsProportion" label="商业入口比例" width="120">
             <template #default="scope">
@@ -188,6 +189,7 @@
             </template>
           </el-table-column> -->
           <el-table-column prop="jyPremium" label="非车保费" width="100"></el-table-column>
+          <el-table-column prop="jyTotalProportion" label="非车总比例" width="150"></el-table-column>
           <el-table-column prop="jyReceivablePremium" label="非车应收金额" width="150"></el-table-column>
           <!-- <el-table-column prop="sySuperviseCostsProportion" label="非车入口比例" width="120">
             <template #default="scope">

src/views/platform/platformReport.vue

@@ -54,8 +54,8 @@
         <el-form v-model="recordForm1" label-width="120">
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item prop="settlementId" label="对接人">
-                <el-input v-model="recordForm1.settlementId"></el-input>
+              <el-form-item prop="receiver" label="对接人">
+                <el-input v-model="recordForm1.receiver"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -283,15 +283,15 @@ const initData1 = () => {
 }
 const initData2 = () => {
   api.settlementApi.receiverSettlementReport({
-    settlementId: recordForm1.value.settlementId,
+    receiver: recordForm1.value.receiver,
     companyId: recordForm1.value.companyId,
     invoiceParty: recordForm1.value.invoiceParty,
     invoiceType: recordForm1.value.invoiceType,
     status: recordForm1.value.status,
     settlementPerson: recordForm1.value.settlementPerson,
     invoiceId: recordForm1.value.invoiceId,
-    settlementTimeStart: recordForm1.value.settlementTime?.[0],
-    settlementTimeEnd: recordForm1.value.settlementTime?.[1],
+    startTime: recordForm1.value.settlementTime?.[0],
+    endTime: recordForm1.value.settlementTime?.[1],
     pages: pages.value,
     size: size.value,
     invoiceTypes: ['5', '6']

src/views/receivable/handingFee/report.vue

@@ -638,9 +638,9 @@ const handleSettlementDetail = (row) => {
 }
 // 开票明细
 const handleInvoiceRecord = (row) => {
-  activeName.value = '2'
-  recordForm1.value.companyId = row.id
-  initData2()
+  activeName.value = '3'
+  recordForm2.value.companyId = row.id
+  initData3(['1'])
 }
 
 const handleExport = (type) => {