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

src/views/finance/modules/auditDetail.vue

@@ -1077,7 +1077,7 @@
       <el-button v-if="isShow === '1'" type="primary" @click="handleAudit(1)">审核通过</el-button>
       <el-popconfirm width="300" title="审核不通过">
         <template #reference>
-          <el-button v-if="isShow === '1'" type="primary">审核驳回</el-button>
+          <el-button v-if="isShow === '1'&&![3].includes(detailData?.order?.entryStatus)" type="primary">审核驳回</el-button>
         </template>
         <template #actions="{ confirm, cancel }">
           <el-input placeholder="请填写" v-model="refuse" style="margin-bottom: 20px"></el-input>

src/views/receivable/handingFee/report.vue

@@ -246,7 +246,7 @@
           <el-table-column prop="status" label="状态" width="100"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="productName" label="险种" width="120"></el-table-column>
-          <el-table-column prop="receivableSuperviseCosts" label="应收手续费" width="100"></el-table-column>
+          <el-table-column prop="superviseCostPremiums4Car" label="应收手续费" width="100"></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="jqSuperviseCostsProportion" label="交强险手续费比例" width="100"></el-table-column>
@@ -322,7 +322,7 @@
           <el-table-column prop="status" label="状态" width="100"></el-table-column>
           <el-table-column prop="licenseNo" label="车牌号" width="120"></el-table-column>
           <el-table-column prop="productName" label="险种" width="120"></el-table-column>
-          <el-table-column prop="receivableSuperviseCosts" label="应收手续费" width="100"></el-table-column>
+          <el-table-column prop="jySuperviseCostsPremiums" 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="200"></el-table-column>