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

src/api/modules/settlement.ts

@@ -9,6 +9,10 @@ const settlementApi = (axiosInstance: ApiInstance) => ({
   platformSettlementExcel: (data: any) => axiosInstance.post('/receivable/platformSettlementExcel',data), // 平台结算记录
   superviseSettlementExcel: (data: any) => axiosInstance.post('/receivable/superviseSettlementExcel', data), // 手续费车险结算记录
   superviseSettlementDetailExcel: (data: any) => axiosInstance.post('/receivable/superviseSettlementDetailExcel', data), // 结算明细
+
+  followSettlementDetailExcel: (data: any) => axiosInstance.post('/receivable/followSettlementDetailExcel', data), // 跟单车险结算明细查询
+
+
   exportSuperviseSettlementExcel: (data: any) => axiosInstance.post('/receivable/exportSuperviseSettlementExcel', data,{ responseType: 'blob' }), // 手续费车险结算报表导出
   exportPlatformSettlementExcel: (data: any) => axiosInstance.post('/receivable/exportPlatformSettlementExcel', data, { responseType: 'blob' }), // 手续费结算报表导出
   exportSuperviseSettlementDetailExcel: (data: any) => axiosInstance.post('/receivable/exportSuperviseSettlementDetailExcel', data, { responseType: 'blob' }), // 手续费车险结算报表导出

src/views/receivable/documentary/documentaryReport.vue

@@ -7,7 +7,7 @@
             <el-col :span="8">
               <el-form-item prop="a" label="保险公司">
                 <el-cascader filterable clearable placeholder="请选择" v-model="recordForm.companyId"
-                :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
+                  :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -86,7 +86,7 @@
             <el-col :span="8">
               <el-form-item prop="a" label="保险公司">
                 <el-cascader filterable clearable placeholder="请选择" v-model="recordForm1.partnerCompanyId"
-                :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
+                  :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -175,9 +175,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="companyId" label="保险公司">
-                <el-cascader filterable clearable placeholder="请选择" v-model="recordForm2.companyId"
-                :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
+              <el-form-item prop="partnerCompanyId" label="保险公司">
+                <el-cascader filterable clearable placeholder="请选择" v-model="recordForm2.partnerCompanyId"
+                  :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -214,25 +214,25 @@
           </el-row>
         </el-form>
         <el-table height="calc(100% - 192px)" :data="recordData2">
-          <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>
-          <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
-          <el-table-column prop="status" label="状态" width="100"></el-table-column>
-          <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
-          <el-table-column prop="productName" label="险种" width="120"></el-table-column>
-          <el-table-column prop="receivableSuperviseCosts" label="应收跟单费" width="100"></el-table-column>
-          <el-table-column prop="jqPremium" label="交强险保费" width="100"></el-table-column>
-          <el-table-column prop="taxPremium" label="车船税" width="100"></el-table-column>
-          <el-table-column prop="jqSuperviseCostsProportion" label="交强险跟单费比例" width="100"></el-table-column>
-          <el-table-column prop="syPremium" label="商业险保费" width="100"></el-table-column>
-          <el-table-column prop="sySuperviseCostsProportion" label="商业险跟单费比例" width="100"></el-table-column>
-          <el-table-column prop="jqPolicyNo" label="交强险保单号" width="200"></el-table-column>
-          <el-table-column prop="syPolicyNo" label="商业险保单号" width="200"></el-table-column>
-          <el-table-column prop="invoicePerson" label="开票人" width="100"></el-table-column>
-          <el-table-column prop="invoiceTime" label="开票时间" width="150"></el-table-column>
-          <el-table-column prop="settlementPerson" label="结算人" width="100"></el-table-column>
-          <el-table-column prop="settlementTime" label="结算时间" width="150"></el-table-column>
+          <el-table-column prop="id" label="开票记录编号" width="200"></el-table-column>
+          <el-table-column prop="companyAllName" label="保险公司" width="100"></el-table-column>
+          <el-table-column prop="partnerCompanyName" label="支公司" width="350" align="center"></el-table-column>
+          <el-table-column prop="companyNameSimple" label="保险机构" width="150"></el-table-column>
+          <el-table-column prop="invoiceNo" label="发票号" width="150"></el-table-column>
+          <el-table-column prop="year" label="年份" width="150"></el-table-column>
+          <el-table-column prop="month" label="月份" width="150"></el-table-column>
+          <el-table-column prop="invoiceParty" label="开票方" width="150"></el-table-column>
+          <el-table-column prop="remainSettlementAmount" label="未结算金额" width="100"></el-table-column>
+          <el-table-column prop="accountsReceivable" label="应收项" width="100"></el-table-column>
+          <el-table-column prop="receivableAmount" label="应收金额" width="120"></el-table-column>
+          <el-table-column prop="paymentReason" label="差额原因" width="120"></el-table-column>
+          <el-table-column prop="taxPoint" label="税点" width="120"></el-table-column>
+          <el-table-column prop="receivableSupervisePremium" label="开票金额" width="120"></el-table-column>
+          <el-table-column prop="settlementStatus" label="结算状态" width="120">
+          </el-table-column>
+          <el-table-column prop="settlementAmount" label="已结算金额" width="120"></el-table-column>
+          <el-table-column prop="createBy" label="开票人" width="120"></el-table-column>
+          <el-table-column prop="createTime" label="开票时间" width="150"></el-table-column>
         </el-table>
         <div class="pagination">
           <el-pagination v-model:current-page="pages" v-model:page-size="size" :page-sizes="[10, 20, 30, 40]"
@@ -252,7 +252,7 @@
             <el-col :span="8">
               <el-form-item prop="companyId" label="保险公司">
                 <el-cascader filterable clearable placeholder="请选择" v-model="recordForm3.companyId"
-                :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
+                  :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -506,7 +506,7 @@ const initData3 = (invoiceTypes) => {
   let params = invoiceTypes.includes('2') ?
     {
       invoiceId: recordForm2.value.invoiceId,
-      companyId: recordForm2.value.companyId,
+      partnerCompanyId: recordForm2.value.partnerCompanyId,
       invoiceParty: recordForm2.value.invoiceParty,
       settlementPerson: recordForm2.value.settlementPerson,
       status: recordForm2.value.status,
@@ -519,7 +519,7 @@ const initData3 = (invoiceTypes) => {
     invoiceTypes.includes('4') ?
       {
         invoiceId: recordForm3.value.invoiceId,
-        companyId: recordForm3.value.companyId,
+        partnerCompanyId: recordForm3.value.partnerCompanyId,
         invoiceParty: recordForm3.value.invoiceParty,
         settlementPerson: recordForm3.value.settlementPerson,
         status: recordForm3.value.status,
@@ -530,7 +530,7 @@ const initData3 = (invoiceTypes) => {
         invoiceTypes: invoiceTypes
       } :
       {}
-  api.settlementApi.superviseSettlementDetailExcel({
+  api.settlementApi.followSettlementDetailExcel({
     ...params
   }).then((res: any) => {
     if (res.code == 200) {
@@ -618,7 +618,7 @@ const handleSettlementDetail = (row) => {
 // 开票明细
 const handleInvoiceRecord = (row) => {
   activeName.value = '3'
-  recordForm2.value.companyId = row.partnerCompanyId
+  recordForm2.value.partnerCompanyId = row.partnerCompanyId
   initData3(['2'])
 }
 
@@ -762,6 +762,7 @@ onMounted(() => {
 :deep(.subTable .el-table__header-wrapper) {
   display: none;
 }
+
 :deep(.el-dropdown-link) {
   display: flex;
   align-items: center;