跟单应收页面排版

src/views/receivable/documentary/documentaryRecord.vue

@@ -3,15 +3,10 @@
     <el-form v-model="form" label-width="100">
       <el-row :gutter="20">
         <el-col :span="8">
-          <el-form-item prop="recordId" label="记录编号">
+          <el-form-item prop="recordId" label="开票记录编号">
             <el-input v-model="form.recordId"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item prop="invoiceNo" label="发票号">
-            <el-input v-model="form.invoiceNo"></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item prop="companyId" label="保险公司">
             <el-select v-model="form.companyId" placeholder="请选择" clearable filterable>
@@ -19,6 +14,18 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="保险机构">
+            <el-cascader filterable clearable placeholder="请选择" v-model="form.partnerCompanyId" :options="companyList1"
+              :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="signMonth" label="签单月份">
+            <el-date-picker v-model="form.signMonth" style="width: 100%;" type="month" format="YYYY-MM"
+              value-format="YYYY-MM" />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item prop="invoiceParty" label="开票方">
             <el-select v-model="form.invoiceParty" clearable>
@@ -27,6 +34,22 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item prop="invoiceNo" label="发票号">
+            <el-input v-model="form.invoiceNo"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="invoicePerson" label="开票人">
+            <el-input v-model="form.invoicePerson"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item prop="invoiceDate" label="开票时间">
+            <el-date-picker type="daterange" v-model="form.invoiceDate" value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD HH:mm:ss" />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item prop="accountsReceivable" label="应收项">
             <el-select v-model="form.accountsReceivable" clearable>
@@ -44,27 +67,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item prop="invoicePerson" label="开票人">
-            <el-input v-model="form.invoicePerson"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item prop="invoiceDate" label="开票时间">
-            <el-date-picker type="daterange" v-model="form.invoiceDate" value-format="YYYY-MM-DD HH:mm:ss"
-              format="YYYY-MM-DD HH:mm:ss" />
-          </el-form-item>
-        </el-col>
-          <el-col :span="8">
-              <el-form-item prop="signMonth" label="月份">
-                <el-date-picker v-model="form.signMonth" style="width: 100%;" type="month" format="YYYY-MM" value-format="YYYY-MM" />
-              </el-form-item>
-            </el-col>
-        <el-col :span="8">
-          <el-form-item label="保险分支公司">
-            <el-cascader filterable clearable placeholder="请选择" v-model="form.partnerCompanyId" :options="companyList1"
-              :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
+          <el-form-item prop="amount" label="开票金额">
+            <el-input v-model="form.amount"></el-input>
           </el-form-item>
         </el-col>
+
         <el-col :span="24" style="display: flex; align-items: start; justify-content: flex-end">
           <el-button type="primary" @click="search">查询</el-button>
           <el-button plain type="primary" @click="reset">重置</el-button>
@@ -74,22 +81,19 @@
     <el-table :data="tableData" style="height: calc(100% - 192px)" show-summary :summary-method="getSummaries">
       <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="accountsReceivable" label="应收项" width="100"></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="receivableSupervisePremium" label="开票金额" width="120"></el-table-column>
+      <el-table-column prop="settlementAmount" label="已结算金额" width="120"></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="settlementPaymentDifference" label="回款差额" width="120"></el-table-column>
       <el-table-column prop="settlementPaymentReason" label="差额原因" width="120"></el-table-column>
+      <el-table-column prop="settlementStatus" label="结算状态" width="120"></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="120"></el-table-column>
-      <el-table-column prop="settlementPaymentDifference" 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="invoiceTime" label="开票时间" width="150"></el-table-column>
       <el-table-column label="操作" width="300" fixed="right" align="center">

src/views/receivable/documentary/documentaryReport.vue

@@ -10,32 +10,34 @@
                   :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
               </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-col :span="8">
+              <el-form-item prop="status" label="结算状态">
+                <el-select v-model="recordForm.status" clearable>
+                  <el-option v-for="item in settlement_status" :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="signingTime" label="签单年月">
+                <el-date-picker v-model="recordForm.signingTime" type="monthrange" format="YYYY-MM"
+                  value-format="YYYY-MM" />
+              </el-form-item>
+            </el-col>
+               <el-col :span="8">
               <el-form-item prop="time" label="开票时间">
                 <el-date-picker v-model="recordForm.invoiceTime" 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"
+             <el-col :span="8">
+              <el-form-item prop="receivePaymentDate" label="回款时间">
+                <el-date-picker v-model="recordForm.receivePaymentDate" 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" clearable>
-                  <el-option v-for="item in settlement_status" :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="invoiceRiskType" label="应收项">
                 <el-select v-model="recordForm.invoiceRiskType" clearable>
@@ -44,13 +46,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item prop="signingTime" label="签单时间">
-                <el-date-picker v-model="recordForm.signingTime" type="monthrange" format="YYYY-MM"
-                  value-format="YYYY-MM" />
-              </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="handleSearch(1)">查询</el-button>
               <el-button plain type="primary" @click="handleReset(1)">重置</el-button>
@@ -60,19 +55,21 @@
         <el-table height="500px" :data="recordData" row-key="id"
           :summary-method="val => getSummaries(val, ['totalSettlementAmount'])" show-summary>
           <el-table-column prop="companyName" label="保险公司" width="300"></el-table-column>
-          <el-table-column prop="totalReceivable" label="跟单费金额"></el-table-column>
-          <el-table-column prop="totalReconciliationAmount" label="对账金额"></el-table-column>
-          <el-table-column prop="year" label="年"></el-table-column>
+          <el-table-column prop="partnerCompanyName" label="保险机构" width="300"></el-table-column>
+              <el-table-column prop="invoiceRiskType" label="应收项">
+            <template #default="scope">
+              {{ scope.row.invoiceType == 2 ? '车险' : '非车险' }}
+            </template>
+          </el-table-column>
+            <el-table-column prop="year" label="年"></el-table-column>
           <el-table-column prop="month" label="月"></el-table-column>
+          <el-table-column prop="totalReceivable" label="应收跟单费"></el-table-column>
+          <el-table-column prop="overinflatedAmount" label="虚增金额"></el-table-column>
+          <el-table-column prop="totalReconciliationAmount" label="对账金额"></el-table-column>
           <el-table-column prop="totalInvoiced" label="已开票"></el-table-column>
           <el-table-column prop="totalSettlementAmount" label="已结算"></el-table-column>
           <el-table-column prop="totalUnSettlementAmount" label="未结算"></el-table-column>
           <el-table-column prop="totalUnInvoiced" label="未开票"></el-table-column>
-          <el-table-column prop="invoiceRiskType" label="应收项">
-            <template #default="scope">
-              {{ scope.row.invoiceType == 2 ? '车险' : '非车险' }}
-            </template>
-          </el-table-column>
           <el-table-column prop="totalPaymentDifference" label="回款差额"></el-table-column>
           <el-table-column label="操作" fixed="right" width="120">
             <template #default="scope">
@@ -108,49 +105,33 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="invoiceParty" label="开票方">
-                <el-select v-model="recordForm1.invoiceParty" clearable>
-                  <el-option v-for="item in optionObj['invoice_party']" :key="item.value" :value="item.value"
-                    :label="item.label"></el-option>
-                </el-select>
+              <el-form-item prop="settlementPerson" label="结算人">
+                <el-input v-model="recordForm1.settlementPerson"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="invoiceRiskType" label="应收项">
-                <el-select v-model="recordForm1.invoiceRiskType" 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 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="8">
-              <el-form-item prop="status" label="结算状态">
-                <el-select v-model="recordForm1.status" clearable>
-                  <el-option v-for="item in settlement_status" :key="item.value" :value="item.value"
+              <el-form-item prop="invoiceRiskType" label="应收项">
+                <el-select v-model="recordForm1.invoiceRiskType" 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="settlementPerson" label="结算人">
-                <el-input v-model="recordForm1.settlementPerson"></el-input>
-              </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="invoiceNo" label="发票号">
+                <el-input v-model="recordForm1.invoiceNo"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="invoiceId" label="开票记录编号">
                 <el-input v-model="recordForm1.invoiceId"></el-input>
               </el-form-item>
-            </el-col>
-              <el-col :span="8">
-              <el-form-item prop="signMonth" label="月份">
-                <el-date-picker v-model="recordForm1.signMonth" style="width: 100%;" type="month" format="YYYY-MM" value-format="YYYY-MM" />
-              </el-form-item>
             </el-col>
             <el-col :span="8" style="display: flex; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch(2)">查询</el-button>
@@ -163,21 +144,24 @@
           :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>
+          <el-table-column prop="companyName" label="保险机构" width="200"></el-table-column>
           <el-table-column prop="invoiceRiskTypeName" label="应收项" width="100"></el-table-column>
-          <el-table-column prop="taxPoint" label="税点" width="100"></el-table-column>
+          <el-table-column prop="x" label="开票金额" width="100"></el-table-column>
           <el-table-column prop="actualReceivedAmount" label="实收金额" width="100"></el-table-column>
+          <el-table-column prop="x" label="未结算金额" width="100"></el-table-column>
           <el-table-column prop="settlementPaymentDifference" label="回款差额" width="100"></el-table-column>
           <el-table-column prop="settlementPaymentReason" label="差额原因" width="100"></el-table-column>
-          <el-table-column prop="receivePaymentDate" label="收款日期" width="150"></el-table-column>
-          <el-table-column label="收款凭证" width="100">
+          <el-table-column prop="receivePaymentDate" label="回款日期" width="150"></el-table-column>
+          <el-table-column label="回款凭证" width="100">
             <template #default="scope">
               <el-button link type="primary" @click="view(scope.row)">查看凭证（1）</el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="createBy" label="结算人" width="100"></el-table-column>
-          <el-table-column prop="createTime" label="结算时间" width="200"></el-table-column>
           <el-table-column prop="invoiceId" label="开票记录编号" width="200"></el-table-column>
+          <el-table-column prop="x" label="发票号" width="200"></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="160" fixed="right">
             <template #default="scope">
               <el-button link type="primary" @click="handleDetail(scope.row)">删除</el-button>
@@ -375,11 +359,11 @@ const handleClick = (e) => {
 const settlement_status = ref([
   {
     value: '0',
-    label: '已开票未结清'
+    label: '已开票未结算'
   },
   {
     value: '1',
-    label: '已结清'
+    label: '已结算'
   },
   {
     value: '2',
@@ -526,17 +510,10 @@ const view = (scope) => {
 const initData1 = () => {
   api.settlementApi.followCompanySuperviseSettlementReport({
     ...recordForm.value,
-    companyId: recordForm.value.companyId,
-    signingStartTime: recordForm.value.signingTime?.[0],
-    signingEndTime: recordForm.value.signingTime?.[1],
-    startTime: recordForm.value.time?.[0],
-    endTime: recordForm.value.time?.[1],
     invoiceStartTime: recordForm.value.invoiceTime?.[0],
     invoiceEndTime: recordForm.value.invoiceTime?.[1],
-    settlementStartTime: recordForm.value.settlementTime?.[0],
-    settlementEndTime: recordForm.value.settlementTime?.[1],
-    status: recordForm.value.status,
-    invoiceType: recordForm.value.invoiceRiskType,
+    receivePaymentDateBegin: recordForm.value.receivePaymentDate?.[0],
+    receivePaymentDateEnd: recordForm.value.receivePaymentDate?.[1],
     invoiceTypes: ['2', '4'],
     agreementType: '2'
   }).then((res: any) => {
@@ -549,15 +526,8 @@ const initData2 = () => {
   api.settlementApi.followSettlementExcel({
     ...recordForm1.value,
     agreementType: '2',
-    settlementId: recordForm1.value.settlementId,
-    partnerCompanyId: recordForm1.value.partnerCompanyId,
-    invoiceParty: recordForm1.value.invoiceParty,
-    invoiceRiskType: recordForm1.value.invoiceRiskType,
-    status: recordForm1.value.status,
-    settlementPerson: recordForm1.value.settlementPerson,
-    invoiceId: recordForm1.value.invoiceId,
-    settlementTimeStart: recordForm1.value.settlementTime?.[0],
-    settlementTimeEnd: recordForm1.value.settlementTime?.[1],
+    receivePaymentDateBegin: recordForm1.value.receivePaymentDate?.[0],
+    receivePaymentDateEnd: recordForm1.value.receivePaymentDate?.[1],
     pages: pages.value,
     size: size.value,
     invoiceTypes: ['2', '4']
@@ -635,7 +605,7 @@ const handleReset = (type) => {
         time: [],
         status: ''
       },
-       initData1()
+        initData1()
       break;
     case 2:
       recordForm1.value = {
@@ -649,7 +619,7 @@ const handleReset = (type) => {
         settlementTime: [],
         invoiceId: ''
       },
-       initData2()
+        initData2()
       break;
 
   }

src/views/receivable/documentary/index.vue

@@ -4,50 +4,43 @@
       <el-tab-pane label="车险应收" name="1" class="h-full">
         <el-form v-model="receivableForm" label-width="100">
           <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="车牌号">
-                <el-input v-model="receivableForm.licenseNo" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="保险公司">
                 <el-cascader filterable clearable placeholder="请选择" v-model="receivableForm.companyId"
                   :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="签单时间">
-                <el-date-picker v-model="receivableForm.signingTime" type="daterange" range-separator="至"
-                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            <el-col :span="6">
+              <el-form-item label="车牌号">
+                <el-input v-model="receivableForm.licenseNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="订单号">
                 <el-input v-model="receivableForm.orderNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="出单协议">
-                <el-select v-model="receivableForm.agreementId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in agreementList" :key="item.id" :value="item.id"
-                    :label="item.agreementTitle"></el-option>
+            <el-col :span="6">
+              <el-form-item label="业务员类型">
+                <el-select v-model="receivableForm.typeAttr" placeholder="请选择" clearable>
+                  <el-option label="团队" value="5"></el-option>
+                  <el-option label="个代" value="6"></el-option>
+                  <el-option label="渠道" value="7"></el-option>
+                  <el-option label="电销组" value="8"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="出单机构">
-                <el-cascader style="width: 100%" v-model="receivableForm.deptId" placeholder="请选择" :options="deptOption"
-                  :props="cascaderProps" clearable></el-cascader>
+            <el-col :span="6">
+              <el-form-item label="业务员">
+                <el-input v-model="receivableForm.salesmanName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="险种">
-                <el-select v-model="receivableForm.riskCode" placeholder="请选择" clearable>
-                  <el-option v-for="(item, index) in insuranceType" :label="item.label" :value="item.label"></el-option>
-                </el-select>
+            <el-col :span="6">
+              <el-form-item label="业务员手机号">
+                <el-input v-model="receivableForm.salemanPhone" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="订单类型">
                 <el-select v-model="receivableForm.orderType" placeholder="请选择" clearable>
                   <el-option label="车险录入" value="1"></el-option>
@@ -56,46 +49,68 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
+            <el-col :span="6">
+              <el-form-item label="投保人">
+                <el-input v-model="receivableForm.policyholder" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="被保人">
                 <el-input v-model="receivableForm.insuredName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="出单人类型">
-                <el-select v-model="receivableForm.typeAttr" placeholder="请选择" clearable>
-                  <el-option label="团队" value="5"></el-option>
-                  <el-option label="个代" value="6"></el-option>
-                  <el-option label="渠道" value="7"></el-option>
-                  <el-option label="电销组" value="8"></el-option>
+            <el-col :span="6">
+              <el-form-item label="投保险种">
+                <el-select v-model="receivableForm.riskCode" placeholder="请选择" clearable>
+                  <el-option v-for="(item, index) in insuranceType" :label="item.label" :value="item.label"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="交强险保单号">
-                <el-input v-model="receivableForm.jqPolicyNo" placeholder="请输入" clearable></el-input>
+            <el-col :span="6">
+              <el-form-item label="对接人">
+                <el-input v-model="receivableForm.dockingPerson" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="商业险保单号">
-                <el-input v-model="receivableForm.syPolicyNo" placeholder="请输入" clearable></el-input>
+            <el-col :span="6">
+              <el-form-item label="签单时间">
+                <el-date-picker v-model="receivableForm.signingTime" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="对接人">
-                <el-input v-model="receivableForm.dockingPerson" placeholder="请输入" clearable></el-input>
+            <el-col :span="6">
+              <el-form-item label="支付时间">
+                <el-date-picker v-model="receivableForm.paymentTime" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="交强起保时间">
-                <el-date-picker v-model="receivableForm.jqDate" type="daterange" range-separator="至"
+            <el-col :span="6">
+              <el-form-item label="报价时间">
+                <el-date-picker v-model="receivableForm.quotationTime" type="daterange" range-separator="至"
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="商业起保时间">
-                <el-date-picker v-model="receivableForm.syDate" type="daterange" range-separator="至"
-                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            <el-col :span="6">
+              <el-form-item label="业务状态 (开发中)">
+                <el-select v-model="receivableForm.x" placeholder="请选择" clearable>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="6">
+              <el-form-item label="交强险保单号">
+                <el-input v-model="receivableForm.jqPolicyNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="6">
+              <el-form-item label="商业险保单号">
+                <el-input v-model="receivableForm.syPolicyNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="6">
+              <el-form-item label="出单协议">
+                <el-select v-model="receivableForm.agreementId" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in agreementList" :key="item.id" :value="item.id"
+                    :label="item.agreementTitle"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
@@ -155,36 +170,41 @@
           </span>
           <span>应收金额总计：￥{{ receivedAmountTotal || 0 }}</span>
         </el-row>
-        <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 296px)'"
+        <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 366px)'"
           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>
-          <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
+          <el-table-column prop="signingTime" label="业务状态" width="150"></el-table-column>
           <el-table-column prop="orderNo" label="订单号" width="150"></el-table-column>
-          <el-table-column prop="typeAttrName" label="出单人类型" width="120"></el-table-column>
+          <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="deptName" label="出单机构" width="120"></el-table-column>
-          <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="x" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="licenseNo" 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="productName" label="投保险种" width="100"></el-table-column>
+          <el-table-column prop="agreementName" label="出单协议" width="150"></el-table-column>
+          <el-table-column prop="x" 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="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="jqOtherCostsProportion" label="交强险跟单费比例" width="100"></el-table-column>
           <el-table-column prop="jqOtherCostsPremiums" label="交强险跟单费" width="100"></el-table-column>
-          <el-table-column prop="syPremium" label="商业险保费" width="100"></el-table-column>
           <el-table-column prop="syOtherCostsProportion" label="商业险跟单费比例" width="100"></el-table-column>
           <el-table-column prop="syOtherCostsPremiums" label="商业险跟单费" width="100"></el-table-column>
-          <el-table-column prop="jyOtherCostsPremiums" 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="jqStartDate" label="交强险起保日期" width="150"></el-table-column>
           <el-table-column prop="syStartDate" label="商业险起保日期" width="150"></el-table-column>
-          <el-table-column prop="updateBy" label="修改人" width="100"></el-table-column>
-          <el-table-column prop="createTime" label="创建时间" width="150"></el-table-column>
+          <el-table-column prop="quotationTime" label="报价时间" width="100"></el-table-column>
+          <el-table-column prop="payTime" label="支付时间" width="100"></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="salemanPhone" label="业务员手机号" width="120"></el-table-column>
+          <el-table-column prop="salesmanName" label="业务员" width="120"></el-table-column>
+          <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
           <el-table-column prop="dockingPerson" label="对接人" width="100"></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="120" fixed="right">
             <template #default="scope">
               <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>
@@ -201,50 +221,43 @@
       <el-tab-pane label="非车险应收" name="2" class="h-full">
         <el-form v-model="receivableForm" label-width="100">
           <el-row :gutter="20">
-            <el-col :span="8">
-              <el-form-item label="车牌号">
-                <el-input v-model="receivableForm.licenseNo" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="保险公司">
                 <el-cascader filterable clearable placeholder="请选择" v-model="receivableForm.companyId"
                   :options="companyList" :props="companyIdprops" style="width: 100%;" @change="handleCompanyChange" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="签单时间">
-                <el-date-picker v-model="receivableForm.signingTime" type="daterange" range-separator="至"
-                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            <el-col :span="6">
+              <el-form-item label="车牌号">
+                <el-input v-model="receivableForm.licenseNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="订单号">
                 <el-input v-model="receivableForm.orderNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="出单协议">
-                <el-select v-model="receivableForm.agreementId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in agreementList" :key="item.id" :value="item.id"
-                    :label="item.agreementTitle"></el-option>
+            <el-col :span="6">
+              <el-form-item label="业务员类型">
+                <el-select v-model="receivableForm.typeAttr" placeholder="请选择" clearable>
+                  <el-option label="团队" value="5"></el-option>
+                  <el-option label="个代" value="6"></el-option>
+                  <el-option label="渠道" value="7"></el-option>
+                  <el-option label="电销组" value="8"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="出单机构">
-                <el-cascader style="width: 100%" v-model="receivableForm.deptId" placeholder="请选择" :options="deptOption"
-                  :props="cascaderProps" clearable></el-cascader>
+            <el-col :span="6">
+              <el-form-item label="业务员">
+                <el-input v-model="receivableForm.salesmanName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="险种">
-                <el-select v-model="receivableForm.riskCode" placeholder="请选择" clearable>
-                  <el-option v-for="(item, index) in insuranceType" :label="item.label" :value="item.label"></el-option>
-                </el-select>
+            <el-col :span="6">
+              <el-form-item label="业务员手机号">
+                <el-input v-model="receivableForm.salemanPhone" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="订单类型">
                 <el-select v-model="receivableForm.orderType" placeholder="请选择" clearable>
                   <el-option label="车险录入" value="1"></el-option>
@@ -253,46 +266,63 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
+            <el-col :span="6">
+              <el-form-item label="投保人">
+                <el-input v-model="receivableForm.policyholder" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="被保人">
                 <el-input v-model="receivableForm.insuredName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="出单人类型">
-                <el-select v-model="receivableForm.typeAttr" placeholder="请选择" clearable>
-                  <el-option label="团队" value="5"></el-option>
-                  <el-option label="个代" value="6"></el-option>
-                  <el-option label="渠道" value="7"></el-option>
-                  <el-option label="电销组" value="8"></el-option>
+            <el-col :span="6">
+              <el-form-item label="投保险种">
+                <el-select v-model="receivableForm.riskCode" placeholder="请选择" clearable>
+                  <el-option v-for="(item, index) in insuranceType" :label="item.label" :value="item.label"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="交强险保单号">
-                <el-input v-model="receivableForm.jqPolicyNo" placeholder="请输入" clearable></el-input>
+            <el-col :span="6">
+              <el-form-item label="对接人">
+                <el-input v-model="receivableForm.dockingPerson" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="商业险保单号">
-                <el-input v-model="receivableForm.syPolicyNo" placeholder="请输入" clearable></el-input>
+            <el-col :span="6">
+              <el-form-item label="签单时间">
+                <el-date-picker v-model="receivableForm.signingTime" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="对接人">
-                <el-input v-model="receivableForm.dockingPerson" placeholder="请输入" clearable></el-input>
+            <el-col :span="6">
+              <el-form-item label="支付时间">
+                <el-date-picker v-model="receivableForm.paymentTime" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="交强起保时间">
-                <el-date-picker v-model="receivableForm.jqDate" type="daterange" range-separator="至"
+            <el-col :span="6">
+              <el-form-item label="报价时间（开发中）">
+                <el-date-picker v-model="receivableForm.quoteTime" type="daterange" range-separator="至"
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="商业起保时间">
-                <el-date-picker v-model="receivableForm.syDate" type="daterange" range-separator="至"
-                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+            <el-col :span="6">
+              <el-form-item label="业务状态 (开发中)">
+                <el-select v-model="receivableForm.x" placeholder="请选择" clearable>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="6">
+              <el-form-item label="驾意险保单号">
+                <el-input v-model="receivableForm.jyPolicyNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-show="isTrue" :span="6">
+              <el-form-item label="出单协议">
+                <el-select v-model="receivableForm.agreementId" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in agreementList" :key="item.id" :value="item.id"
+                    :label="item.agreementTitle"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
@@ -338,38 +368,39 @@
           </span>
           <span>应收金额总计：￥{{ JYreceivedAmountTotal || 0 }}</span>
         </el-row>
-        <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 296px)'"
+        <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 356px)'"
           style="width: 100%; margin-top: 20px;" ref="ReceiveDataRef2" @select="handleSelectChange2"
           @select-all="handleSelectAll2" highlight-current-row>
           <el-table-column type="selection" width="50" fixed="left"></el-table-column>
-          <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
+          <el-table-column prop="signingTime" label="业务状态" width="150"></el-table-column>
           <el-table-column prop="orderNo" label="订单号" width="150"></el-table-column>
-          <el-table-column prop="typeAttrName" label="出单人类型" width="120"></el-table-column>
+          <el-table-column prop="signingTime" label="签单时间" width="150"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="deptName" label="出单机构" width="120"></el-table-column>
-          <el-table-column prop="agreementName" label="出单协议" width="150"></el-table-column>
-          <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="x" label="保险机构" width="120"></el-table-column>
           <el-table-column prop="licenseNo" 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">
-            <template #default="scope">
-              {{ Number(scope.row.jyPremium) || ' ' }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="jyOtherCostsPremiums" label="非车跟单费" width="100"></el-table-column>
+          <el-table-column prop="productName" label="投保险种" width="100"></el-table-column>
+          <el-table-column prop="agreementName" label="出单协议" width="150"></el-table-column>
+          <el-table-column prop="x" label="跟单费总金额" width="100"></el-table-column>
+          <el-table-column prop="jyPolicyNo" label="非车险保单号" width="150"></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="jyOtherCostsProportion" label="非车险跟单费比例" width="100">
             <template #default="scope">
               {{ Number(scope.row.jyOtherCostsProportion) || ' ' }}
             </template>
           </el-table-column>
-          <el-table-column prop="jyPolicyNo" label="非车险保单号" width="100"></el-table-column>
-          <el-table-column prop="jqStartDate" label="交强险起保日期" width="150"></el-table-column>
-          <el-table-column prop="syStartDate" label="商业险起保日期" width="150"></el-table-column>
+          <el-table-column prop="jyOtherCostsPremiums" label="非车跟单费" width="100"></el-table-column>
+          <el-table-column prop="x" label="报价时间" width="100"></el-table-column>
+          <el-table-column prop="payTime" label="支付时间" width="100"></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="salemanPhone" label="业务员手机号" width="120"></el-table-column>
+          <el-table-column prop="salesmanName" label="业务员" width="120"></el-table-column>
+          <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
+          <el-table-column prop="dockingPerson" label="对接人" width="100"></el-table-column>
           <el-table-column prop="updateBy" label="修改人" width="100"></el-table-column>
-          <el-table-column prop="createTime" label="创建时间" width="150"></el-table-column>
+          <el-table-column prop="updateTime" label="修改时间" width="150"></el-table-column>
           <el-table-column label="操作" width="180" fixed="right">
             <template #default="scope">
               <div style="display: flex; align-items: center; justify-content: center">
@@ -535,7 +566,8 @@
             下载「标准导入模板」，编辑后上传；系统将自动匹配相关字段
             <el-button link type="primary" @click="downloadImportTemplate">下载模板</el-button>
           </div>
-          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" :show-file-list="false" @change="uploadFile">
+          <el-upload class="upload-demo" drag accept=".xls, .xlsx" :auto-upload="false" :show-file-list="false"
+            @change="uploadFile">
             <el-icon class="el-icon--upload"><upload-filled /></el-icon>
             <div class="el-upload__text">
               点击或将文件拖拽到这里上传
@@ -986,7 +1018,7 @@ const handleBatchEditSubmit = async () => {
 }
 // 单条修改提交
 const handleSingleEditSubmit = async () => {
-  const { code, data, msg } = await api.financeApi.updateInsPlyIncome({...singleForm.value})
+  const { code, data, msg } = await api.financeApi.updateInsPlyIncome({ ...singleForm.value })
   if (code === 200) {
     ElMessage.success(msg)
     singleEditShow.value = false
@@ -997,15 +1029,15 @@ const handleSingleEditSubmit = async () => {
 const toEdit = (row: any) => {
   singleForm.value = {}
   singleEditShow.value = true
-  singleForm.value.incomeId= row.id;
-  singleForm.value.orderNo= row.orderNo;
+  singleForm.value.incomeId = row.id;
+  singleForm.value.orderNo = row.orderNo;
   switch (activeName.value) {
     case '1':
-      singleForm.value.jqPolicyNo= row.jqPolicyNo;
-      singleForm.value.syPolicyNo= row.syPolicyNo;
+      singleForm.value.jqPolicyNo = row.jqPolicyNo;
+      singleForm.value.syPolicyNo = row.syPolicyNo;
       break;
     case '2':
-      singleForm.value.jyPolicyNo= row.jyPolicyNo;
+      singleForm.value.jyPolicyNo = row.jyPolicyNo;
       break;
     default:
   }