Răsfoiți Sursa

跟单开票按钮跳转交互优化

@dongkboy 2 luni în urmă
părinte
comite
c19e5f66ca

+ 5 - 3
src/views/receivable/documentary/index.vue

@@ -563,11 +563,12 @@
 import api from '@/api'
 
 import { ElMessage, ElMessageBox } from "element-plus";
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
+const myRoute = useRoute()
 
 let myRouter = useRouter()
 
-let activeName = ref('1')
+let activeName = ref(myRoute.query.activeindex as any || '1')
 let subActiveName = ref('first')
 const receivedAmountTotal = ref(0)//应收金额总计
 const JYreceivedAmountTotal = ref(0)//驾意险应收金额总计
@@ -865,7 +866,8 @@ const handleInvoiceSubmit = () => {
   myRouter.push({
     name: 'documentaryTicket',
     query: {
-      invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : ''
+      invoiceType: activeName.value == '1' ? '2' : activeName.value == '2' ? '4' : '',
+      activeindex: activeName.value
     }
   })
 }

+ 10 - 2
src/views/receivable/documentary/ticket.vue

@@ -72,7 +72,12 @@
       <el-table-column prop="uninvoiced" label="未开票"></el-table-column>
     </el-table>
     <div class="footer">
-      <el-button plain @click="router.back()">取消</el-button>
+      <el-button plain @click="router.push({
+        path: previousRoute,
+        query: {
+          activeindex: activeindex
+        }
+      })">取消</el-button>
       <el-button plain type="primary" :disabled="selectedList.some(item => item.receivablePremium <= 0)"
         @click="handleTicket(true)">开票并结算</el-button>
       <el-button type="primary" :disabled="selectedList.some(item => item.receivablePremium <= 0)"
@@ -185,6 +190,9 @@ import { ElMessage } from "element-plus";
 
 let router = useRouter()
 let route = useRoute()
+const activeindex = ref(route.query.activeindex)
+// 获取上一个路由的完整信息
+const previousRoute = ref(router.options.history.state.back)
 const selectedList = ref([])//选中的应收单据
 const companyList = ref()//保险公司
 const year = new Date().getFullYear() + ''
@@ -594,4 +602,4 @@ onMounted(() => {
     color: #ccc;
   }
 }
-</style>
+</style>