前后端字段联调

src/views/payCredit/agentCount.vue

@@ -60,7 +60,7 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column prop="mobile" label="业务员手机号"></el-table-column>
+          <el-table-column prop="username" label="业务员手机号"></el-table-column>
           <el-table-column prop="name" label="业务员"></el-table-column>
           <el-table-column prop="leaderName" label="管理员"></el-table-column>
           <el-table-column prop="name" label="姓名"></el-table-column>

src/views/platform/index.vue

@@ -179,7 +179,7 @@
           <span>应收金额总计：￥{{ receivedAmountTotal || 0 }}</span>
 
         </el-row>
-        <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 446px)' : 'calc(100% - 346px)'"
+        <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 446px)' : 'calc(100% - 406px)'"
           style="width: 100%; margin-top: 20px;" ref="ReceiveDataRef1" @select="handleSelectChange1"
           @select-all="handleSelectAll1" highlight-current-row>
           <el-table-column type="selection" width="50" fixed="left"></el-table-column>
@@ -215,15 +215,15 @@
           <el-table-column prop="syStartDate" label="商业险起保日期" width="150"></el-table-column>
           <el-table-column prop="jyStartDate" label="非车起保日期" width="150"></el-table-column>
 
-          <el-table-column prop="x" label="报价时间" width="150"></el-table-column>
-          <el-table-column prop="x" label="支付时间" width="150"></el-table-column>
+          <el-table-column prop="reportTime" label="报价时间" width="150"></el-table-column>
+          <el-table-column prop="payTime" label="支付时间" width="150"></el-table-column>
           <el-table-column prop="deptName" label="出单机构" width="120"></el-table-column>
-          <el-table-column prop="x" label="业务员类型" width="120"></el-table-column>
-          <el-table-column prop="x" label="业务员手机号" width="120"></el-table-column>
-          <el-table-column prop="x" label="业务员" width="120"></el-table-column>
+          <el-table-column prop="typeAttrName" label="业务员类型" width="120"></el-table-column>
+          <el-table-column prop="realQuoteUserId" label="业务员手机号" width="120"></el-table-column>
+          <el-table-column prop="realQuoteUserName" label="业务员" width="120"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
-          <el-table-column prop="x" label="结算人" width="120"></el-table-column>
-          <el-table-column prop="x" label="回款时间" width="120"></el-table-column>
+          <el-table-column prop="settlementName" label="结算人" width="120"></el-table-column>
+          <el-table-column prop="receivePaymentDate" label="回款时间" width="120"></el-table-column>
           <el-table-column prop="updateBy" label="修改人" width="100"></el-table-column>
           <el-table-column prop="updateTime" label="修改时间" width="150"></el-table-column>
           <el-table-column label="操作" width="180" fixed="right">

src/views/platform/platformReport.vue

@@ -1,68 +1,6 @@
 <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-form v-model="recordForm" label-width="120">
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item prop="a" label="保险公司">
-                <el-select v-model="recordForm.companyId" placeholder="请选择" clearable filterable>
-                  <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>
-            <el-col :span="8">
-              <el-form-item prop="contactPerson" label="对接人">
-                <el-input v-model="recordForm.contactPerson" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="contactPersonPhone" label="对接人手机号">
-                <el-input v-model="recordForm.contactPersonPhone" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="time" label="创建时间">
-                <el-date-picker v-model="recordForm.time" type="daterange" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="time" label="结算时间">
-                <el-date-picker v-model="recordForm.settlementTime" type="daterange" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item prop="status" label="结算状态">
-                <el-select v-model="recordForm.status">
-                  <el-option v-for="item in optionObj['settlement_status']" :key="item.value" :value="item.value"
-                    :label="item.label"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
-              <el-button type="primary" @click="initData1()">查询</el-button>
-              <el-button plain type="primary" @click="handleReset(1)">重置</el-button>
-            </el-col>
-          </el-row>
-        </el-form>
-        <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="contactPerson" label="对接人" width="240"></el-table-column>
-          <el-table-column prop="contactPersonPhone" label="对接人手机号" width="240"></el-table-column>
-          <el-table-column prop="totalReceivable" label="应收金额" width="240"></el-table-column>
-          <el-table-column prop="totalSettlementAmount" label="已结算" width="200"></el-table-column>
-          <el-table-column prop="totalUnSettlementAmount" label="未结算" width="200"></el-table-column>
-          <el-table-column prop="totalPaymentDifference" label="回款差额" width="200"></el-table-column>
-          <el-table-column label="操作" fixed="right" width="120">
-            <template #default="scope">
-              <el-button link type="primary" @click="handleSettlementDetail(scope.row)">查看明细</el-button>
-            </template>
-</el-table-column>
-</el-table>
-</el-tab-pane> -->
       <el-tab-pane style="height: 100%" name="2" label="对接人结算报表">
         <el-form v-model="recordForm1" label-width="120">
           <el-row :gutter="20">
@@ -72,23 +10,23 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="settlementTime" label="结算时间">
-                <el-date-picker v-model="recordForm1.settlementTime" type="daterange" format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD" />
+              <el-form-item prop="settlementStatus" label="结算状态">
+                <el-select v-model="recordForm1.settlementStatus" placeholder="请选择" clearable>
+                  <el-option :value="2" label="未结清"></el-option>
+                  <el-option :value="1" label="已结清"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="receivePaymentDate" label="回款时间">
-                <el-date-picker v-model="recordForm1.receivePaymentDate" type="daterange" format="YYYY-MM-DD"
+              <el-form-item prop="settlementTime" label="签单时间">
+                <el-date-picker v-model="recordForm1.signingTime" type="daterange" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="settlementStatus" label="结算状态">
-                <el-select v-model="recordForm1.settlementStatus" placeholder="请选择" clearable>
-                  <el-option :value="2" label="未结清"></el-option>
-                  <el-option :value="1" label="已结清"></el-option>
-                </el-select>
+              <el-form-item prop="receivePaymentDate" label="回款时间">
+                <el-date-picker v-model="recordForm1.receivePaymentDate" type="daterange" format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
             <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
@@ -101,9 +39,9 @@
         <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="totalReceivable" label="应收总计"></el-table-column>
-          <el-table-column prop="settledAmount" label="已结算总计"></el-table-column>
-          <el-table-column prop="unSettledAmount" label="未结算总计"></el-table-column>
+          <el-table-column prop="totalReceivable" label="应收金额"></el-table-column>
+          <el-table-column prop="settledAmount" label="已结算"></el-table-column>
+          <el-table-column prop="unSettledAmount" label="未结算"></el-table-column>
           <el-table-column prop="totalPaymentDifference" label="回款差额"></el-table-column>
           <el-table-column label="操作" width="200" align="center" fixed="right">
             <template #default="scope">
@@ -129,42 +67,65 @@
         <el-form v-model="recordForm2" label-width="120">
           <el-row :gutter="20">
             <el-col :span="8">
-              <el-form-item prop="settlementId" label="结算记录编号">
-                <el-input v-model="recordForm2.settlementId"></el-input>
+              <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>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="contactPerson" label="对接人">
-                <el-input v-model="recordForm2.contactPerson"></el-input>
+              <el-form-item prop="licenseNo" label="车牌号">
+                <el-input v-model="recordForm2.licenseNo"></el-input>
               </el-form-item>
             </el-col>
             <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-select>
+              <el-form-item prop="insurName" label="被保人">
+                <el-input v-model="recordForm2.insurName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="settlementPerson" label="结算人">
-                <el-input v-model="recordForm2.settlementPerson"></el-input>
+              <el-form-item prop="orderNo" label="订单号">
+                <el-input v-model="recordForm2.orderNo"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="settlementTime" label="结算时间">
-                <el-date-picker v-model="recordForm.settlementTime" type="daterange" format="YYYY-MM-DD"
+              <el-form-item prop="signingTime" label="签单时间">
+                <el-date-picker v-model="recordForm2.signingTime" type="daterange" format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="status" label="状态">
-                <el-select v-model="recordForm2.status">
-                  <el-option value="0" label="未结算"></el-option>
-                  <el-option value="1" label="已结算"></el-option>
-                  <el-option value=" " label="全部"></el-option>
+              <el-form-item prop="orderStatus" label="业务状态">
+                <el-select v-model="recordForm2.orderStatus">
+                  <el-option value="0" label="批加"></el-option>
+                  <el-option value="1" label="退保"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item prop="contactPerson" label="对接人">
+                <el-input v-model="recordForm2.contactPerson"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="jqPolicyNo" label="交强保单号">
+                <el-input v-model="recordForm2.jqPolicyNo"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="syPolicyNo" label="商业险保单号">
+                <el-input v-model="recordForm2.syPolicyNo"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="jyPolicyNo" label="非车险保单号">
+                <el-input v-model="recordForm2.jyPolicyNo"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item prop="settlementId" label="结算记录编号">
+                <el-input v-model="recordForm2.settlementId"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="initData3(['1'])">查询</el-button>
               <el-button plain type="primary" @click="handleReset(3)">重置</el-button>
@@ -174,27 +135,35 @@
         </el-form>
         <el-table height="calc(100% - 192px)" :data="recordData2" show-summary
           :summary-method="val => getSummaries(val, ['receivableSuperviseCosts', 'jqPremium', 'syPremium', 'jyPremium', 'taxPremium'])">
-          <el-table-column prop="settlementId" label="结算记录编号" width="200"></el-table-column>
+          <el-table-column prop="orderStatus" label="业务状态" width="200"></el-table-column>
+          <el-table-column prop="orderNo" label="订单号" width="150"></el-table-column>
+          <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
+          <el-table-column prop="x" label="保险机构" width="200"></el-table-column>
           <el-table-column prop="contactPerson" label="对接人" width="150"></el-table-column>
-          <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="150"></el-table-column>
-          <el-table-column prop="productName" label="险种" width="150"></el-table-column>
+          <el-table-column prop="insurName" label="被保人" width="150"></el-table-column>
+          <el-table-column prop="productName" label="投保险种" width="150"></el-table-column>
           <el-table-column prop="receivableSuperviseCosts" label="应收金额" width="150"></el-table-column>
+          <el-table-column prop="jqPolicyNo" label="交强险保单号" width="150"></el-table-column>
+          <el-table-column prop="syPolicyNo" label="商业险保单号" width="150"></el-table-column>
+          <el-table-column prop="jyPolicyNo" label="非车险保单号" width="150"></el-table-column>
           <el-table-column prop="jqPremium" label="交强险保费" width="150"></el-table-column>
           <el-table-column prop="taxPremium" label="车船税" width="150"></el-table-column>
+          <el-table-column prop="syPremium" label="商业险保费" width="150"></el-table-column>
+          <el-table-column prop="jyPremium" label="非车险保费" width="150"></el-table-column>
+          <el-table-column prop="x" label="交强险应收比例" width="150"></el-table-column>
           <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例" width="150"></el-table-column>
           <el-table-column prop="jqOtherCostsProportion" label="交强险跟单费比例" width="150"></el-table-column>
-          <el-table-column prop="syPremium" label="商业险保费" width="150"></el-table-column>
+          <el-table-column prop="x" label="商业险应收比例" width="150"></el-table-column>
           <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例" width="150"></el-table-column>
           <el-table-column prop="syOtherCostsProportion" label="商业险跟单费比例" width="150"></el-table-column>
-          <el-table-column prop="jyPremium" label="非车险保费" width="150"></el-table-column>
+          <el-table-column prop="x" label="非车险应收比例" width="150"></el-table-column>
           <el-table-column prop="jySuperviseCostsProportion" label="非车险手续费比例" width="150"></el-table-column>
           <el-table-column prop="jyOtherCostsProportion" label="非车险跟单费比例" width="150"></el-table-column>
-          <el-table-column prop="a" label="交强险保单号" width="150"></el-table-column>
-          <el-table-column prop="a" label="商业险保单号" width="150"></el-table-column>
+          <el-table-column prop="settlementId" label="结算记录编号" width="200"></el-table-column>
           <el-table-column prop="settlementPerson" label="结算人" width="150"></el-table-column>
-          <el-table-column prop="settlementTime" label="结算时间" width="150"></el-table-column>
+          <el-table-column prop="x" 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]"
@@ -220,7 +189,7 @@ let recordForm2 = ref({})
 let recordData = ref([])
 let recordData1 = ref([])
 let recordData2 = ref([])
-let activeName = ref('2')
+let activeName = ref('3')
 const handleClick = (e) => {
   pages.value = 1
   size.value = 10
@@ -236,11 +205,19 @@ const handleClick = (e) => {
       break;
   }
 }
-
+const companyIdprops = {
+  expandTrigger: 'hover' as const,
+  value: 'id',
+  label: 'name',
+  checkStrictly: true,
+}
+const handleCompanyChange = (e: any) => {
+  recordForm2.value.companyId = e[e.length - 1] || ''
+}
 // 保险公司
 let companyList = ref([])
 const initCompany = () => {
-  api.insuranceApi.leftList('').then((res: any) => {
+  api.agreementApi.findTree({ name: "", systemCode: localStorage.getItem('login_system') }).then((res: any) => {
     if (res.code == 200) {
       companyList.value = res.data
     }
@@ -329,20 +306,13 @@ const initData1 = () => {
 }
 const initData2 = () => {
   api.settlementApi.receiverSettlementReport({
-    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,
-    startTime: recordForm1.value.settlementTime?.[0],
-    endTime: recordForm1.value.settlementTime?.[1],
+    ...recordForm1.value,
+    signingStartTime: recordForm1.value.signingTime?.[0],
+    signingEndTime: recordForm1.value.signingTime?.[1],
     receivePaymentDateBegin: recordForm1.value.receivePaymentDate?.[0],
     receivePaymentDateEnd: recordForm1.value.receivePaymentDate?.[1],
     pages: pages.value,
     size: size.value,
-    settlementStatus: recordForm1.value.settlementStatus,
     invoiceTypes: ['5', '6']
   }).then((res: any) => {
     if (res.code == 200) {
@@ -354,8 +324,8 @@ const initData2 = () => {
 const initData3 = () => {
   api.settlementApi.superviseSettlementDetailExcel({
     ...recordForm2.value,
-    settlementTimeStart: recordForm2.value.settlementTime?.[0],
-    settlementTimeEnd: recordForm2.value.settlementTime?.[1],
+    signingStartTime: recordForm2.value.signingTime?.[0],
+    signingEndTime: recordForm2.value.signingTime?.[1],
     pages: pages.value,
     size: size.value,
     status: recordForm2.value.status,

src/views/receivable/handingFee/index.vue

@@ -205,9 +205,9 @@
           <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
           <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
           <el-table-column prop="productName" label="投保险种" width="100"></el-table-column>
-          <el-table-column prop="xxxxxx" label="结算状态(开发中)" width="100"></el-table-column>
-          <el-table-column prop="xxxxxx" label="发票号(开发中)" width="100"></el-table-column>
-          <el-table-column prop="xxxxxx" label="手续费总金额(开发中)" width="100"></el-table-column>
+          <el-table-column prop="settlementStatusName" label="结算状态" width="100"></el-table-column>
+          <el-table-column prop="invoiceNo" label="发票号" width="100"></el-table-column>
+          <el-table-column prop="superviseAmount" label="手续费总金额" width="100"></el-table-column>
           <el-table-column prop="jqPolicyNo" label="交强险保单号" width="150"></el-table-column>
           <el-table-column prop="syPolicyNo" label="商业险保单号" width="150"></el-table-column>
           <el-table-column prop="jqPremium" label="交强险保费" width="140"></el-table-column>
@@ -219,18 +219,18 @@
           <el-table-column prop="sySuperviseCostsPremiums" label="商业手续费" width="140"></el-table-column>
           <el-table-column prop="jqStartDate" label="交强险起保日期" width="200"></el-table-column>
           <el-table-column prop="syStartDate" label="商业险起保日期" width="200"></el-table-column>
-          <el-table-column prop="reportTime" label="报价时间(开发中)" width="200"></el-table-column>
-          <el-table-column prop="xxxx" label="支付时间(开发中)" width="200"></el-table-column>
+          <el-table-column prop="reportTime" label="报价时间" width="200"></el-table-column>
+          <el-table-column prop="payTime" label="支付时间" width="200"></el-table-column>
           <el-table-column prop="deptName" label="出单机构" width="120"></el-table-column>
           <el-table-column prop="typeAttrName" label="业务员类型" width="120"></el-table-column>
-          <el-table-column prop="salesman" label="业务员手机号" width="120"></el-table-column>
-          <el-table-column prop="salesmanName" label="业务员" width="120"></el-table-column>
+          <el-table-column prop="realQuoteUserId" label="业务员手机号" width="120"></el-table-column>
+          <el-table-column prop="realQuoteUserName" label="业务员" width="120"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="200"></el-table-column>
-          <el-table-column prop="xxxxx" label="结算人" width="200"></el-table-column>
-          <el-table-column prop="xxxxx" label="回款时间" width="200"></el-table-column>
+          <el-table-column prop="settlementName" label="结算人" width="200"></el-table-column>
+          <el-table-column prop="receivePaymentDate" label="回款时间" width="200"></el-table-column>
           <el-table-column prop="updateBy" label="修改人" width="200"></el-table-column>
-          <el-table-column prop="xxxxx" label="修改时间" width="200"></el-table-column>
+          <el-table-column prop="updateTime" label="修改时间" width="200"></el-table-column>
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="scope">
               <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>
@@ -430,26 +430,26 @@
           <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
           <el-table-column prop="insuredPerson" label="被保人" width="100"></el-table-column>
           <el-table-column prop="productName" label="投保险种" width="100"></el-table-column>
-          <el-table-column prop="xxxxxx" label="结算状态(开发中)" width="100"></el-table-column>
-          <el-table-column prop="xxxxxx" label="发票号(开发中)" width="100"></el-table-column>
-          <el-table-column prop="xxxxxx" label="手续费总金额(开发中)" width="100"></el-table-column>
+          <el-table-column prop="settlementStatusName" label="结算状态" width="100"></el-table-column>
+          <el-table-column prop="invoiceNo" label="发票号" width="100"></el-table-column>
+          <el-table-column prop="superviseAmount" label="手续费总金额" width="100"></el-table-column>
           <el-table-column prop="jyPolicyNo" label="驾意险保单号" width="150"></el-table-column>
           <el-table-column prop="jyPremium" label="驾意险保费" width="140"></el-table-column>
           <el-table-column prop="taxPremium" label="车船税" width="120"></el-table-column>
           <el-table-column prop="jySuperviseCostsProportion" label="驾意险手续费比例" width="140"></el-table-column>
           <el-table-column prop="jySuperviseCostsPremiums" label="驾意手续费" width="140"></el-table-column>
-          <el-table-column prop="reportTime" label="报价时间(开发中)" width="200"></el-table-column>
-          <el-table-column prop="xxxx" label="支付时间(开发中)" width="200"></el-table-column>
+          <el-table-column prop="reportTime" label="报价时间" width="200"></el-table-column>
+          <el-table-column prop="payTime" label="支付时间" width="200"></el-table-column>
           <el-table-column prop="deptName" label="出单机构" width="120"></el-table-column>
           <el-table-column prop="typeAttrName" label="业务员类型" width="120"></el-table-column>
-          <el-table-column prop="salesman" label="业务员手机号" width="120"></el-table-column>
-          <el-table-column prop="salesmanName" label="业务员" width="120"></el-table-column>
+          <el-table-column prop="realQuoteUserId" label="业务员手机号" width="120"></el-table-column>
+          <el-table-column prop="realQuoteUserName  " label="业务员" width="120"></el-table-column>
           <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="200"></el-table-column>
-          <el-table-column prop="xxxxx" label="结算人" width="200"></el-table-column>
-          <el-table-column prop="xxxxx" label="回款时间" width="200"></el-table-column>
+          <el-table-column prop="settlementName" label="结算人" width="200"></el-table-column>
+          <el-table-column prop="receivePaymentDate" label="回款时间" width="200"></el-table-column>
           <el-table-column prop="updateBy" label="修改人" width="200"></el-table-column>
-          <el-table-column prop="xxxxx" label="修改时间" width="200"></el-table-column>
+          <el-table-column prop="updateTime" label="修改时间" width="200"></el-table-column>
           <el-table-column label="操作" width="160" fixed="right">
             <template #default="scope">
               <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>

src/views/receivable/handingFee/invoiceRecord.vue

@@ -1,6 +1,6 @@
 <template>
   <PageMain class="vh100">
-    <el-form v-model="form" label-width="80">
+    <el-form v-model="form" label-width="100">
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item prop="recordId" label="开票记录编号">

src/views/receivable/handingFee/report.vue

@@ -139,25 +139,24 @@
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="partnerCompanyName" label="保险机构" width="200"></el-table-column>
           <el-table-column prop="invoiceRiskTypeName" label="应收项" width="100"></el-table-column>
-          <el-table-column prop="xxxxxxxxxxxxx" label="开票金额" width="100"></el-table-column>
+          <el-table-column prop="receivableSupervisePremium" label="开票金额" width="100"></el-table-column>
           <el-table-column prop="actualReceivedAmount" label="实收金额" width="100"></el-table-column>
-          <el-table-column prop="xxxxxxxxxxxxxxxxxx" label="未结算金额" width="100"></el-table-column>
+          <!-- <el-table-column prop="xxxxxxxxxxxxxxxxxx" 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="xxxxxxxxxxxxxxxx" label="回款时间" width="100"></el-table-column>
-          <el-table-column prop="xxxxxxxxxxxxxxxx" label="回款凭证" width="100"></el-table-column>
-          <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
-          <el-table-column prop="x" label="发票号" width="150"></el-table-column>
-          <el-table-column prop="invoiceParty" label="开票方" width="150"></el-table-column>
-          <el-table-column prop="taxPoint" label="税点" width="100"></el-table-column>
-          <el-table-column prop="createBy" label="结算人" width="100"></el-table-column>
-          <!-- <el-table-column label="收款凭证" width="100">
+          <el-table-column prop="receivePaymentDate" label="回款时间" width="100"></el-table-column>
+          <el-table-column label="回款凭证" width="100">
             <template #default="scope">
               <el-button link type="primary" v-if="scope.row.fileUrl" @click="view(scope.row)">查看凭证（{{
                 scope.row.fileUrl.split(',').length }}）</el-button>
               <span v-else>无凭证</span>
             </template>
-          </el-table-column> -->
+          </el-table-column>
+          <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
+          <el-table-column prop="invoiceNo" label="发票号" width="150"></el-table-column>
+          <el-table-column prop="invoiceParty" label="开票方" width="150"></el-table-column>
+          <el-table-column prop="taxPoint" label="税点" width="100"></el-table-column>
+          <el-table-column prop="createBy" label="结算人" width="100"></el-table-column>
           <el-table-column label="操作" width="200" align="center" fixed="right">
             <template #default="scope">
               <el-button link type="primary" @click="handleDetail(scope.row)">删除</el-button>
@@ -188,8 +187,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="theInsuredPerson" label="被保人">
-                <el-input v-model="recordForm2.theInsuredPerson"></el-input>
+              <el-form-item prop="insurName" label="被保人">
+                <el-input v-model="recordForm2.insurName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -250,25 +249,25 @@
           <el-table-column prop="signingTime" label="签单时间" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
-          <el-table-column prop="" 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="x" label="结算状态" width="120"></el-table-column>
-          <el-table-column prop="x" label="手续费总金额" width="120"></el-table-column>
+          <el-table-column prop="settlementStatusName" label="结算状态" width="120"></el-table-column>
+          <el-table-column prop="superviseCostPremiums4Car" label="手续费总金额" width="120"></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="jqPremium" label="交强险保费" width="100"></el-table-column>
           <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="jqSuperviseCostsProportion" label="交强险手续费比例" width="100"></el-table-column>
-          <el-table-column prop="x" label="交强险手续费金额" width="100"></el-table-column>
+          <el-table-column prop="jqSuperviseCostsPremiums" label="交强险手续费金额" width="100"></el-table-column>
           <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例" width="100"></el-table-column>
-          <el-table-column prop="x" label="商业险手续费金额" width="100"></el-table-column>
+          <el-table-column prop="sySuperviseCostsPremiums" label="商业险手续费金额" width="100"></el-table-column>
           <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
-          <el-table-column prop="x" label="发票号" width="100"></el-table-column>
+          <el-table-column prop="invoiceNo" label="发票号" width="100"></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="x" label="回款时间" width="150"></el-table-column>
+          <el-table-column prop="receivePaymentDate" 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]"
@@ -293,8 +292,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="theInsuredPerson" label="被保人">
-                <el-input v-model="recordForm3.theInsuredPerson"></el-input>
+              <el-form-item prop="insurName" label="被保人">
+                <el-input v-model="recordForm3.insurName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -349,21 +348,21 @@
           <el-table-column prop="signingTime" label="签单时间" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="200"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
-          <el-table-column prop="" 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="x" label="结算状态" width="120"></el-table-column>
-          <el-table-column prop="x" label="手续费总金额" width="120"></el-table-column>
+          <el-table-column prop="settlementStatusName" label="结算状态" width="120"></el-table-column>
+          <el-table-column prop="jySuperviseCostsPremiums" label="手续费总金额" width="120"></el-table-column>
           <el-table-column prop="jyPolicyNo" label="非车险保单号" width="200"></el-table-column>
           <el-table-column prop="jyPremium" label="非车险保费" width="100"></el-table-column>
           <el-table-column prop="taxPremium" label="车船税" width="100"></el-table-column>
-          <el-table-column prop="x" label="非车险手续费金额" width="100"></el-table-column>
+          <el-table-column prop="jqSuperviseCostsPremiums" label="非车险手续费金额" width="100"></el-table-column>
           <el-table-column prop="jySuperviseCostsProportion" label="非车险手续费比例" width="100"></el-table-column>
           <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
-          <el-table-column prop="x" label="发票号" width="100"></el-table-column>
+          <el-table-column prop="sySuperviseCostsPremiums" label="发票号" width="100"></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="x" label="回款时间" width="150"></el-table-column>
+          <el-table-column prop="receivePaymentDate" 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]"
@@ -444,7 +443,7 @@ const handleCompanyChange = (e, type) => {
       break;
   }
 }
-let activeName = ref('3')
+let activeName = ref('1')
 const handleClick = (e) => {
   pages.value = 1
   size.value = 10