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

src/views/platform/platformReport.vue

@@ -158,13 +158,13 @@
           <el-table-column prop="jqPremium" label="交强险保费" width="150"></el-table-column>
           <el-table-column prop="taxPremium" label="车船税" width="150"></el-table-column>
           <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例" width="150"></el-table-column>
-          <el-table-column prop="a" label="交强险跟单费比例" width="150"></el-table-column>
+          <el-table-column prop="jqOtherCostsProportion" label="交强险跟单费比例" width="150"></el-table-column>
           <el-table-column prop="syPremium" label="商业险保费" width="150"></el-table-column>
           <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例" width="150"></el-table-column>
-          <el-table-column prop="a" label="商业险跟单费比例" width="150"></el-table-column>
+          <el-table-column prop="syOtherCostsProportion" label="商业险跟单费比例" width="150"></el-table-column>
           <el-table-column prop="jyPremium" label="非车险保费" width="150"></el-table-column>
           <el-table-column prop="jySuperviseCostsProportion" label="非车险手续费比例" width="150"></el-table-column>
-          <el-table-column prop="a" label="非车险跟单费比例" width="150"></el-table-column>
+          <el-table-column prop="jyOtherCostsProportion" label="非车险跟单费比例" width="150"></el-table-column>
           <el-table-column prop="a" label="交强险保单号" width="150"></el-table-column>
           <el-table-column prop="a" label="商业险保单号" width="150"></el-table-column>
           <el-table-column prop="settlementPerson" label="结算人" width="150"></el-table-column>

src/views/receivable/documentary/index.vue

@@ -129,7 +129,7 @@
           </div>
           <span class="col-108 m-r-8">
             <el-button class="radius-2px width-100"
-              :disabled="selectedList.some(item => item.invoiceStatusName === '已开票' || item.disableFlag === '1')  "
+              :disabled="selectedList.some(item => item.invoiceStatusName === '已开票' || item.disableFlag === '1')"
               @click="handleBatchEdit">批量修改比例</el-button>
           </span>
           <span class="col-108 m-r-8">
@@ -141,7 +141,8 @@
               </el-button>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item  :disabled="selectedList.some(item =>item.disableFlag === '1')" command="删除">删除</el-dropdown-item>
+                  <el-dropdown-item :disabled="selectedList.some(item => item.disableFlag === '1')"
+                    command="删除">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </template>
             </el-dropdown>
@@ -568,6 +569,9 @@ const myRoute = useRoute()
 let myRouter = useRouter()
 
 let activeName = ref(myRoute.query.activeindex as any || '1')
+console.log(activeName.value)
+
+
 let subActiveName = ref('first')
 const receivedAmountTotal = ref(0)//应收金额总计
 const JYreceivedAmountTotal = ref(0)//驾意险应收金额总计
@@ -1216,9 +1220,13 @@ onMounted(() => {
   dictDetails();
   initCompany();
   initDept();
-  getOtherReceivableList();
-  getreceivedAmountTotal();
   getagreementList();
+  if (activeName.value == '1') {
+    getOtherReceivableList()
+    getreceivedAmountTotal()
+  } else if (activeName.value == '2') {
+    getJyOtherReceivableList()
+  }
 })
 
 </script>
@@ -1257,6 +1265,7 @@ onMounted(() => {
 :deep(.el-radio) {
   width: 100%;
 }
+
 /* 自定义表格点击高亮颜色 */
 :deep(.el-table__body tr.current-row > td) {
   background-color: #c1e8fa !important;
@@ -1265,4 +1274,4 @@ onMounted(() => {
 :deep(.el-table__body tr.current-row:hover > td) {
   background-color: #b4ddf8 !important;
 }
-</style>
+</style>

src/views/receivable/handingFee/ticket.vue

@@ -89,7 +89,7 @@
       <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例"></el-table-column>
       <el-table-column prop="receivableAmount" label="总应收"></el-table-column>
       <el-table-column v-if="route.query.invoiceType == '1'" prop="receivableAmount4Car" label="车险应收"></el-table-column>
-      <el-table-column v-if="route.query.invoiceType == '3'" prop="receivableAmount4Other"
+      <el-table-column v-if="route.query.invoiceType == '3'" prop="nonCarInsuranceSuperviseCostsPremiums"
         label="非车险应收"></el-table-column>
     </el-table>
     <div class="footer">