手续费应收-应收开票后返回上一级对应列表页

src/views/receivable/handingFee/index.vue

@@ -383,7 +383,7 @@
                     <el-dropdown-item command="数据导入">数据导入</el-dropdown-item>
                   </el-dropdown-menu>
                 </template>
-              </el-dropdown> -->
+      </el-dropdown> -->
             </template>
           </el-table-column>
         </el-table>
@@ -481,14 +481,14 @@
           <el-form :model="editForm">
             <el-radio v-model="feeRate">手续费比例</el-radio>
             <el-row :gutter="20">
-              <el-col :span="12"  v-if="activeName === '1'">
+              <el-col :span="12" v-if="activeName === '1'">
                 <el-form-item label="交强险手续费比例">
                   <el-input v-model="editForm.jqSuperviseCostsProportion">
                     <template #append>%</template>
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="12"  v-if="activeName === '1'">
+              <el-col :span="12" v-if="activeName === '1'">
                 <el-form-item label="商业险手续费比例">
                   <el-input v-model="editForm.sySuperviseCostsProportion">
                     <template #append>%</template>
@@ -569,10 +569,8 @@ import { useRouter } from 'vue-router'
 import api from '@/api'
 
 const route = useRoute()
-
 let myRouter = useRouter()
-
-let activeName = ref('1')
+let activeName = ref( route.query.activeindex as any ||'1')
 let subActiveName = ref('first')
 const receivedAmountTotal = ref(0)//应收金额总计
 const JYreceivedAmountTotal = ref(0)//驾意险应收金额总计
@@ -679,7 +677,9 @@ const handleInvoice = () => {
     myRouter.push({
       name: 'HandingFeeTicket',
       query: {
-        invoiceType: activeName.value == '1' ? '1' : activeName.value == '2' ? '3' : ''
+        invoiceType: activeName.value == '1' ? '1' : activeName.value == '2' ? '3' : '',
+        activeindex: activeName.value
+
       }
     })
   } else {
@@ -1101,7 +1101,7 @@ const getCommissionReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
-    invoiceType:'1'
+    invoiceType: '1'
   }
   api.financeApi.getCommissionReceivableList({
     ...params,
@@ -1135,7 +1135,7 @@ const getJyReceivableList = () => {
     jqEndDate: receivableForm.value?.jqDate?.[1],
     syStartDate: receivableForm.value?.syDate?.[0],
     syEndDate: receivableForm.value?.syDate?.[1],
-    invoiceType:'3'
+    invoiceType: '3'
   }
   api.financeApi.getJyCommissionReceivableList({
     ...params,
@@ -1147,13 +1147,7 @@ const getJyReceivableList = () => {
       allData.value = res.data.insPlyIncomeOrders
       total2.value = res.data.insPlyIncomePage.total
       JYreceivedAmountTotal.value = res.data.allAmount
-      receiveData.value.forEach(element => {
-        if (selectedList.value.find(v => v.id === element.id)) {
-          nextTick(() => {
-            ReceiveDataRef2.value!.toggleRowSelection(element, true)
-          })
-        }
-      });
+
     }
   })
 }
@@ -1242,6 +1236,7 @@ onMounted(() => {
 :deep(.el-radio) {
   width: 100%;
 }
+
 /* 自定义表格点击高亮颜色 */
 :deep(.el-table__body tr.current-row > td) {
   background-color: #c1e8fa !important;

src/views/receivable/handingFee/ticket.vue

@@ -93,7 +93,12 @@
         label="非车险应收"></el-table-column>
     </el-table>
     <div class="footer">
-      <el-button plain @click="handleBack">取消</el-button>
+      <el-button plain @click="router.push({
+        path: previousRoute,
+        query: {
+          activeindex: activeindex
+        }
+      })">取消</el-button>
       <el-button plain type="primary" @click="handleTicket(true)">开票并结算</el-button>
       <el-button type="primary" @click="handleTicket(false)">开票</el-button>
     </div>
@@ -272,6 +277,9 @@ import { registerRuntimeCompiler } from 'vue';
 let route = useRoute()
 let router = useRouter()
 let batchShow = ref(false)
+const activeindex = ref(route.query.activeindex)
+// 获取上一个路由的完整信息
+const previousRoute = ref(router.options.history.state.back)
 const selectedList = ref([])//选中的应收单据
 const companyList = ref()//保险公司
 const insurerContract = ref()//保险公司协议