From 1eb7dadaa0bb9e18f387acb3eef497550d48508a Mon Sep 17 00:00:00 2001 From: lframework Date: Mon, 24 Mar 2025 00:21:29 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=9A=E9=A1=B5=E7=AD=BE=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=B6=EF=BC=8C=E7=88=B6=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/multiplePageMix.ts | 33 ++++++++++++++++++ src/store/modules/multipleTab.ts | 34 +++++++++++++++++++ src/utils/utils.ts | 9 ----- src/views/base-data/address/index.vue | 2 +- src/views/base-data/product/info/add.vue | 5 +-- src/views/base-data/product/info/index.vue | 9 +++-- src/views/base-data/product/info/modify.vue | 5 +-- src/views/customer-settle/check-sheet/add.vue | 4 ++- .../customer-settle/check-sheet/approve.vue | 4 ++- .../customer-settle/check-sheet/index.vue | 11 ++++-- .../customer-settle/check-sheet/modify.vue | 4 ++- src/views/customer-settle/fee-sheet/add.vue | 4 ++- .../customer-settle/fee-sheet/approve.vue | 4 ++- src/views/customer-settle/fee-sheet/index.vue | 11 ++++-- .../customer-settle/fee-sheet/modify.vue | 4 ++- src/views/customer-settle/pre-sheet/add.vue | 4 ++- .../customer-settle/pre-sheet/approve.vue | 4 ++- src/views/customer-settle/pre-sheet/index.vue | 11 ++++-- .../customer-settle/pre-sheet/modify.vue | 4 ++- src/views/customer-settle/sheet/add.vue | 4 ++- src/views/customer-settle/sheet/approve.vue | 4 ++- src/views/customer-settle/sheet/index.vue | 11 ++++-- src/views/customer-settle/sheet/modify.vue | 4 ++- src/views/sc/logistics/sheet/add.vue | 4 ++- src/views/sc/logistics/sheet/index.vue | 9 +++-- src/views/sc/logistics/sheet/modify.vue | 4 ++- src/views/sc/purchase/config/index.vue | 5 +-- src/views/sc/purchase/order/add.vue | 4 ++- src/views/sc/purchase/order/approve.vue | 4 ++- src/views/sc/purchase/order/index.vue | 11 ++++-- src/views/sc/purchase/order/modify.vue | 4 ++- src/views/sc/purchase/receive/add-require.vue | 4 ++- .../sc/purchase/receive/add-un-require.vue | 4 ++- src/views/sc/purchase/receive/approve.vue | 4 ++- src/views/sc/purchase/receive/index.vue | 15 +++++--- .../sc/purchase/receive/modify-require.vue | 4 ++- .../sc/purchase/receive/modify-un-require.vue | 4 ++- src/views/sc/purchase/return/add-require.vue | 4 ++- .../sc/purchase/return/add-un-require.vue | 4 ++- src/views/sc/purchase/return/approve.vue | 4 ++- src/views/sc/purchase/return/index.vue | 15 +++++--- .../sc/purchase/return/modify-require.vue | 4 ++- .../sc/purchase/return/modify-un-require.vue | 4 ++- src/views/sc/retail/config/index.vue | 4 ++- src/views/sc/retail/out/add.vue | 4 ++- src/views/sc/retail/out/approve.vue | 4 ++- src/views/sc/retail/out/index.vue | 11 ++++-- src/views/sc/retail/out/modify.vue | 4 ++- src/views/sc/retail/return/add-require.vue | 4 ++- src/views/sc/retail/return/add-un-require.vue | 4 ++- src/views/sc/retail/return/approve.vue | 4 ++- src/views/sc/retail/return/index.vue | 15 +++++--- src/views/sc/retail/return/modify-require.vue | 4 ++- .../sc/retail/return/modify-un-require.vue | 4 ++- src/views/sc/sale/config/index.vue | 4 ++- src/views/sc/sale/order/add.vue | 4 ++- src/views/sc/sale/order/approve.vue | 4 ++- src/views/sc/sale/order/index.vue | 11 ++++-- src/views/sc/sale/order/modify.vue | 4 ++- src/views/sc/sale/out/add-require.vue | 4 ++- src/views/sc/sale/out/add-un-require.vue | 4 ++- src/views/sc/sale/out/approve.vue | 4 ++- src/views/sc/sale/out/index.vue | 15 +++++--- src/views/sc/sale/out/modify-require.vue | 4 ++- src/views/sc/sale/out/modify-un-require.vue | 4 ++- src/views/sc/sale/return/add-require.vue | 4 ++- src/views/sc/sale/return/add-un-require.vue | 4 ++- src/views/sc/sale/return/approve.vue | 4 ++- src/views/sc/sale/return/index.vue | 15 +++++--- src/views/sc/sale/return/modify-require.vue | 4 ++- .../sc/sale/return/modify-un-require.vue | 4 ++- src/views/sc/stock/adjust/stock/add.vue | 4 ++- src/views/sc/stock/adjust/stock/approve.vue | 4 ++- src/views/sc/stock/adjust/stock/index.vue | 11 ++++-- src/views/sc/stock/adjust/stock/modify.vue | 4 ++- src/views/sc/stock/take/config/index.vue | 4 ++- src/views/sc/stock/take/pre/add.vue | 4 ++- src/views/sc/stock/take/pre/index.vue | 9 +++-- src/views/sc/stock/take/pre/modify.vue | 4 ++- src/views/sc/stock/take/sheet/add.vue | 4 ++- src/views/sc/stock/take/sheet/approve.vue | 4 ++- src/views/sc/stock/take/sheet/index.vue | 11 ++++-- src/views/sc/stock/take/sheet/modify.vue | 4 ++- src/views/sc/stock/transfer/add.vue | 4 ++- src/views/sc/stock/transfer/approve.vue | 4 ++- src/views/sc/stock/transfer/index.vue | 13 ++++--- src/views/sc/stock/transfer/modify.vue | 4 ++- src/views/sc/stock/transfer/receive.vue | 4 ++- src/views/settle/check-sheet/add.vue | 4 ++- src/views/settle/check-sheet/approve.vue | 4 ++- src/views/settle/check-sheet/index.vue | 11 ++++-- src/views/settle/check-sheet/modify.vue | 4 ++- src/views/settle/fee-sheet/add.vue | 4 ++- src/views/settle/fee-sheet/approve.vue | 4 ++- src/views/settle/fee-sheet/index.vue | 11 ++++-- src/views/settle/fee-sheet/modify.vue | 4 ++- src/views/settle/pre-sheet/add.vue | 4 ++- src/views/settle/pre-sheet/approve.vue | 4 ++- src/views/settle/pre-sheet/index.vue | 11 ++++-- src/views/settle/pre-sheet/modify.vue | 4 ++- src/views/settle/sheet/add.vue | 4 ++- src/views/settle/sheet/approve.vue | 4 ++- src/views/settle/sheet/index.vue | 11 ++++-- src/views/settle/sheet/modify.vue | 4 ++- 104 files changed, 486 insertions(+), 165 deletions(-) create mode 100644 src/mixins/multiplePageMix.ts diff --git a/src/mixins/multiplePageMix.ts b/src/mixins/multiplePageMix.ts new file mode 100644 index 0000000..17aab44 --- /dev/null +++ b/src/mixins/multiplePageMix.ts @@ -0,0 +1,33 @@ +import eventBus from '@/events/eventBus'; +import { useRefreshStore } from '@/store/modules/multipleTab'; + +export const multiplePageMix = { + activated() { + const refreshStore = useRefreshStore(); + const currentPath = this.$route.path; + if (refreshStore.checkAndClear(currentPath)) { + try { + this.onRefreshPage(); + } catch (e) { + /* empty */ + } + } + }, + methods: { + openChildPage(path: string) { + const refreshStore = useRefreshStore(); + refreshStore.setCacheFlag(path, this.$route.path); + this.$router.push(path); + }, + closeCurrentPage(refreshParent: boolean = true): void { + const refreshStore = useRefreshStore(); + const parentPath = refreshParent ? refreshStore.getCacheFlag(this.$route.path) : ''; + refreshStore.setRefreshFlag(parentPath); + eventBus.$emit(eventBus.$otherEvent.CLOSE_CURRENT_TAB); + + if (!this.$utils.isEmpty(parentPath)) { + this.$router.push(parentPath); + } + }, + }, +}; diff --git a/src/store/modules/multipleTab.ts b/src/store/modules/multipleTab.ts index 6293207..29911da 100644 --- a/src/store/modules/multipleTab.ts +++ b/src/store/modules/multipleTab.ts @@ -362,3 +362,37 @@ export const useMultipleTabStore = defineStore({ export function useMultipleTabWithOutStore() { return useMultipleTabStore(store); } + +export const useRefreshStore = defineStore('refresh', { + state: () => ({ + // 记录需要刷新的页签标识 + refreshMap: new Map(), + // 记录子页签的来源 + cacheMap: new Map(), + }), + actions: { + setCacheFlag(to: string, from: string): void { + this.cacheMap.set(to, from); + }, + getCacheFlag(path: string) { + const from = this.cacheMap.get(path); + this.cacheMap.delete(from); + return from; + }, + // 设置需要刷新的页签 + setRefreshFlag(path: string): void { + if (!path) { + return; + } + this.refreshMap.set(path, true); + }, + // 检查并清除刷新标记 + checkAndClear(path: string): boolean { + if (this.refreshMap.get(path)) { + this.refreshMap.set(path, false); + return true; + } + return false; + }, + }, +}); diff --git a/src/utils/utils.ts b/src/utils/utils.ts index bac14fc..622b3bb 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -4,7 +4,6 @@ import Moment from 'moment'; import CryptoJS from 'crypto-js'; import * as math from 'mathjs'; import { SortPageVo } from '@/api/model/sortPageVo'; -import eventBus from '@/events/eventBus'; /** * 是否 整数 @@ -778,14 +777,6 @@ export const swapArrayItem = function (arr, index, toIndex) { return newArr; }; -/** - * 关闭当前页签 - * @param el - */ -export const closeCurrentPage = function () { - eventBus.$emit(eventBus.$otherEvent.CLOSE_CURRENT_TAB); -}; - /** * 字符串Ant匹配 * @param str diff --git a/src/views/base-data/address/index.vue b/src/views/base-data/address/index.vue index 06ca79b..8c0d3d5 100644 --- a/src/views/base-data/address/index.vue +++ b/src/views/base-data/address/index.vue @@ -183,7 +183,7 @@ field: 'areaName', title: '地区', width: 200, - formatter: ({ cellValue, row }) => { + formatter: ({ row }) => { return row.provinceName + ' / ' + row.cityName + ' / ' + row.districtName; }, }, diff --git a/src/views/base-data/product/info/add.vue b/src/views/base-data/product/info/add.vue index 96c83ee..88f61e5 100644 --- a/src/views/base-data/product/info/add.vue +++ b/src/views/base-data/product/info/add.vue @@ -312,10 +312,12 @@ import * as api from '@/api/base-data/product/info'; import * as propertyApi from '@/api/base-data/product/property'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddProduct', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -486,8 +488,7 @@ methods: { // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); - this.$router.go(-1); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/base-data/product/info/index.vue b/src/views/base-data/product/info/index.vue index 619d3f7..b4fb6e7 100644 --- a/src/views/base-data/product/info/index.vue +++ b/src/views/base-data/product/info/index.vue @@ -90,7 +90,7 @@ v-permission="['base-data:product:info:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/product/info/add')" + @click="openChildPage('/product/info/add')" >新增 { - this.$router.push('/product/info/modify/' + row.id); + this.openChildPage('/product/info/modify/' + row.id); }, }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/base-data/product/info/modify.vue b/src/views/base-data/product/info/modify.vue index 9b6d30d..5785ce0 100644 --- a/src/views/base-data/product/info/modify.vue +++ b/src/views/base-data/product/info/modify.vue @@ -309,12 +309,13 @@ import { validCode } from '@/utils/validate'; import * as api from '@/api/base-data/product/info'; import * as propertyApi from '@/api/base-data/product/property'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyProduct', // 使用组件 components: {}, - + mixins: [multiplePageMix], props: {}, data() { return { @@ -481,7 +482,7 @@ methods: { // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/check-sheet/add.vue b/src/views/customer-settle/check-sheet/add.vue index 24a1555..f211175 100644 --- a/src/views/customer-settle/check-sheet/add.vue +++ b/src/views/customer-settle/check-sheet/add.vue @@ -107,10 +107,12 @@ import moment from 'moment'; import { SearchOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/customer-settle/check'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddCustomerSettleCheckSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -174,7 +176,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/check-sheet/approve.vue b/src/views/customer-settle/check-sheet/approve.vue index bcf3077..b5c8e64 100644 --- a/src/views/customer-settle/check-sheet/approve.vue +++ b/src/views/customer-settle/check-sheet/approve.vue @@ -256,6 +256,7 @@ import SettleFeeSheetDetail from '@/views/customer-settle/fee-sheet/detail.vue'; import SettlePreSheetDetail from '@/views/customer-settle/pre-sheet/detail.vue'; import * as api from '@/api/customer-settle/check'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveCustomerSettleCheckSheet', @@ -266,6 +267,7 @@ SettleFeeSheetDetail, SettlePreSheetDetail, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -306,7 +308,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/check-sheet/index.vue b/src/views/customer-settle/check-sheet/index.vue index 299d271..928f826 100644 --- a/src/views/customer-settle/check-sheet/index.vue +++ b/src/views/customer-settle/check-sheet/index.vue @@ -99,7 +99,7 @@ v-permission="['customer-settle:check-sheet:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/settle/customer/check-sheet/add')" + @click="openChildPage('/settle/customer/check-sheet/add')" >新增 { - this.$router.push('/settle/customer/check-sheet/approve/' + row.id); + this.openChildPage('/settle/customer/check-sheet/approve/' + row.id); }, }, { @@ -477,7 +479,7 @@ ); }, onClick: () => { - this.$router.push('/settle/customer/check-sheet/modify/' + row.id); + this.openChildPage('/settle/customer/check-sheet/modify/' + row.id); }, }, { @@ -496,6 +498,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/customer-settle/check-sheet/modify.vue b/src/views/customer-settle/check-sheet/modify.vue index 039c9f0..a766d0d 100644 --- a/src/views/customer-settle/check-sheet/modify.vue +++ b/src/views/customer-settle/check-sheet/modify.vue @@ -156,10 +156,12 @@ import { h, defineComponent } from 'vue'; import { SearchOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/customer-settle/check'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyCustomerSettleCheckSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -225,7 +227,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/fee-sheet/add.vue b/src/views/customer-settle/fee-sheet/add.vue index 03912a3..844706e 100644 --- a/src/views/customer-settle/fee-sheet/add.vue +++ b/src/views/customer-settle/fee-sheet/add.vue @@ -105,10 +105,12 @@ import { h, defineComponent } from 'vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/customer-settle/fee'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddCustomerSettleFeeSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -163,7 +165,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/fee-sheet/approve.vue b/src/views/customer-settle/fee-sheet/approve.vue index 8740fd5..ed73603 100644 --- a/src/views/customer-settle/fee-sheet/approve.vue +++ b/src/views/customer-settle/fee-sheet/approve.vue @@ -130,12 +130,14 @@ import { defineComponent } from 'vue'; import ApproveRefuse from '@/components/ApproveRefuse'; import * as api from '@/api/customer-settle/fee'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveCustomerSettleFeeSheet', components: { ApproveRefuse, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -172,7 +174,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/fee-sheet/index.vue b/src/views/customer-settle/fee-sheet/index.vue index 26abc67..b8acac2 100644 --- a/src/views/customer-settle/fee-sheet/index.vue +++ b/src/views/customer-settle/fee-sheet/index.vue @@ -99,7 +99,7 @@ v-permission="['customer-settle:fee-sheet:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/settle/customer/fee-sheet/add')" + @click="openChildPage('/settle/customer/fee-sheet/add')" >新增 { - this.$router.push('/settle/customer/fee-sheet/approve/' + row.id); + this.openChildPage('/settle/customer/fee-sheet/approve/' + row.id); }, }, { @@ -467,7 +469,7 @@ ); }, onClick: () => { - this.$router.push('/settle/customer/fee-sheet/modify/' + row.id); + this.openChildPage('/settle/customer/fee-sheet/modify/' + row.id); }, }, { @@ -486,6 +488,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/customer-settle/fee-sheet/modify.vue b/src/views/customer-settle/fee-sheet/modify.vue index 506fb44..930596f 100644 --- a/src/views/customer-settle/fee-sheet/modify.vue +++ b/src/views/customer-settle/fee-sheet/modify.vue @@ -154,10 +154,12 @@ import { h, defineComponent } from 'vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/customer-settle/fee'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyCustomerSettleFeeSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -214,7 +216,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/pre-sheet/add.vue b/src/views/customer-settle/pre-sheet/add.vue index a98c70a..8087c6b 100644 --- a/src/views/customer-settle/pre-sheet/add.vue +++ b/src/views/customer-settle/pre-sheet/add.vue @@ -86,10 +86,12 @@ import { h, defineComponent } from 'vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/customer-settle/pre'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddCustomerSettlePreSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -144,7 +146,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/pre-sheet/approve.vue b/src/views/customer-settle/pre-sheet/approve.vue index 482dbbe..f57b86e 100644 --- a/src/views/customer-settle/pre-sheet/approve.vue +++ b/src/views/customer-settle/pre-sheet/approve.vue @@ -127,12 +127,14 @@ import { defineComponent } from 'vue'; import ApproveRefuse from '@/components/ApproveRefuse'; import * as api from '@/api/customer-settle/pre'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveCustomerSettlePreSheet', components: { ApproveRefuse, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -169,7 +171,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/pre-sheet/index.vue b/src/views/customer-settle/pre-sheet/index.vue index 160f764..b0aa78a 100644 --- a/src/views/customer-settle/pre-sheet/index.vue +++ b/src/views/customer-settle/pre-sheet/index.vue @@ -99,7 +99,7 @@ v-permission="['customer-settle:pre-sheet:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/settle/customer/pre-sheet/add')" + @click="openChildPage('/settle/customer/pre-sheet/add')" >新增 { - this.$router.push('/settle/customer/pre-sheet/approve/' + row.id); + this.openChildPage('/settle/customer/pre-sheet/approve/' + row.id); }, }, { @@ -467,7 +469,7 @@ ); }, onClick: () => { - this.$router.push('/settle/customer/pre-sheet/modify/' + row.id); + this.openChildPage('/settle/customer/pre-sheet/modify/' + row.id); }, }, { @@ -486,6 +488,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/customer-settle/pre-sheet/modify.vue b/src/views/customer-settle/pre-sheet/modify.vue index 2780f5e..6ace656 100644 --- a/src/views/customer-settle/pre-sheet/modify.vue +++ b/src/views/customer-settle/pre-sheet/modify.vue @@ -135,10 +135,12 @@ import { h, defineComponent } from 'vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/customer-settle/pre'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyCustomerSettlePreSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -195,7 +197,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/sheet/add.vue b/src/views/customer-settle/sheet/add.vue index e766ce6..937c217 100644 --- a/src/views/customer-settle/sheet/add.vue +++ b/src/views/customer-settle/sheet/add.vue @@ -146,10 +146,12 @@ import moment from 'moment'; import { SearchOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/customer-settle/sheet'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddCustomerSettleSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -241,7 +243,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/sheet/approve.vue b/src/views/customer-settle/sheet/approve.vue index 2206fb7..25a2a0d 100644 --- a/src/views/customer-settle/sheet/approve.vue +++ b/src/views/customer-settle/sheet/approve.vue @@ -192,6 +192,7 @@ import ApproveRefuse from '@/components/ApproveRefuse'; import SettleCheckSheetDetail from '@/views/customer-settle/check-sheet/detail.vue'; import * as api from '@/api/customer-settle/sheet'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveCustomerSettleSheet', @@ -199,6 +200,7 @@ ApproveRefuse, SettleCheckSheetDetail, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -261,7 +263,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/customer-settle/sheet/index.vue b/src/views/customer-settle/sheet/index.vue index c75d521..6579c46 100644 --- a/src/views/customer-settle/sheet/index.vue +++ b/src/views/customer-settle/sheet/index.vue @@ -85,7 +85,7 @@ v-permission="['customer-settle:sheet:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/settle/customer/sheet/add')" + @click="openChildPage('/settle/customer/sheet/add')" >新增 { - this.$router.push('/settle/customer/sheet/approve/' + row.id); + this.openChildPage('/settle/customer/sheet/approve/' + row.id); }, }, { @@ -437,7 +439,7 @@ ); }, onClick: () => { - this.$router.push('/settle/customer/sheet/modify/' + row.id); + this.openChildPage('/settle/customer/sheet/modify/' + row.id); }, }, { @@ -456,6 +458,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/customer-settle/sheet/modify.vue b/src/views/customer-settle/sheet/modify.vue index 7571448..d39f440 100644 --- a/src/views/customer-settle/sheet/modify.vue +++ b/src/views/customer-settle/sheet/modify.vue @@ -192,10 +192,12 @@ import { h, defineComponent } from 'vue'; import { SearchOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/customer-settle/sheet'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyCustomerSettleSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -289,7 +291,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/logistics/sheet/add.vue b/src/views/sc/logistics/sheet/add.vue index edd6bf4..1f3b3e6 100644 --- a/src/views/sc/logistics/sheet/add.vue +++ b/src/views/sc/logistics/sheet/add.vue @@ -183,6 +183,7 @@ import AddressSelector from './address-selector.vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/sc/logistics/sheet'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddLogisticsSheet', @@ -192,6 +193,7 @@ DetailRetailOutSheet, AddressSelector, }, + mixins: [multiplePageMix], setup() { return { h, @@ -275,7 +277,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/logistics/sheet/index.vue b/src/views/sc/logistics/sheet/index.vue index 3bc3fa5..9a59618 100644 --- a/src/views/sc/logistics/sheet/index.vue +++ b/src/views/sc/logistics/sheet/index.vue @@ -88,7 +88,7 @@ v-permission="['logistics:sheet:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/logistics/sheet/add')" + @click="openChildPage('/logistics/sheet/add')" >新增 { - this.$router.push('/logistics/sheet/modify/' + row.id); + this.openChildPage('/logistics/sheet/modify/' + row.id); }, }, { @@ -372,6 +374,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/sc/logistics/sheet/modify.vue b/src/views/sc/logistics/sheet/modify.vue index 70c08dd..cd7ae50 100644 --- a/src/views/sc/logistics/sheet/modify.vue +++ b/src/views/sc/logistics/sheet/modify.vue @@ -219,6 +219,7 @@ import AddressSelector from './address-selector.vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/sc/logistics/sheet'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyLogisticsSheet', @@ -228,6 +229,7 @@ DetailRetailOutSheet, AddressSelector, }, + mixins: [multiplePageMix], setup() { return { h, PlusOutlined, DeleteOutlined }; }, @@ -309,7 +311,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/purchase/config/index.vue b/src/views/sc/purchase/config/index.vue index cb86c87..e5a541c 100644 --- a/src/views/sc/purchase/config/index.vue +++ b/src/views/sc/purchase/config/index.vue @@ -67,12 +67,13 @@ diff --git a/src/views/sc/purchase/order/modify.vue b/src/views/sc/purchase/order/modify.vue index 81b9d58..c281e0f 100644 --- a/src/views/sc/purchase/order/modify.vue +++ b/src/views/sc/purchase/order/modify.vue @@ -206,6 +206,7 @@ AlertOutlined, } from '@ant-design/icons-vue'; import * as api from '@/api/sc/purchase/order'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyPurchaseOrder', @@ -213,6 +214,7 @@ BatchAddProduct, PayType, }, + mixins: [multiplePageMix], setup() { return { h, @@ -314,7 +316,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/purchase/receive/add-require.vue b/src/views/sc/purchase/receive/add-require.vue index 382f68e..dc6bad6 100644 --- a/src/views/sc/purchase/receive/add-require.vue +++ b/src/views/sc/purchase/receive/add-require.vue @@ -193,6 +193,7 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/purchase/receive'; import * as purchaseApi from '@/api/sc/purchase/order'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddPurchaseReceiveSheetRequire', @@ -200,6 +201,7 @@ BatchAddProduct, PurchaseOrderSelectorWithReceive, }, + mixins: [multiplePageMix], setup() { return { h, @@ -319,7 +321,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/purchase/receive/add-un-require.vue b/src/views/sc/purchase/receive/add-un-require.vue index 8bb4809..6c5c41a 100644 --- a/src/views/sc/purchase/receive/add-un-require.vue +++ b/src/views/sc/purchase/receive/add-un-require.vue @@ -181,6 +181,7 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/purchase/receive'; import * as purchaseApi from '@/api/sc/purchase/order'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddPurchaseReceiveSheetUnRequire', @@ -188,6 +189,7 @@ BatchAddProduct, PurchaseOrderSelectorWithReceive, }, + mixins: [multiplePageMix], setup() { return { h, @@ -291,7 +293,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/purchase/receive/approve.vue b/src/views/sc/purchase/receive/approve.vue index 05cbdc5..0386bb2 100644 --- a/src/views/sc/purchase/receive/approve.vue +++ b/src/views/sc/purchase/receive/approve.vue @@ -163,6 +163,7 @@ import ApproveRefuse from '@/components/ApproveRefuse'; import PurchaseOrderDetail from '@/views/sc/purchase/order/detail.vue'; import * as api from '@/api/sc/purchase/receive'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApprovePurchaseReceiveSheet', @@ -170,6 +171,7 @@ ApproveRefuse, PurchaseOrderDetail, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -244,7 +246,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/purchase/receive/index.vue b/src/views/sc/purchase/receive/index.vue index 5174cc6..94d9be1 100644 --- a/src/views/sc/purchase/receive/index.vue +++ b/src/views/sc/purchase/receive/index.vue @@ -259,6 +259,7 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/purchase/receive'; import * as configApi from '@/api/sc/purchase/config'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ReceiveSheet', @@ -267,6 +268,7 @@ ApproveRefuse, PurchaseOrderDetail, }, + mixins: [multiplePageMix], setup() { return { h, @@ -399,17 +401,17 @@ openAddDialog() { configApi.get().then((res) => { if (res.receiveRequirePurchase) { - this.$router.push('/purchase/receive/add/require'); + this.openChildPage('/purchase/receive/add/require'); } else { - this.$router.push('/purchase/receive/add/un-require'); + this.openChildPage('/purchase/receive/add/un-require'); } }); }, openModifyDialog(row) { if (!this.$utils.isEmpty(row.purchaseOrderId)) { - this.$router.push('/purchase/receive/modify/require/' + row.id); + this.openChildPage('/purchase/receive/modify/require/' + row.id); } else { - this.$router.push('/purchase/receive/modify/un-require/' + row.id); + this.openChildPage('/purchase/receive/modify/un-require/' + row.id); } }, // 删除订单 @@ -542,7 +544,7 @@ ); }, onClick: () => { - this.$router.push('/purchase/receive/approve/' + row.id); + this.openChildPage('/purchase/receive/approve/' + row.id); }, }, { @@ -574,6 +576,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/sc/purchase/receive/modify-require.vue b/src/views/sc/purchase/receive/modify-require.vue index 08157d8..57915c9 100644 --- a/src/views/sc/purchase/receive/modify-require.vue +++ b/src/views/sc/purchase/receive/modify-require.vue @@ -237,6 +237,7 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/purchase/receive'; import * as purchaseApi from '@/api/sc/purchase/order'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyPurchaseReceiveSheetRequire', @@ -244,6 +245,7 @@ PurchaseOrderDetail, BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -366,7 +368,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/purchase/receive/modify-un-require.vue b/src/views/sc/purchase/receive/modify-un-require.vue index 1e9ef7d..a4e8128 100644 --- a/src/views/sc/purchase/receive/modify-un-require.vue +++ b/src/views/sc/purchase/receive/modify-un-require.vue @@ -217,12 +217,14 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/purchase/receive'; import * as purchaseApi from '@/api/sc/purchase/order'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyPurchaseReceiveSheetUnRequire', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -328,7 +330,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/purchase/return/add-require.vue b/src/views/sc/purchase/return/add-require.vue index 3aceada..ac4159e 100644 --- a/src/views/sc/purchase/return/add-require.vue +++ b/src/views/sc/purchase/return/add-require.vue @@ -181,6 +181,7 @@ import * as api from '@/api/sc/purchase/return'; import * as purchaseApi from '@/api/sc/purchase/order'; import * as receiveApi from '@/api/sc/purchase/receive'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddPurchaseReturnRequire', @@ -188,6 +189,7 @@ ReceiveSheetSelectorWithReturn, BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, PlusOutlined, DeleteOutlined, NumberOutlined }; }, @@ -306,7 +308,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/purchase/return/add-un-require.vue b/src/views/sc/purchase/return/add-un-require.vue index cfcb465..3f26279 100644 --- a/src/views/sc/purchase/return/add-un-require.vue +++ b/src/views/sc/purchase/return/add-un-require.vue @@ -179,6 +179,7 @@ import * as api from '@/api/sc/purchase/return'; import * as purchaseApi from '@/api/sc/purchase/order'; import * as receiveApi from '@/api/sc/purchase/receive'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddPurchaseReturnUnRequire', @@ -186,6 +187,7 @@ ReceiveSheetSelectorWithReturn, BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, PlusOutlined, DeleteOutlined, NumberOutlined, EditOutlined, AlertOutlined }; }, @@ -289,7 +291,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/purchase/return/approve.vue b/src/views/sc/purchase/return/approve.vue index f480acb..42636fa 100644 --- a/src/views/sc/purchase/return/approve.vue +++ b/src/views/sc/purchase/return/approve.vue @@ -166,6 +166,7 @@ import ApproveRefuse from '@/components/ApproveRefuse'; import ReceiveSheetDetail from '@/views/sc/purchase/receive/detail.vue'; import * as api from '@/api/sc/purchase/return'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApprovePurchaseReturn', @@ -173,6 +174,7 @@ ApproveRefuse, ReceiveSheetDetail, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -254,7 +256,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/purchase/return/index.vue b/src/views/sc/purchase/return/index.vue index 36dc2e5..4eea3b3 100644 --- a/src/views/sc/purchase/return/index.vue +++ b/src/views/sc/purchase/return/index.vue @@ -246,6 +246,7 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/purchase/return'; import * as configApi from '@/api/sc/purchase/config'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'PurchaseReturn', @@ -254,6 +255,7 @@ ApproveRefuse, ReceiveSheetDetail, }, + mixins: [multiplePageMix], setup() { return { h, @@ -384,17 +386,17 @@ openAddDialog() { configApi.get().then((res) => { if (res.purchaseReturnRequireReceive) { - this.$router.push('/purchase/return/add/require'); + this.openChildPage('/purchase/return/add/require'); } else { - this.$router.push('/purchase/return/add/un-require'); + this.openChildPage('/purchase/return/add/un-require'); } }); }, openModifyDialog(row) { if (!this.$utils.isEmpty(row.receiveSheetId)) { - this.$router.push('/purchase/return/modify/require/' + row.id); + this.openChildPage('/purchase/return/modify/require/' + row.id); } else { - this.$router.push('/purchase/return/modify/un-require/' + row.id); + this.openChildPage('/purchase/return/modify/un-require/' + row.id); } }, // 删除订单 @@ -526,7 +528,7 @@ ); }, onClick: () => { - this.$router.push('/purchase/return/approve/' + row.id); + this.openChildPage('/purchase/return/approve/' + row.id); }, }, { @@ -558,6 +560,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/sc/purchase/return/modify-require.vue b/src/views/sc/purchase/return/modify-require.vue index 6e54e1b..6b1db27 100644 --- a/src/views/sc/purchase/return/modify-require.vue +++ b/src/views/sc/purchase/return/modify-require.vue @@ -213,12 +213,14 @@ import * as api from '@/api/sc/purchase/return'; import * as purchaseApi from '@/api/sc/purchase/order'; import * as receiveApi from '@/api/sc/purchase/receive'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyPurchaseReturnRequire', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -344,7 +346,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/purchase/return/modify-un-require.vue b/src/views/sc/purchase/return/modify-un-require.vue index 5d5cc82..7bce875 100644 --- a/src/views/sc/purchase/return/modify-un-require.vue +++ b/src/views/sc/purchase/return/modify-un-require.vue @@ -214,12 +214,14 @@ import * as api from '@/api/sc/purchase/return'; import * as purchaseApi from '@/api/sc/purchase/order'; import * as receiveApi from '@/api/sc/purchase/receive'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyPurchaseReturnUnRequire', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -331,7 +333,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/retail/config/index.vue b/src/views/sc/retail/config/index.vue index 530e424..3790261 100644 --- a/src/views/sc/retail/config/index.vue +++ b/src/views/sc/retail/config/index.vue @@ -70,11 +70,13 @@ diff --git a/src/views/sc/retail/out/modify.vue b/src/views/sc/retail/out/modify.vue index 74b7d45..8ef1f74 100644 --- a/src/views/sc/retail/out/modify.vue +++ b/src/views/sc/retail/out/modify.vue @@ -226,6 +226,7 @@ } from '@ant-design/icons-vue'; import * as configApi from '@/api/sc/retail/config'; import * as api from '@/api/sc/retail/out'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyRetailOutSheet', @@ -233,6 +234,7 @@ BatchAddProduct, PayType, }, + mixins: [multiplePageMix], setup() { return { h, @@ -352,7 +354,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/retail/return/add-require.vue b/src/views/sc/retail/return/add-require.vue index a9057b4..20464a4 100644 --- a/src/views/sc/retail/return/add-require.vue +++ b/src/views/sc/retail/return/add-require.vue @@ -179,6 +179,7 @@ import * as configApi from '@/api/sc/retail/config'; import * as outApi from '@/api/sc/retail/out'; import * as api from '@/api/sc/retail/return'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddRetailReturnRequire', @@ -187,6 +188,7 @@ BatchAddProduct, PayType, }, + mixins: [multiplePageMix], setup() { const moment = Moment; return { @@ -290,7 +292,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/retail/return/add-un-require.vue b/src/views/sc/retail/return/add-un-require.vue index f7ae865..267eea3 100644 --- a/src/views/sc/retail/return/add-un-require.vue +++ b/src/views/sc/retail/return/add-un-require.vue @@ -194,6 +194,7 @@ import * as configApi from '@/api/sc/retail/config'; import * as outApi from '@/api/sc/retail/out'; import * as api from '@/api/sc/retail/return'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddRetailReturnUnRequire', @@ -202,6 +203,7 @@ BatchAddProduct, PayType, }, + mixins: [multiplePageMix], setup() { const moment = Moment; return { @@ -302,7 +304,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/retail/return/approve.vue b/src/views/sc/retail/return/approve.vue index bc7a046..3da2520 100644 --- a/src/views/sc/retail/return/approve.vue +++ b/src/views/sc/retail/return/approve.vue @@ -167,6 +167,7 @@ import OutSheetDetail from '@/views/sc/retail/out/detail.vue'; import PayType from '@/views/sc/pay-type/index.vue'; import * as api from '@/api/sc/retail/return'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveRetailReturn', @@ -175,6 +176,7 @@ OutSheetDetail, PayType, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -243,7 +245,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/retail/return/index.vue b/src/views/sc/retail/return/index.vue index 2cd9121..739f8c4 100644 --- a/src/views/sc/retail/return/index.vue +++ b/src/views/sc/retail/return/index.vue @@ -243,6 +243,7 @@ } from '@ant-design/icons-vue'; import * as configApi from '@/api/sc/retail/config'; import * as api from '@/api/sc/retail/return'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'RetailReturn', @@ -251,6 +252,7 @@ ApproveRefuse, OutSheetDetail, }, + mixins: [multiplePageMix], setup() { return { h, @@ -381,17 +383,17 @@ openAddDialog() { configApi.get().then((res) => { if (res.retailReturnRequireOutStock) { - this.$router.push('/retail/return/add/require'); + this.openChildPage('/retail/return/add/require'); } else { - this.$router.push('/retail/return/add/un-require'); + this.openChildPage('/retail/return/add/un-require'); } }); }, openModifyDialog(row) { if (!this.$utils.isEmpty(row.outSheetId)) { - this.$router.push('/retail/return/modify/require/' + row.id); + this.openChildPage('/retail/return/modify/require/' + row.id); } else { - this.$router.push('/retail/return/modify/un-require/' + row.id); + this.openChildPage('/retail/return/modify/un-require/' + row.id); } }, // 删除订单 @@ -523,7 +525,7 @@ ); }, onClick: () => { - this.$router.push('/retail/return/approve/' + row.id); + this.openChildPage('/retail/return/approve/' + row.id); }, }, { @@ -555,6 +557,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/sc/retail/return/modify-require.vue b/src/views/sc/retail/return/modify-require.vue index fbfb76a..9c08964 100644 --- a/src/views/sc/retail/return/modify-require.vue +++ b/src/views/sc/retail/return/modify-require.vue @@ -207,6 +207,7 @@ import * as configApi from '@/api/sc/retail/config'; import * as outApi from '@/api/sc/retail/out'; import * as api from '@/api/sc/retail/return'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyRetailReturnRequire', @@ -214,6 +215,7 @@ BatchAddProduct, PayType, }, + mixins: [multiplePageMix], setup() { const moment = Moment; return { h, PlusOutlined, DeleteOutlined, NumberOutlined, moment }; @@ -320,7 +322,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/retail/return/modify-un-require.vue b/src/views/sc/retail/return/modify-un-require.vue index 78dabe2..8458ca4 100644 --- a/src/views/sc/retail/return/modify-un-require.vue +++ b/src/views/sc/retail/return/modify-un-require.vue @@ -223,6 +223,7 @@ import * as configApi from '@/api/sc/retail/config'; import * as outApi from '@/api/sc/retail/out'; import * as api from '@/api/sc/retail/return'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyRetailReturnUnRequire', @@ -230,6 +231,7 @@ BatchAddProduct, PayType, }, + mixins: [multiplePageMix], setup() { const moment = Moment; return { @@ -339,7 +341,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/sale/config/index.vue b/src/views/sc/sale/config/index.vue index ef2f44e..7d4fe13 100644 --- a/src/views/sc/sale/config/index.vue +++ b/src/views/sc/sale/config/index.vue @@ -70,11 +70,13 @@ diff --git a/src/views/sc/sale/order/modify.vue b/src/views/sc/sale/order/modify.vue index 4d0ce01..3007008 100644 --- a/src/views/sc/sale/order/modify.vue +++ b/src/views/sc/sale/order/modify.vue @@ -204,6 +204,7 @@ AlertOutlined, } from '@ant-design/icons-vue'; import * as api from '@/api/sc/sale/order'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifySaleOrder', @@ -211,6 +212,7 @@ BatchAddProduct, PayType, }, + mixins: [multiplePageMix], setup() { return { h, @@ -319,7 +321,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/sale/out/add-require.vue b/src/views/sc/sale/out/add-require.vue index 920f9fa..c39e442 100644 --- a/src/views/sc/sale/out/add-require.vue +++ b/src/views/sc/sale/out/add-require.vue @@ -178,6 +178,7 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/sale/out'; import * as saleApi from '@/api/sc/sale/order'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddSaleOutSheetRequire', @@ -185,6 +186,7 @@ SaleOrderSelectorWithOut, BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -301,7 +303,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/sale/out/add-un-require.vue b/src/views/sc/sale/out/add-un-require.vue index 4459ff8..6f610bc 100644 --- a/src/views/sc/sale/out/add-un-require.vue +++ b/src/views/sc/sale/out/add-un-require.vue @@ -186,6 +186,7 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/sale/out'; import * as saleApi from '@/api/sc/sale/order'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddSaleOutSheetUnRequire', @@ -193,6 +194,7 @@ SaleOrderSelectorWithOut, BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, PlusOutlined, DeleteOutlined, NumberOutlined, EditOutlined, AlertOutlined }; }, @@ -299,7 +301,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/sale/out/approve.vue b/src/views/sc/sale/out/approve.vue index 8edbf97..6d857aa 100644 --- a/src/views/sc/sale/out/approve.vue +++ b/src/views/sc/sale/out/approve.vue @@ -162,6 +162,7 @@ import ApproveRefuse from '@/components/ApproveRefuse'; import SaleOrderDetail from '@/views/sc/sale/order/detail.vue'; import * as api from '@/api/sc/sale/out'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveSaleOutSheet', @@ -169,6 +170,7 @@ ApproveRefuse, SaleOrderDetail, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -251,7 +253,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/sale/out/index.vue b/src/views/sc/sale/out/index.vue index 7df1c4d..c581530 100644 --- a/src/views/sc/sale/out/index.vue +++ b/src/views/sc/sale/out/index.vue @@ -245,6 +245,7 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/sale/out'; import * as configApi from '@/api/sc/sale/config'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'SaleOutSheet', @@ -253,6 +254,7 @@ ApproveRefuse, SaleOrderDetail, }, + mixins: [multiplePageMix], setup() { return { h, @@ -383,17 +385,17 @@ openAddDialog() { configApi.get().then((res) => { if (res.outStockRequireSale) { - this.$router.push('/sale/out/add/require'); + this.openChildPage('/sale/out/add/require'); } else { - this.$router.push('/sale/out/add/un-require'); + this.openChildPage('/sale/out/add/un-require'); } }); }, openModifyDialog(row) { if (!this.$utils.isEmpty(row.saleOrderId)) { - this.$router.push('/sale/out/modify/require/' + row.id); + this.openChildPage('/sale/out/modify/require/' + row.id); } else { - this.$router.push('/sale/out/modify/un-require/' + row.id); + this.openChildPage('/sale/out/modify/un-require/' + row.id); } }, // 删除订单 @@ -525,7 +527,7 @@ ); }, onClick: () => { - this.$router.push('/sale/out/approve/' + row.id); + this.openChildPage('/sale/out/approve/' + row.id); }, }, { @@ -557,6 +559,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/sc/sale/out/modify-require.vue b/src/views/sc/sale/out/modify-require.vue index d50c4a0..b3ec211 100644 --- a/src/views/sc/sale/out/modify-require.vue +++ b/src/views/sc/sale/out/modify-require.vue @@ -212,12 +212,14 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/sale/out'; import * as saleApi from '@/api/sc/sale/order'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifySaleOutSheetRequire', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -336,7 +338,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/sale/out/modify-un-require.vue b/src/views/sc/sale/out/modify-un-require.vue index b159713..46fcda2 100644 --- a/src/views/sc/sale/out/modify-un-require.vue +++ b/src/views/sc/sale/out/modify-un-require.vue @@ -220,12 +220,14 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/sale/out'; import * as saleApi from '@/api/sc/sale/order'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifySaleOutSheetUnRequire', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, PlusOutlined, DeleteOutlined, NumberOutlined, EditOutlined, AlertOutlined }; }, @@ -333,7 +335,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/sale/return/add-require.vue b/src/views/sc/sale/return/add-require.vue index 200d601..0eb9efa 100644 --- a/src/views/sc/sale/return/add-require.vue +++ b/src/views/sc/sale/return/add-require.vue @@ -167,6 +167,7 @@ import * as api from '@/api/sc/sale/return'; import * as saleApi from '@/api/sc/sale/order'; import * as outApi from '@/api/sc/sale/out'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddSaleReturnSheetRequire', @@ -174,6 +175,7 @@ SaleOutSheetSelectorWithReturn, BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -282,7 +284,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/sale/return/add-un-require.vue b/src/views/sc/sale/return/add-un-require.vue index 8c2dcd2..43a3439 100644 --- a/src/views/sc/sale/return/add-un-require.vue +++ b/src/views/sc/sale/return/add-un-require.vue @@ -183,6 +183,7 @@ import * as api from '@/api/sc/sale/return'; import * as saleApi from '@/api/sc/sale/order'; import * as outApi from '@/api/sc/sale/out'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddSaleReturnSheetUnRequire', @@ -190,6 +191,7 @@ SaleOutSheetSelectorWithReturn, BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -296,7 +298,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 async initFormData() { diff --git a/src/views/sc/sale/return/approve.vue b/src/views/sc/sale/return/approve.vue index 1775a72..ba10c29 100644 --- a/src/views/sc/sale/return/approve.vue +++ b/src/views/sc/sale/return/approve.vue @@ -157,6 +157,7 @@ import ApproveRefuse from '@/components/ApproveRefuse'; import OutSheetDetail from '@/views/sc/sale/out/detail.vue'; import * as api from '@/api/sc/sale/return'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveSaleReturnSheet', @@ -164,6 +165,7 @@ ApproveRefuse, OutSheetDetail, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -238,7 +240,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/sale/return/index.vue b/src/views/sc/sale/return/index.vue index 05d7825..a2281a9 100644 --- a/src/views/sc/sale/return/index.vue +++ b/src/views/sc/sale/return/index.vue @@ -243,6 +243,7 @@ } from '@ant-design/icons-vue'; import * as api from '@/api/sc/sale/return'; import * as configApi from '@/api/sc/sale/config'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'SaleReturn', @@ -251,6 +252,7 @@ ApproveRefuse, OutSheetDetail, }, + mixins: [multiplePageMix], setup() { return { h, @@ -381,17 +383,17 @@ openAddDialog() { configApi.get().then((res) => { if (res.saleReturnRequireOutStock) { - this.$router.push('/sale/return/add/require'); + this.openChildPage('/sale/return/add/require'); } else { - this.$router.push('/sale/return/add/un-require'); + this.openChildPage('/sale/return/add/un-require'); } }); }, openModifyDialog(row) { if (!this.$utils.isEmpty(row.outSheetId)) { - this.$router.push('/sale/return/modify/require/' + row.id); + this.openChildPage('/sale/return/modify/require/' + row.id); } else { - this.$router.push('/sale/return/modify/un-require/' + row.id); + this.openChildPage('/sale/return/modify/un-require/' + row.id); } }, // 删除订单 @@ -523,7 +525,7 @@ ); }, onClick: () => { - this.$router.push('/sale/return/approve/' + row.id); + this.openChildPage('/sale/return/approve/' + row.id); }, }, { @@ -555,6 +557,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/sc/sale/return/modify-require.vue b/src/views/sc/sale/return/modify-require.vue index 60cdf06..dfd5d17 100644 --- a/src/views/sc/sale/return/modify-require.vue +++ b/src/views/sc/sale/return/modify-require.vue @@ -201,12 +201,14 @@ import * as api from '@/api/sc/sale/return'; import * as saleApi from '@/api/sc/sale/order'; import * as outApi from '@/api/sc/sale/out'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifySaleReturnSheetRequire', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -316,7 +318,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/sale/return/modify-un-require.vue b/src/views/sc/sale/return/modify-un-require.vue index b8d17b8..021cb92 100644 --- a/src/views/sc/sale/return/modify-un-require.vue +++ b/src/views/sc/sale/return/modify-un-require.vue @@ -217,12 +217,14 @@ import * as api from '@/api/sc/sale/return'; import * as saleApi from '@/api/sc/sale/order'; import * as outApi from '@/api/sc/sale/out'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifySaleReturnSheetUnRequire', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -330,7 +332,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/stock/adjust/stock/add.vue b/src/views/sc/stock/adjust/stock/add.vue index a874096..d1cf053 100644 --- a/src/views/sc/stock/adjust/stock/add.vue +++ b/src/views/sc/stock/adjust/stock/add.vue @@ -136,12 +136,14 @@ import BatchAddProduct from '@/views/sc/stock/adjust/stock/batch-add-product.vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/sc/stock/adjust/stock'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddStockAdjustSheet', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -214,7 +216,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/stock/adjust/stock/approve.vue b/src/views/sc/stock/adjust/stock/approve.vue index 0d14026..f558a0f 100644 --- a/src/views/sc/stock/adjust/stock/approve.vue +++ b/src/views/sc/stock/adjust/stock/approve.vue @@ -123,12 +123,14 @@ import { defineComponent } from 'vue'; import ApproveRefuse from '@/components/ApproveRefuse'; import * as api from '@/api/sc/stock/adjust/stock'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveStockAdjustSheet', components: { ApproveRefuse, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -167,7 +169,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/stock/adjust/stock/index.vue b/src/views/sc/stock/adjust/stock/index.vue index a8ff25c..80f975b 100644 --- a/src/views/sc/stock/adjust/stock/index.vue +++ b/src/views/sc/stock/adjust/stock/index.vue @@ -85,7 +85,7 @@ v-permission="['stock:adjust:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/stock/stock-adjust/add')" + @click="openChildPage('/stock/stock-adjust/add')" >新增 { - this.$router.push('/stock/stock-adjust/approve/' + row.id); + this.openChildPage('/stock/stock-adjust/approve/' + row.id); }, }, { @@ -433,7 +435,7 @@ ); }, onClick: () => { - this.$router.push('/stock/stock-adjust/modify/' + row.id); + this.openChildPage('/stock/stock-adjust/modify/' + row.id); }, }, { @@ -452,6 +454,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/sc/stock/adjust/stock/modify.vue b/src/views/sc/stock/adjust/stock/modify.vue index 455b42e..411ff1b 100644 --- a/src/views/sc/stock/adjust/stock/modify.vue +++ b/src/views/sc/stock/adjust/stock/modify.vue @@ -180,12 +180,14 @@ import BatchAddProduct from '@/views/sc/stock/adjust/stock/batch-add-product.vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/sc/stock/adjust/stock'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyStockAdjustSheet', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, PlusOutlined, DeleteOutlined }; }, @@ -256,7 +258,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/stock/take/config/index.vue b/src/views/sc/stock/take/config/index.vue index 5e6526e..7007bfa 100644 --- a/src/views/sc/stock/take/config/index.vue +++ b/src/views/sc/stock/take/config/index.vue @@ -65,11 +65,13 @@ diff --git a/src/views/sc/stock/take/pre/modify.vue b/src/views/sc/stock/take/pre/modify.vue index dab8a99..626310a 100644 --- a/src/views/sc/stock/take/pre/modify.vue +++ b/src/views/sc/stock/take/pre/modify.vue @@ -153,12 +153,14 @@ import BatchAddProduct from '@/views/sc/stock/take/pre/batch-add-product.vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/sc/stock/take/pre'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyPreTakeStockSheet', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -256,7 +258,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/stock/take/sheet/add.vue b/src/views/sc/stock/take/sheet/add.vue index afb241f..8a4f41b 100644 --- a/src/views/sc/stock/take/sheet/add.vue +++ b/src/views/sc/stock/take/sheet/add.vue @@ -126,12 +126,14 @@ import * as planApi from '@/api/sc/stock/take/plan'; import * as preApi from '@/api/sc/stock/take/pre'; import * as api from '@/api/sc/stock/take/sheet'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddStockTakeSheet', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -206,7 +208,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/stock/take/sheet/approve.vue b/src/views/sc/stock/take/sheet/approve.vue index 090f74e..8d0226a 100644 --- a/src/views/sc/stock/take/sheet/approve.vue +++ b/src/views/sc/stock/take/sheet/approve.vue @@ -142,6 +142,7 @@ import TakeStockPlanDetail from '@/views/sc/stock/take/plan/detail.vue'; import PreTakeStockSheetDetail from '@/views/sc/stock/take/pre/detail.vue'; import * as api from '@/api/sc/stock/take/sheet'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveStockTakeSheet', @@ -150,6 +151,7 @@ TakeStockPlanDetail, PreTakeStockSheetDetail, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -190,7 +192,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/stock/take/sheet/index.vue b/src/views/sc/stock/take/sheet/index.vue index 41c4312..2456f36 100644 --- a/src/views/sc/stock/take/sheet/index.vue +++ b/src/views/sc/stock/take/sheet/index.vue @@ -102,7 +102,7 @@ v-permission="['stock:take:sheet:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/stock/take/sheet/add')" + @click="openChildPage('/stock/take/sheet/add')" >新增 { - this.$router.push('/stock/take/sheet/modify/' + row.id); + this.openChildPage('/stock/take/sheet/modify/' + row.id); }, }, { @@ -502,7 +504,7 @@ ); }, onClick: () => { - this.$router.push('/stock/take/sheet/approve/' + row.id); + this.openChildPage('/stock/take/sheet/approve/' + row.id); }, }, { @@ -534,6 +536,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/sc/stock/take/sheet/modify.vue b/src/views/sc/stock/take/sheet/modify.vue index c54887d..eda461f 100644 --- a/src/views/sc/stock/take/sheet/modify.vue +++ b/src/views/sc/stock/take/sheet/modify.vue @@ -170,6 +170,7 @@ import PreTakeStockSheetDetail from '@/views/sc/stock/take/pre/detail.vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/sc/stock/take/sheet'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyStockTakeSheet', @@ -178,6 +179,7 @@ TakeStockPlanDetail, PreTakeStockSheetDetail, }, + mixins: [multiplePageMix], setup() { return { h, @@ -254,7 +256,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/stock/transfer/add.vue b/src/views/sc/stock/transfer/add.vue index beaaa0f..b1b3da0 100644 --- a/src/views/sc/stock/transfer/add.vue +++ b/src/views/sc/stock/transfer/add.vue @@ -114,12 +114,14 @@ import BatchAddProduct from '@/views/sc/stock/transfer/batch-add-product.vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/sc/stock/transfer-sc'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddScTransferSheet', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -209,7 +211,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/stock/transfer/approve.vue b/src/views/sc/stock/transfer/approve.vue index bff9c8f..2ff5fea 100644 --- a/src/views/sc/stock/transfer/approve.vue +++ b/src/views/sc/stock/transfer/approve.vue @@ -115,12 +115,14 @@ import { defineComponent } from 'vue'; import ApproveRefuse from '@/components/ApproveRefuse'; import * as api from '@/api/sc/stock/transfer-sc'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveScTransferSheet', components: { ApproveRefuse, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -159,7 +161,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/stock/transfer/index.vue b/src/views/sc/stock/transfer/index.vue index d662e86..6b22259 100644 --- a/src/views/sc/stock/transfer/index.vue +++ b/src/views/sc/stock/transfer/index.vue @@ -88,7 +88,7 @@ v-permission="['stock:sc-transfer:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/stock/stock-transfer/add')" + @click="openChildPage('/stock/stock-transfer/add')" >新增 { - this.$router.push('/stock/stock-transfer/approve/' + row.id); + this.openChildPage('/stock/stock-transfer/approve/' + row.id); }, }, { @@ -454,7 +456,7 @@ ); }, onClick: () => { - this.$router.push('/stock/stock-transfer/modify/' + row.id); + this.openChildPage('/stock/stock-transfer/modify/' + row.id); }, }, { @@ -481,11 +483,14 @@ ); }, onClick: () => { - this.$router.push('/stock/stock-transfer/receive/' + row.id); + this.openChildPage('/stock/stock-transfer/receive/' + row.id); }, }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/sc/stock/transfer/modify.vue b/src/views/sc/stock/transfer/modify.vue index f3cd307..3cfebca 100644 --- a/src/views/sc/stock/transfer/modify.vue +++ b/src/views/sc/stock/transfer/modify.vue @@ -157,12 +157,14 @@ import BatchAddProduct from './batch-add-product.vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/sc/stock/transfer-sc'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifyScTransferSheet', components: { BatchAddProduct, }, + mixins: [multiplePageMix], setup() { return { h, @@ -254,7 +256,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/sc/stock/transfer/receive.vue b/src/views/sc/stock/transfer/receive.vue index b84a187..50435b5 100644 --- a/src/views/sc/stock/transfer/receive.vue +++ b/src/views/sc/stock/transfer/receive.vue @@ -140,10 +140,12 @@ diff --git a/src/views/settle/check-sheet/modify.vue b/src/views/settle/check-sheet/modify.vue index 865ec14..afade3b 100644 --- a/src/views/settle/check-sheet/modify.vue +++ b/src/views/settle/check-sheet/modify.vue @@ -157,10 +157,12 @@ import { h, defineComponent } from 'vue'; import { SearchOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/settle/check'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifySupplierSettleCheckSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -226,7 +228,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/settle/fee-sheet/add.vue b/src/views/settle/fee-sheet/add.vue index fae2b3a..df00a68 100644 --- a/src/views/settle/fee-sheet/add.vue +++ b/src/views/settle/fee-sheet/add.vue @@ -110,10 +110,12 @@ import { h, defineComponent } from 'vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/settle/fee'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddSupplierSettleFeeSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, PlusOutlined, DeleteOutlined }; }, @@ -164,7 +166,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/settle/fee-sheet/approve.vue b/src/views/settle/fee-sheet/approve.vue index 7dfd590..ac17f6d 100644 --- a/src/views/settle/fee-sheet/approve.vue +++ b/src/views/settle/fee-sheet/approve.vue @@ -124,12 +124,14 @@ import { defineComponent } from 'vue'; import ApproveRefuse from '@/components/ApproveRefuse'; import * as api from '@/api/settle/fee'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveSupplierSettleFeeSheet', components: { ApproveRefuse, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -166,7 +168,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/settle/fee-sheet/index.vue b/src/views/settle/fee-sheet/index.vue index 6026fe2..79e044a 100644 --- a/src/views/settle/fee-sheet/index.vue +++ b/src/views/settle/fee-sheet/index.vue @@ -99,7 +99,7 @@ v-permission="['settle:fee-sheet:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/settle/supplier/fee-sheet/add')" + @click="openChildPage('/settle/supplier/fee-sheet/add')" >新增 { - this.$router.push('/settle/supplier/fee-sheet/approve/' + row.id); + this.openChildPage('/settle/supplier/fee-sheet/approve/' + row.id); }, }, { @@ -457,7 +459,7 @@ ); }, onClick: () => { - this.$router.push('/settle/supplier/fee-sheet/modify/' + row.id); + this.openChildPage('/settle/supplier/fee-sheet/modify/' + row.id); }, }, { @@ -476,6 +478,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/settle/fee-sheet/modify.vue b/src/views/settle/fee-sheet/modify.vue index 19e773d..49849ab 100644 --- a/src/views/settle/fee-sheet/modify.vue +++ b/src/views/settle/fee-sheet/modify.vue @@ -153,10 +153,12 @@ import { h, defineComponent } from 'vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/settle/fee'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifySupplierSettleFeeSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, PlusOutlined, DeleteOutlined }; }, @@ -209,7 +211,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/settle/pre-sheet/add.vue b/src/views/settle/pre-sheet/add.vue index 5e133ff..f22c341 100644 --- a/src/views/settle/pre-sheet/add.vue +++ b/src/views/settle/pre-sheet/add.vue @@ -91,10 +91,12 @@ import { h, defineComponent } from 'vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/settle/pre'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddSupplierSettlePreSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, PlusOutlined, DeleteOutlined }; }, @@ -145,7 +147,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/settle/pre-sheet/approve.vue b/src/views/settle/pre-sheet/approve.vue index 0101a1c..a56c470 100644 --- a/src/views/settle/pre-sheet/approve.vue +++ b/src/views/settle/pre-sheet/approve.vue @@ -121,12 +121,14 @@ import { defineComponent } from 'vue'; import ApproveRefuse from '@/components/ApproveRefuse'; import * as api from '@/api/settle/pre'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveSupplierSettlePreSheet', components: { ApproveRefuse, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -163,7 +165,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/settle/pre-sheet/index.vue b/src/views/settle/pre-sheet/index.vue index 76cd0ad..0418b50 100644 --- a/src/views/settle/pre-sheet/index.vue +++ b/src/views/settle/pre-sheet/index.vue @@ -99,7 +99,7 @@ v-permission="['settle:pre-sheet:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/settle/supplier/pre-sheet/add')" + @click="openChildPage('/settle/supplier/pre-sheet/add')" >新增 { - this.$router.push('/settle/supplier/pre-sheet/approve/' + row.id); + this.openChildPage('/settle/supplier/pre-sheet/approve/' + row.id); }, }, { @@ -457,7 +459,7 @@ ); }, onClick: () => { - this.$router.push('/settle/supplier/pre-sheet/modify/' + row.id); + this.openChildPage('/settle/supplier/pre-sheet/modify/' + row.id); }, }, { @@ -476,6 +478,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/settle/pre-sheet/modify.vue b/src/views/settle/pre-sheet/modify.vue index 662aa49..16fe76b 100644 --- a/src/views/settle/pre-sheet/modify.vue +++ b/src/views/settle/pre-sheet/modify.vue @@ -134,10 +134,12 @@ import { h, defineComponent } from 'vue'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/settle/pre'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifySupplierSettlePreSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -194,7 +196,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/settle/sheet/add.vue b/src/views/settle/sheet/add.vue index 38d65e6..4a5e0b2 100644 --- a/src/views/settle/sheet/add.vue +++ b/src/views/settle/sheet/add.vue @@ -151,10 +151,12 @@ import moment from 'moment'; import { SearchOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/settle/sheet'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'AddSupplierSettleSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -246,7 +248,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/settle/sheet/approve.vue b/src/views/settle/sheet/approve.vue index 6b04ae9..6e74c2d 100644 --- a/src/views/settle/sheet/approve.vue +++ b/src/views/settle/sheet/approve.vue @@ -190,6 +190,7 @@ import ApproveRefuse from '@/components/ApproveRefuse'; import SettleCheckSheetDetail from '@/views/settle/check-sheet/detail.vue'; import * as api from '@/api/settle/sheet'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ApproveSupplierSettleSheet', @@ -197,6 +198,7 @@ ApproveRefuse, SettleCheckSheetDetail, }, + mixins: [multiplePageMix], data() { return { id: this.$route.params.id, @@ -259,7 +261,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { diff --git a/src/views/settle/sheet/index.vue b/src/views/settle/sheet/index.vue index c50583e..f3d36a8 100644 --- a/src/views/settle/sheet/index.vue +++ b/src/views/settle/sheet/index.vue @@ -85,7 +85,7 @@ v-permission="['settle:sheet:add']" type="primary" :icon="h(PlusOutlined)" - @click="$router.push('/settle/supplier/sheet/add')" + @click="openChildPage('/settle/supplier/sheet/add')" >新增 { - this.$router.push('/settle/supplier/sheet/approve/' + row.id); + this.openChildPage('/settle/supplier/sheet/approve/' + row.id); }, }, { @@ -435,7 +437,7 @@ ); }, onClick: () => { - this.$router.push('/settle/supplier/sheet/modify/' + row.id); + this.openChildPage('/settle/supplier/sheet/modify/' + row.id); }, }, { @@ -454,6 +456,9 @@ }, ]; }, + onRefreshPage() { + this.search(); + }, }, }); diff --git a/src/views/settle/sheet/modify.vue b/src/views/settle/sheet/modify.vue index 4cc8a0f..86b319e 100644 --- a/src/views/settle/sheet/modify.vue +++ b/src/views/settle/sheet/modify.vue @@ -195,10 +195,12 @@ import { h, defineComponent } from 'vue'; import { SearchOutlined } from '@ant-design/icons-vue'; import * as api from '@/api/settle/sheet'; + import { multiplePageMix } from '@/mixins/multiplePageMix'; export default defineComponent({ name: 'ModifySupplierSettleSheet', components: {}, + mixins: [multiplePageMix], setup() { return { h, @@ -292,7 +294,7 @@ }, // 关闭对话框 closeDialog() { - this.$utils.closeCurrentPage(); + this.closeCurrentPage(); }, // 初始化表单数据 initFormData() { -- Gitee