bug修改

src/views/receivable/handingFee/index.vue

@@ -29,11 +29,7 @@
                                 />
                             </el-form-item>
                         </el-col>
-                        <el-col :span="8">
-                            <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>
@@ -53,14 +49,22 @@
                                 ></el-cascader>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="8">
+
+
+
+                        <el-col v-show="isTrue" :span="8">
+                            <el-form-item label="订单号">
+                                <el-input v-model="receivableForm.orderNo" 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.riskCode" placeholder="请选择" clearable>
+                                <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 :span="8">
+                        <el-col v-show="isTrue" :span="8">
                             <el-form-item label="订单类型">
                                 <el-select v-model="receivableForm.orderType" placeholder="请选择" clearable>
                                     <el-option label="车险录入" value="1"></el-option>
@@ -69,7 +73,7 @@
                                 </el-select>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="8">
+                         <el-col v-show="isTrue" :span="8">
                             <el-form-item label="被保人">
                                 <el-input v-model="receivableForm.insuredName" placeholder="请输入" clearable></el-input>
                             </el-form-item>
@@ -129,7 +133,7 @@
                     <span class="flex col-160 m-r-8 bg-F9">
                         <el-checkbox class="p-w-12" @change="selectAll" v-model="selectAllValue"></el-checkbox>&nbsp;
                         <el-select class="select-all width-100" placeholder="全选" v-model="selectType" @change="selectTypeChange">
-                            <el-option key="all" value="all" :label="`选中所有数据${selectedTotal1}条`"></el-option>
+                            <el-option key="all" value="all" :label="`选中所有数据${total1}条`"></el-option>
                             <el-option key="cur" value="cur" label="选中本页数据"></el-option>
                         </el-select>
                     </span>
@@ -230,11 +234,7 @@
                                 />
                             </el-form-item>
                         </el-col>
-                        <el-col :span="8">
-                            <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>
@@ -254,14 +254,19 @@
                                 ></el-cascader>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="8">
+                         <el-col v-show="isTrue" :span="8">
+                            <el-form-item label="订单号">
+                                <el-input v-model="receivableForm.orderNo" 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.riskCode" placeholder="请选择" clearable>
+                                <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 :span="8">
+                        <el-col v-show="isTrue" :span="8">
                             <el-form-item label="订单类型">
                                 <el-select v-model="receivableForm.orderType" placeholder="请选择" clearable>
                                     <el-option label="车险录入" value="1"></el-option>
@@ -270,19 +275,14 @@
                                 </el-select>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col v-show="isTrue" :span="8">
                             <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.jqPolicyNo" 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-form-item label="非车险保单号">
+                                <el-input v-model="receivableForm.jyPolicyNo" placeholder="请输入" clearable></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col v-show="isTrue" :span="8">
@@ -330,7 +330,7 @@
                     <span class="flex col-160 m-r-8 bg-F9">
                         <el-checkbox class="p-w-12" @change="selectAll" v-model="selectAllValue"></el-checkbox>&nbsp;
                         <el-select class="select-all width-100" placeholder="全选" v-model="selectType" @change="selectTypeChange">
-                            <el-option key="all" value="all" :label="`选中所有数据${selectedTotal2}条`"></el-option>
+                            <el-option key="all" value="all" :label="`选中所有数据${total2}条`"></el-option>
                             <el-option key="cur" value="cur" label="选中本页数据"></el-option>
                         </el-select>
                     </span>
@@ -367,6 +367,7 @@
                     <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="jqStartDate" label="交强险起保日期" width="150"></el-table-column>
                     <el-table-column prop="syStartDate" label="商业险起保日期" width="150"></el-table-column>
                     <el-table-column prop="createTime" label="创建时间" width="150"></el-table-column>
@@ -630,8 +631,6 @@ let selectedList = ref([])
 let selectType = ref('')
 // 外部全选是否勾选
 let selectAllValue = ref(false)
-let selectedTotal1 = ref(0)
-let selectedTotal2 = ref(0)
 // 外部的全选
 const selectAll = (type: boolean) => {
     if(type) {
@@ -986,8 +985,8 @@ const getCommissionReceivableList = () => {
         signingEndTime: receivableForm.value?.signingTime?.[1],
         orderNo: receivableForm.value?.orderNo,
         agreementId: receivableForm.value?.agreementId,
-        deptId: receivableForm.value?.deptId,
-        riskCode: receivableForm.value?.riskCode,
+        deptId: receivableForm.value?.deptId?.join(),
+        productName: receivableForm.value?.productName,
         orderType: receivableForm.value?.orderType,
         insuredName: receivableForm.value?.insuredName,
         jqPolicyNo: receivableForm.value?.jqPolicyNo,
@@ -1018,12 +1017,11 @@ const getJyReceivableList = () => {
         signingEndTime: receivableForm.value?.signingTime?.[1],
         orderNo: receivableForm.value?.orderNo,
         agreementId: receivableForm.value?.agreementId,
-        deptId: receivableForm.value?.deptId,
-        riskCode: receivableForm.value?.riskCode,
+        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,
+        jyPolicyNo: receivableForm.value?.jyPolicyNo,
         dockingPerson: receivableForm.value?.dockingPerson,
         jqStartDate: receivableForm.value?.jqDate?.[0],
         jqEndDate: receivableForm.value?.jqDate?.[1],