diff --git a/src/components/ActionBar/index.vue b/src/components/ActionBar/index.vue index a4702530..b483fd0d 100644 --- a/src/components/ActionBar/index.vue +++ b/src/components/ActionBar/index.vue @@ -199,6 +199,7 @@ import { useRoute } from 'vue-router' import { useGo } from '/@/hooks/web/usePage' import { closePage } from '/@/hooks/web/common' + import { setObjToUrlParams } from '/@/utils' export default defineComponent({ name: 'ActionBar', props: { @@ -335,21 +336,22 @@ extraIndex = index - 1 } else { // 下一票 - if (index == 19) { + if (index == ids.length - 1) { return createMessage.warning('该票为当前页码最后一票!') } id = ids[index + 1] extraIndex = index + 1 } - const extraQuery = props?.getExtraQuery(extraIndex) || {} + const extraQuery = props?.getExtraQuery ? props?.getExtraQuery(extraIndex) : {} + const goParams = { + id, + ...extraQuery, + } go({ path: route.path, - query: { - id, - ...extraQuery, - }, + query: goParams, }) - closePage(route.path + '?id=' + id) + closePage(setObjToUrlParams(route.path, goParams)) } else { createMessage.warning('列表页面数据丢失,请回退列表页面后重试!') } diff --git a/src/views/financialTax/expenseAccount/detail/index.vue b/src/views/financialTax/expenseAccount/detail/index.vue index ed1a1fad..b7b6e8d5 100644 --- a/src/views/financialTax/expenseAccount/detail/index.vue +++ b/src/views/financialTax/expenseAccount/detail/index.vue @@ -218,8 +218,6 @@ // 获取额外Query参数 const getActionExtraQuery = (index) => { const obj = appStore.getIdsData - console.log('expenseAccount', obj['expenseAccount']) - console.log('index', index) if (obj && obj['expenseAccount']) { const preData = obj['expenseAccount'][index] diff --git a/src/views/financialTax/expenseAccount/index.vue b/src/views/financialTax/expenseAccount/index.vue index bf96eb46..b70a781f 100644 --- a/src/views/financialTax/expenseAccount/index.vue +++ b/src/views/financialTax/expenseAccount/index.vue @@ -177,8 +177,8 @@ go({ path: '/expenseAccountDetail', query: { - type: pageType, id: row.id, + type: pageType, tabName: pageType == 'EDIT' ? '报销单申请' : '报销单详情', }, })