手续费应收-车险非车险应收-筛选条件定制-表格字段按需排版

src/views/receivable/handingFee/index.vue

@@ -4,39 +4,23 @@
       <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"
                   style="width: 100%;" :options="companyList" :props="companyIdprops" @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-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-select>
+            <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-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.orderNo" 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.typeAttr" placeholder="请选择" clearable>
                   <el-option label="团队" value="5"></el-option>
@@ -46,28 +30,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="结算状态">
-                <el-select v-model="receivableForm.invoiceSettlementStatus" placeholder="请选择" clearable>
-                  <el-option label="已开票未结算" value="0"></el-option>
-                  <el-option label="已结算" value="1"></el-option>
-                  <el-option label="未开票" value="2"></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.orderNo" placeholder="请输入" clearable></el-input>
+
+            <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 v-show="isTrue" :span="8">
-              <el-form-item label="险种">
-                <el-select v-model="receivableForm.productName" 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.salesman" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :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>
@@ -76,39 +50,94 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="被保人">
-                <el-input v-model="receivableForm.insuredName" placeholder="请输入" clearable></el-input>
+            <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 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.insuredName" 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-select v-model="receivableForm.productName" 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-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-date-picker v-model="receivableForm.jqDate" type="daterange" range-separator="至"
+            <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-date-picker v-model="receivableForm.syDate" type="daterange" range-separator="至"
+            <el-col :span="6">
+              <el-form-item label="支付时间">
+                <el-date-picker v-model="receivableForm.payTime" type="daterange" range-separator="至"
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col :span="16" style="display: flex; align-items: start; justify-content: flex-end">
+            <el-col :span="6">
+              <el-form-item label="报价时间">
+                <el-date-picker v-model="receivableForm.reportTime" type="daterange" range-separator="至"
+                  start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="结算状态">
+                <el-select v-model="receivableForm.invoiceSettlementStatus" placeholder="请选择" clearable>
+                  <el-option label="已开票未结算" value="0"></el-option>
+                  <el-option label="已结算" value="1"></el-option>
+                  <el-option label="未开票" value="2"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="修改人">
+                <el-input v-model="receivableForm.updateBy" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务状态">
+                <el-select v-model="receivableForm.orderStatus" placeholder="请选择" clearable filterable>
+                  <el-option value="退保" label="退保"></el-option>
+                  <el-option value="批加" label="批加"></el-option>
+                </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 v-show="isTrue" :span="6">
+              <el-form-item label="出单机构">
+                <el-cascader style="width: 100%" v-model="receivableForm.deptId" placeholder="请选择" :options="deptOption"
+                  :props="cascaderProps" clearable></el-cascader>
+              </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 @click="reset">重置</el-button>
               <span class="icon_s">
@@ -164,40 +193,44 @@
           </span>
           <span>应收金额总计：￥{{ receivedAmountTotal || 0 }}</span>
         </el-row>
-        <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 414px)' : 'calc(100% - 264px)'"
+        <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 454px)' : 'calc(100% - 404px)'"
           style="width: 100%; margin-top: 20px;" row-key="id" 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="orderNo" label="订单号" width="150"></el-table-column>
-          <el-table-column prop="typeAttrName" label="业务员类型" width="120"></el-table-column>
+          <el-table-column prop="orderStatus" label="业务状态" width="200"></el-table-column>
+          <el-table-column prop="orderNo" label="订单号" width="200"></el-table-column>
+          <el-table-column prop="signingTime" label="签单时间" width="200"></el-table-column>
           <el-table-column prop="companyName" label="保险公司" width="120"></el-table-column>
-          <el-table-column prop="partnerCompanySimplyName" 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="companyNameSimple" label="地区归属" width="150"></el-table-column>
-          <el-table-column prop="invoiceStatusName" label="开票状态" width="100"></el-table-column>
-          <el-table-column prop="invoiceId" label="关联发票" width="100"></el-table-column>
-          <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
+          <el-table-column prop="partnerCompanySimplyName" label="保司机构" width="200"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
-          <el-table-column prop="carInsuranceSuperviseCostsPremiums" 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="taxPremium" label="车船税" width="100"></el-table-column>
-          <el-table-column prop="jqPremium" label="交强险保费" width="100"></el-table-column>
-          <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例" width="100"></el-table-column>
-          <el-table-column prop="jqSuperviseCostsPremiums" 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="sySuperviseCostsPremiums" label="商业手续费" width="100"></el-table-column>
-          <el-table-column prop="otherCostsPremiums" 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="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="dockingPerson" label="对接人" width="100"></el-table-column>
+          <el-table-column prop="jqPremium" label="交强险保费" width="140"></el-table-column>
+          <el-table-column prop="taxPremium" label="车船税" width="120"></el-table-column>
+          <el-table-column prop="syPremium" label="商业险保费" width="140"></el-table-column>
+          <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例" width="140"></el-table-column>
+          <el-table-column prop="jqSuperviseCostsPremiums" label="交强手续费" width="140"></el-table-column>
+          <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例" width="140"></el-table-column>
+          <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="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="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="updateBy" label="修改人" width="200"></el-table-column>
+          <el-table-column prop="xxxxx" 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>
@@ -214,40 +247,24 @@
       <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"
                   style="width: 100%;" :options="companyList" :props="companyIdprops" @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-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-select>
+            <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-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.orderNo" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="出单人类型">
+            <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>
@@ -256,19 +273,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :span="8">
-              <el-form-item label="订单号">
-                <el-input v-model="receivableForm.orderNo" placeholder="请输入" clearable></el-input>
+
+            <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 v-show="isTrue" :span="8">
-              <el-form-item label="险种">
-                <el-select v-model="receivableForm.productName" 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.salesman" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col v-show="isTrue" :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>
@@ -277,34 +293,89 @@
                 </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 v-show="isTrue" :span="8">
-              <el-form-item label="非车险保单号">
-                <el-input v-model="receivableForm.jyPolicyNo" placeholder="请输入" clearable></el-input>
+            <el-col :span="6">
+              <el-form-item label="投保险种">
+                <el-select v-model="receivableForm.productName" 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-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-date-picker v-model="receivableForm.jqDate" type="daterange" range-separator="至"
+            <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 :span="6">
+              <el-form-item label="支付时间">
+                <el-date-picker v-model="receivableForm.payTime" 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="至"
+            <el-col :span="6">
+              <el-form-item label="报价时间">
+                <el-date-picker v-model="receivableForm.reportTime" type="daterange" range-separator="至"
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="display: flex; align-items: center; justify-content: flex-end">
+            <el-col :span="6">
+              <el-form-item label="结算状态">
+                <el-select v-model="receivableForm.invoiceSettlementStatus" placeholder="请选择" clearable>
+                  <el-option label="已开票未结算" value="0"></el-option>
+                  <el-option label="已结算" value="1"></el-option>
+                  <el-option label="未开票" value="2"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="修改人">
+                <el-input v-model="receivableForm.updateBy" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务状态">
+                <el-select v-model="receivableForm.orderStatus" placeholder="请选择" clearable filterable>
+                  <el-option value="退保" label="退保"></el-option>
+                  <el-option value="批加" label="批加"></el-option>
+                </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 v-show="isTrue" :span="6">
+              <el-form-item label="出单机构">
+                <el-cascader style="width: 100%" v-model="receivableForm.deptId" placeholder="请选择" :options="deptOption"
+                  :props="cascaderProps" clearable></el-cascader>
+              </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 @click="reset">重置</el-button>
               <span class="icon_s">
@@ -347,32 +418,38 @@
           </span>
           <span>应收金额总计：￥{{ JYreceivedAmountTotal || 0 }}</span>
         </el-row>
-        <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 396px)' : 'calc(100% - 246px)'"
+        <el-table :data="receiveData" :height="isTrue ? 'calc(100% - 454px)' : 'calc(100% - 404px)'"
           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="orderNo" label="订单号" width="150"></el-table-column>
-          <el-table-column prop="typeAttrName" label="出单人类型" width="120"></el-table-column>
+          <el-table-column prop="orderStatus" label="业务状态" width="200"></el-table-column>
+          <el-table-column prop="orderNo" label="订单号" width="200"></el-table-column>
+          <el-table-column prop="signingTime" label="签单时间" width="200"></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="invoiceId" label="关联发票" width="100"></el-table-column>
-          <el-table-column prop="orderType" label="订单类型" width="100"></el-table-column>
+          <el-table-column prop="partnerCompanySimplyName" label="保司机构" width="200"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="100"></el-table-column>
-          <el-table-column prop="nonCarInsuranceSuperviseCostsPremiums" 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"></el-table-column>
-          <el-table-column prop="jySuperviseCostsProportion" label="非车险手续费比例" width="100"></el-table-column>
-          <el-table-column prop="jyPolicyNo" label="非车险保单号" width="150"></el-table-column>
-          <el-table-column prop="jySuperviseCostsPremiums" 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="dockingPerson" 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="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="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="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="updateBy" label="修改人" width="200"></el-table-column>
+          <el-table-column prop="xxxxx" 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>
@@ -481,7 +558,7 @@
     </el-dialog>
     <el-dialog :close-on-click-modal="false" title="批量修改" v-model="batchEditShow" width="700">
       <el-tabs v-model="subActiveName" class="demo-tabs">
-        <el-tab-pane label="User" name="first" v-if="subActiveName==='first'">
+        <el-tab-pane label="User" name="first" v-if="subActiveName === 'first'">
           <template #label>选中修改（{{ selectedList.length }}）</template>
           <el-form :model="editForm">
             <el-row :gutter="20">
@@ -539,7 +616,7 @@
             </el-row>
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="Config" name="second" v-if="subActiveName==='second'">
+        <el-tab-pane label="Config" name="second" v-if="subActiveName === 'second'">
           <template #label>导入修改</template>
           <div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
             下载「标准导入模板」，编辑后上传；系统将自动匹配相关字段
@@ -751,26 +828,14 @@ const handleInvoice = () => {
 }
 const handleExport = () => {
   api.financeApi.exportSuperviseExcel({
-    invoiceId: receivableForm.value?.invoiceId,
-    licenseNo: receivableForm.value?.licenseNo,
-    typeAttr: receivableForm.value?.typeAttr,
-    companyId: receivableForm.value?.companyId,
+    ...receivableForm.value,
     signingTimeStart: receivableForm.value?.signingTime?.[0],
     signingTimeEnd: receivableForm.value?.signingTime?.[1],
-    invoiceSettlementStatus: receivableForm.value?.invoiceSettlementStatus,
-    orderNo: receivableForm.value?.orderNo,
-    agreementId: receivableForm.value?.agreementId,
+    payTimeBegin: receivableForm.value?.payTime?.[0],
+    payTimeEnd: receivableForm.value?.payTime?.[1],
+    reportTimeBegin: receivableForm.value?.reportTime?.[0],
+    reportTimeEnd: receivableForm.value?.reportTime?.[1],
     deptId: receivableForm.value?.deptId?.join(),
-    productName: receivableForm.value?.productName,
-    orderType: receivableForm.value?.orderType,
-    insuredName: receivableForm.value?.insuredName,
-    jqPolicyNo: receivableForm.value?.jqPolicyNo,
-    syPolicyNo: receivableForm.value?.syPolicyNo,
-    dockingPerson: receivableForm.value?.dockingPerson,
-    jqStartDate: receivableForm.value?.jqDate?.[0],
-    jqEndDate: receivableForm.value?.jqDate?.[1],
-    syStartDate: receivableForm.value?.syDate?.[0],
-    syEndDate: receivableForm.value?.syDate?.[1],
     invoiceType: '1'
   }).then((res: any) => {
     const blob = new Blob([res], { type: 'application/vnd.ms-excel' });
@@ -791,26 +856,13 @@ const handleExport = () => {
 }
 const handleExport1 = () => {
   api.financeApi.exportSuperviseJyExcel({
-    invoiceId: receivableForm.value?.invoiceId,
-    licenseNo: receivableForm.value?.licenseNo,
-    typeAttr: receivableForm.value?.typeAttr,
-    companyId: receivableForm.value?.companyId,
     signingTimeStart: receivableForm.value?.signingTime?.[0],
     signingTimeEnd: receivableForm.value?.signingTime?.[1],
-    invoiceSettlementStatus: receivableForm.value?.invoiceSettlementStatus,
-    orderNo: receivableForm.value?.orderNo,
-    agreementId: receivableForm.value?.agreementId,
+    payTimeBegin: receivableForm.value?.payTime?.[0],
+    payTimeEnd: receivableForm.value?.payTime?.[1],
+    reportTimeBegin: receivableForm.value?.reportTime?.[0],
+    reportTimeEnd: receivableForm.value?.reportTime?.[1],
     deptId: receivableForm.value?.deptId?.join(),
-    productName: receivableForm.value?.productName,
-    orderType: receivableForm.value?.orderType,
-    insuredName: receivableForm.value?.insuredName,
-    jqPolicyNo: receivableForm.value?.jqPolicyNo,
-    syPolicyNo: receivableForm.value?.syPolicyNo,
-    dockingPerson: receivableForm.value?.dockingPerson,
-    jqStartDate: receivableForm.value?.jqDate?.[0],
-    jqEndDate: receivableForm.value?.jqDate?.[1],
-    syStartDate: receivableForm.value?.syDate?.[0],
-    syEndDate: receivableForm.value?.syDate?.[1],
     invoiceType: '3'
   }).then((res: any) => {
     const blob = new Blob([res], { type: 'application/vnd.ms-excel' });
@@ -1074,7 +1126,7 @@ const handleCurrentChange = (page) => {
 }
 // 单条修改提交
 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
@@ -1085,15 +1137,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:
   }
@@ -1127,10 +1179,6 @@ const getreceivedAmountTotal = () => {
     jqPolicyNo: receivableForm.value?.jqPolicyNo,
     syPolicyNo: receivableForm.value?.syPolicyNo,
     dockingPerson: receivableForm.value?.dockingPerson,
-    jqStartDate: receivableForm.value?.jqDate?.[0],
-    jqEndDate: receivableForm.value?.jqDate?.[1],
-    syStartDate: receivableForm.value?.syDate?.[0],
-    syEndDate: receivableForm.value?.syDate?.[1],
     pages: pages.value,
     size: size.value
   }
@@ -1195,26 +1243,14 @@ const reset = () => {
 // 车险列表
 const getCommissionReceivableList = () => {
   let params = {
-    invoiceId: receivableForm.value?.invoiceId,
-    licenseNo: receivableForm.value?.licenseNo,
-    typeAttr: receivableForm.value?.typeAttr,
-    companyId: receivableForm.value?.companyId,
+    ...receivableForm.value,
     signingTimeStart: receivableForm.value?.signingTime?.[0],
     signingTimeEnd: receivableForm.value?.signingTime?.[1],
-    invoiceSettlementStatus: receivableForm.value?.invoiceSettlementStatus,
-    orderNo: receivableForm.value?.orderNo,
-    agreementId: receivableForm.value?.agreementId,
+    reportTimeBegin: receivableForm.value?.reportTime?.[0],
+    reportTimeEnd: receivableForm.value?.reportTime?.[1],
+    payTimeBegin: receivableForm.value?.payTime?.[0],
+    payTimeEnd: receivableForm.value?.payTime?.[1],
     deptId: receivableForm.value?.deptId?.join(),
-    productName: receivableForm.value?.productName,
-    orderType: receivableForm.value?.orderType,
-    insuredName: receivableForm.value?.insuredName,
-    jqPolicyNo: receivableForm.value?.jqPolicyNo,
-    syPolicyNo: receivableForm.value?.syPolicyNo,
-    dockingPerson: receivableForm.value?.dockingPerson,
-    jqStartDate: receivableForm.value?.jqDate?.[0],
-    jqEndDate: receivableForm.value?.jqDate?.[1],
-    syStartDate: receivableForm.value?.syDate?.[0],
-    syEndDate: receivableForm.value?.syDate?.[1],
     invoiceType: '1'
   }
   api.financeApi.getCommissionReceivableList({
@@ -1232,23 +1268,14 @@ const getCommissionReceivableList = () => {
 // 非车险列表
 const getJyReceivableList = () => {
   let params = {
-    licenseNo: receivableForm.value?.licenseNo,
-    typeAttr: receivableForm.value?.typeAttr,
-    companyId: receivableForm.value?.companyId,
+    ...receivableForm.value,
     signingTimeStart: receivableForm.value?.signingTime?.[0],
     signingTimeEnd: receivableForm.value?.signingTime?.[1],
-    orderNo: receivableForm.value?.orderNo,
-    agreementId: receivableForm.value?.agreementId,
+    reportTimeBegin: receivableForm.value?.reportTime?.[0],
+    reportTimeEnd: receivableForm.value?.reportTime?.[1],
+    payTimeBegin: receivableForm.value?.payTime?.[0],
+    payTimeEnd: receivableForm.value?.payTime?.[1],
     deptId: receivableForm.value?.deptId?.join(),
-    productName: receivableForm.value?.productName,
-    orderType: receivableForm.value?.orderType,
-    insuredName: receivableForm.value?.insuredName,
-    jyPolicyNo: receivableForm.value?.jyPolicyNo,
-    dockingPerson: receivableForm.value?.dockingPerson,
-    jqStartDate: receivableForm.value?.jqDate?.[0],
-    jqEndDate: receivableForm.value?.jqDate?.[1],
-    syStartDate: receivableForm.value?.syDate?.[0],
-    syEndDate: receivableForm.value?.syDate?.[1],
     invoiceType: '3'
   }
   api.financeApi.getJyCommissionReceivableList({
@@ -1267,23 +1294,14 @@ const getJyReceivableList = () => {
 }
 const exportData = () => {
   let params = {
-    licenseNo: receivableForm.value?.licenseNo,
-    typeAttr: receivableForm.value?.typeAttr,
-    companyId: receivableForm.value?.companyId,
+    ...receivableForm.value,
     signingTimeStart: receivableForm.value?.signingTime?.[0],
     signingTimeEnd: receivableForm.value?.signingTime?.[1],
-    orderNo: receivableForm.value?.orderNo,
-    agreementId: receivableForm.value?.agreementId,
+    reportTimeBegin: receivableForm.value?.reportTime?.[0],
+    reportTimeEnd: receivableForm.value?.reportTime?.[1],
+    payTimeBegin: receivableForm.value?.payTime?.[0],
+    payTimeEnd: receivableForm.value?.payTime?.[1],
     deptId: receivableForm.value?.deptId?.join(),
-    productName: receivableForm.value?.productName,
-    orderType: receivableForm.value?.orderType,
-    insuredName: receivableForm.value?.insuredName,
-    jyPolicyNo: receivableForm.value?.jyPolicyNo,
-    dockingPerson: receivableForm.value?.dockingPerson,
-    jqStartDate: receivableForm.value?.jqDate?.[0],
-    jqEndDate: receivableForm.value?.jqDate?.[1],
-    syStartDate: receivableForm.value?.syDate?.[0],
-    syEndDate: receivableForm.value?.syDate?.[1],
   }
   api.financeApi.exportTemplateReceivableList(params).then((res: any) => {
     if (res.code == 200) {