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

src/views/finance/modules/auditDetail.vue

@@ -587,7 +587,7 @@
             <div v-else style="display: flex; align-items: center; justify-content: flex-end">
               <el-button size="small" type="primary" plain @click="costShow = false">取消调整</el-button>
               <el-button size="small" type="primary" plain @click="handleComputedCostInfo">留点计算</el-button>
-              <el-button size="small" type="primary" plain @click="handleSaveCostChange">保存</el-button>
+              <el-button size="small" type="primary" :loading="handleSaveCostloading" plain @click="handleSaveCostChange">保存</el-button>
             </div>
           </div>
         </div>
@@ -1155,6 +1155,8 @@ const previousRoute = ref(myRouter.options.history.state.back)
 const getAssetsFile = (url: string) => {
   return new URL(`../../../assets/images/insurancePolicy/${url}.png`, import.meta.url).href;
 };
+// 保存费用信息loading
+let handleSaveCostloading = ref(false)
 // 页签
 let tipsIndex = ref('TBMsg')
 let tipsList = ref([
@@ -1342,11 +1344,13 @@ const handleComputedCostInfo = () => {
 }
 // 保存费用
 const handleSaveCostChange = () => {
+  handleSaveCostloading.value = true
   api.financeApi.saveCostInfo({
     ...detailData.value.costRatio,
     orderNo: myRoute.query.id
   }).then((res: any) => {
     if (res.code == 200) {
+      handleSaveCostloading.value = false
       ElMessage({
         message: '调整成功',
         type: 'success'

src/views/receivable/handingFee/ticket.vue

@@ -69,7 +69,7 @@
       <el-button type="primary" @click="addTicket">添加应收</el-button>
     </div>
     <el-table :data="tableData" style="height: calc(100% - 300px)" show-summary
-      :summary-method="val => getSummaries(val, ['jqPremium', 'jqSuperviseCostsProportion', 'syPremium', 'sySuperviseCostsProportion', 'receivableAmount', 'receivableAmount4Car', 'receivableAmount4Other'])">
+      :summary-method="val => getSummaries(val, ['jqPremium', 'jqSuperviseCostsProportion', 'syPremium', 'sySuperviseCostsProportion', 'receivableAmount', 'receivableAmount4Car', 'receivableAmount4Other','carInsuranceSuperviseCostsPremiums','carInsuranceSuperviseCostsPremiums'])">
       <template #empty>
         <div v-if="noData">暂无应收，点击<el-button link type="primary" @click="batchShow = true">导入应收</el-button></div>
         <div v-else>没有符合的应收单据~</div>
@@ -89,7 +89,6 @@
       <el-table-column prop="jqSuperviseCostsProportion" label="交强险手续费比例"></el-table-column>
       <el-table-column prop="syPremium" label="商业险保费"></el-table-column>
       <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="carInsuranceSuperviseCostsPremiums" label="车险手续费"></el-table-column>
       <el-table-column v-if="route.query.invoiceType == '3'" prop="nonCarInsuranceSuperviseCostsPremiums"
         label="非车险手续费"></el-table-column>