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

src/views/receivable/handingFee/index.vue

@@ -218,7 +218,7 @@
             <el-col :span="8">
               <el-form-item label="保险公司">
                 <el-select v-model="receivableForm.companyId" placeholder="请选择" clearable filterable>
-                  <el-option v-for="item in companyList" :key="item.companyCode" :value="item.companyCode"
+                  <el-option v-for="item in companyList" :key="item.id" :value="item.id"
                     :label="item.name"></el-option>
                 </el-select>
               </el-form-item>

src/views/receivable/handingFee/report.vue

@@ -72,8 +72,9 @@
           default-expand-all
           :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
           show-summary
+          highlight-current-row
           :summary-method="val => getSummaries(val, ['totalReceivable', 'totalOverinflatedAmount', 'superviseFee', 'SxfInvoicedAmount', 'sxfSettledAmount', 'SxfUnInvoicedAmount', 'sxfUnSettledAmount', 'settlementPaymentDifference'])"
-        >
+          >
           <el-table-column prop="companyName" label="保险公司" width="300" />
           <el-table-column prop="totalReceivable" label="应收金额" align="right" />
           <el-table-column prop="totalOverinflatedAmount" label="虚增金额合计" align="right" />
@@ -336,7 +337,6 @@
           <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="200"></el-table-column>
-          <el-table-column prop="syPolicyNo" label="商业险保单号" width="200"></el-table-column>
           <el-table-column prop="invoicePerson" label="开票人" width="100"></el-table-column>
           <el-table-column prop="invoiceTime" label="开票时间" width="150"></el-table-column>
         </el-table>
@@ -890,4 +890,12 @@ onMounted(() => {
   color: var(--el-color-primary);
   cursor: pointer;
 }
+/* 自定义表格点击高亮颜色 */
+:deep(.el-table__body tr.current-row > td) {
+  background-color: #c1e8fa !important;
+}
+
+:deep(.el-table__body tr.current-row:hover > td) {
+  background-color: #b4ddf8 !important;
+}
 </style>

src/views/receivable/handingFee/ticket.vue

@@ -18,6 +18,7 @@
             <el-option value="licenseNo" label="车牌号"></el-option>
             <el-option value="jqPolicyNo" label="交强险保单号"></el-option>
             <el-option value="syPolicyNo" label="商业险保单号"></el-option>
+            <el-option value="jyPolicyNo" label="非车险保单号"></el-option>
           </el-select>
           <el-select v-model="item.type" v-if="item.name != 'signDate'" style="margin-right: 20px; width: 150px"
             @change="val => signDateSelectChange(index, val)">
@@ -55,7 +56,7 @@
           <el-date-picker v-if="item.name == 'signYear'" style="width: 350px" format="YYYY" value-format="YYYY"
             v-model="yearrangesearch" type="yearrange" range-separator="-" :disabled="item.type == '为空'"
             @change="handlePtlAgreementChange(index, $event)" />
-          <el-input v-if="item.name == 'licenseNo' || item.name == 'jqPolicyNo' || item.name == 'syPolicyNo'"
+          <el-input v-if="item.name == 'licenseNo' || item.name == 'jqPolicyNo' || item.name == 'syPolicyNo' || item.name == 'jyPolicyNo'"
             placeholder="请输入" style="width: 350px" v-model="item.search" />
         </div>
         <el-button type="primary" class="w-88px" @click="handleSearch">搜索</el-button>
@@ -344,6 +345,10 @@ let searchList = ref([
     name: 'syPolicyNo',
     type: '等于',
     search: ''
+  }, {
+    name: 'jyPolicyNo',
+    type: '等于',
+    search: ''
   }
 ])
 if (route.query) {