diff --git a/src/mixins/multiplePageMix.ts b/src/mixins/multiplePageMix.ts new file mode 100644 index 0000000000000000000000000000000000000000..17aab443f906dbf6f0241a0ab3ab8cba260a6c86 --- /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 6293207fa0183aa8e7804b2c6f639d2a7d75afe0..29911da8327f1f96562051295740e8ad6eec0009 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 bac14fc140f0500ed5d123d17a8038a5690694a8..622b3bb1f143196be6031fd036937801b048ba9d 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 06ca79b9778f8214ea25b2b5abd35c88fc0ec482..8c0d3d5209eccd610013d41766d8c035aec25dba 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 96c83ee7eea9d0ede47c57b16725d3b8572c0b48..88f61e5776685f8dde28d64e9ed6e5ebf1c7109c 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 619d3f7d7e3b22e749889b3f95031420f5bfdbb5..b4fb6e7a7cf4096621f807a1672b7dd1a6145936 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 9b6d30d9840a18cc4b2a57b1a7c1cae70214ce2f..5785ce0d015f438610d4d7f28af3acb66b302aa4 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 24a1555034efd7d61b98f27e6a6a3627067aed95..f211175ad080580a44c9d26821369437727b9425 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 bcf3077ac66f8d13c2a2dbb023b4581b79ba227c..b5c8e640c58dd2dbb000aa147465dfb7b4dad837 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 299d2710dd29f1659ea563bec15af5922e47af6b..928f82625498f438d9bbf49eb1cff76976ab4a0f 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 039c9f0a2703140fc99b2f0407616113860900d1..a766d0db5a4c4389f37eebc5adfed246434c391e 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 03912a30b3fb6daa5cbb1655c8ddfc26df562e7f..844706e851349a974bf17615e6c95c570455d7ae 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 8740fd578aac037296a150e9061cfa5b9900298c..ed73603ef397d5f9ffba480d856a50a163e9e979 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 26abc67aebd2d38de6bb30d5e612f472bf26ead8..b8acac28d8cbee7f435ff2072ea83d2bb2c718de 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 506fb44a011a0806d171f51aa3b1582d1e176363..930596f64f02491bdaa3adb3967dec368750d90b 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 a98c70ae4963977b43ce0e9d84afaff9792ad9b5..8087c6b97a9a34fb8a48699a0f6f4465efa8f154 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 482dbbefb5b1a2181f8427a546cc414a237f3e48..f57b86e1cf2e854148b73b2cabf8745a35780b5d 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 160f764fc21856e7a4bffc2736e8ae7d04b41207..b0aa78a79d6f2fbdbc5258173ccba49c0e068f3c 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 2780f5eb879b042a81ac9b7c0d91e1349bf30aa5..6ace6563763ddf5c252bfdbffffaf12f46c871a6 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 e766ce61eab944ff20a67f63fba266001fea8080..937c21777a95e0fda1b08b8cac623b70346e5d5d 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 2206fb7f7979e9a515db26d9194398912374e8ac..25a2a0d1f0cfbd46a767eeec3fde29f019451674 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 c75d5211e3c1cd853a564f2977ca83bb9522a43c..6579c465381d434f53682922d6b1b7e14245b928 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 7571448b7ff7eaf5b93a2c344f7f112a08037e61..d39f4400b99a6faa16b58ef99bbef2332f27c3de 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 edd6bf42660ab2289427a935c5f13ad37f52f696..1f3b3e6a60463ccc4ba9bfa99b0fea67e38ad541 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 3bc3fa52b92a522bd6c9b5477dbd01b21cd956f4..9a596183e30680f49b26a8e0569391b0df099df9 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 70c08ddb30f6f8fdf01af836fdfc6d2654129be5..cd7ae5011f758b4bb53bfdbaea1f5d25ceb3d383 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 cb86c876f2dccb4052b4633891d57e75d38ae5d7..e5a541c5b9c419b2225a6d4cc53990b55e8732d1 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 81b9d58de62f3c7b0d9c72a163b608eddabe2a1d..c281e0f9e8bebd01cfc6c20cf79bc0739f6531c3 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 382f68e53cdecc27fd91a6ce38a28f34997df23e..dc6bad6a6f6b8c87c26f98922ccbcf222c8500b1 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 8bb48090222d7f7ef0ba3986b2bb5a129dab4e8c..6c5c41ab92b20ea6260fee08b8ebcb42bacc0216 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 05cbdc54c1a7fe44d724ac91f53ff48ae38fc8ba..0386bb2e18fa9c60fe30c4ff63c12113857ec5e5 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 5174cc643c00d9fb5040af27b90ace15a548e2b8..94d9be12781d16535a3faccd9ed60746f91b96f3 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 08157d85359ed3cf06ded107a7c220a0e3c840c5..57915c9781231a315b903656ba4c540c0235a640 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 1e9ef7d5514d75f669452a9e86d593149ee55aad..a4e81289b976182bae15a5fbed085a9233b23e29 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 3aceadaa72cffc17a923353c658d77bb60984876..ac4159e937b93b10ac2d97e69fb6c243c6eecfea 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 cfcb465675aecb15f99187cb66d7eff405ccd2c0..3f26279925fe58af5f9731a3236cf795adeabcb3 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 f480acbe1edabc34c0019a02be6c060300beca18..42636fa541f67e18fb89e1f4e884fda28fbc917a 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 36dc2e540d1aa1741e9d96842273afd65f9b33af..4eea3b352424d9da9f09a6e720058fa6d3c65148 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 6e54e1b0188009be0c4ad769fcfe612830b3c00f..6b1db27c3430aae19ad6786e94fd0ee407549866 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 5d5cc8230817cdbac83dc14fbec26d48e39a3ede..7bce875623a11edf2a692fd88eeca0c8c114a045 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 530e424f3193bcedfdd1ece09fc300614bc09198..3790261e20145aaceaeafdda25d9bf85a0f69000 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 74b7d45034ff9747ca18232770a56bd4d40bfaf8..8ef1f7489c689e22f5dcfc7b9dad815a4a8d3dc9 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 a9057b4d145d34f8f41c439b658008a8a040fad6..20464a4b91007ead1d5fe7db819974eed4afe7d6 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 f7ae8650ad00028888d19f362ce09f8ccdf31faa..267eea3f3a4cb4c80e41ea164b296b7b4da3425c 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 bc7a046c54f5fa579d28c02945fbdf263d3f8c99..3da2520d8c20321ecf54fb88b01c664315e7846f 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 2cd91217649dd8b953757a1713b7e1c7c4e28471..739f8c4efe5e0e6edf6b6b2a25e5ffac02a1e828 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 fbfb76aef3fdb7d15e04aa826e57389063033cec..9c08964e936ce45714372ef255b9725e2555cc2c 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 78dabe201f6978628598f1e68fadaf328c26cc41..8458ca48c1aeef49045e8a8ed03ff747360e905f 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 ef2f44e3cda16ebf1c0072b23c5dddee6083a820..7d4fe1331f835873cee7f6b9a282adc51baba7c5 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 4d0ce01ce0c9ee031c6ab679e23823159c4b9ba8..30070089a424a465309f67968834496396ea887c 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 920f9fa003de9a91379054fc160ec6bb7f754296..c39e442073f2f555298292cef11e23663680a81f 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 4459ff8fbe7516cef955a1ba4e73fe1f747dc890..6f610bc7cc416f6c58eee9e3da151fe1cdca1045 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 8edbf978f24da64066ad861109309ed89ccc4eff..6d857aad3b73f390031f56eb742b854bb2f46767 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 7df1c4ded3ff7f745d8606eced646ec3f3f6a982..c581530a4416075cbf3696cf80e4926d045603d2 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 d50c4a07e6a9b02f392876d9cbc222f7d740429e..b3ec211b5aa93ac105d4b6664ed3a0365d4a28cc 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 b15971334a18d22f12082db3126914d2fb9afe98..46fcda2a4a6c25cefeccd9eaab7d54d1fdb0ed14 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 200d6016c0a7db7af653f84ecd2077acbb666460..0eb9efa44e60b1ce9683e60da759cb674ac800f2 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 8c2dcd25525bf620f9aa9c94a046c4ef3ee893ac..43a34394b4ca376c9dff5d4db10d74d3573ff455 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 1775a7245746af881eb8b0029f00b1961e071da5..ba10c29b7611702f90dee957d22fc78a8ccd1e94 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 05d78251c661e0cf52d6131b31ad56ce2b6594a2..a2281a9b4536a0b276ed1c95e274bfe602abdf75 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 60cdf0662106953e99c43aabb7db6548c11aad6e..dfd5d1759ed6e70419e00a7c2cf17f2b58426483 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 b8d17b8b330ee0f9ac2d0915ca1c858524d6d2f5..021cb928f89c9add22f8fb9d9fc3ef3b7e24e844 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 a87409623985687f8af81bc33973ae2dff4a2cf9..d1cf05324b553e2fe0be8a1a06db62cb11a8e2ec 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 0d14026cb3541e6e972fc4d6e24094b5d84925d5..f558a0f046298401f0a7b31b21998fd233ce9028 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 a8ff25c77ff6a1975534d441baa57893b3bb059f..80f975bbeff4362d10c2b2daf33f16ecbd3aa1c5 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 455b42ea72eb7fc25694a92d24b14a0b341a6ba1..411ff1bf39a0dc7a0e5bebae5039690d8c1de92d 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 5e6526eb53cbbc96aaf743228f50050ec5f6e62f..7007bfaf7647325be2a07f2d95d46836fa3e293c 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 dab8a99ae5408f2c43f8adb6c24f979183c60204..626310a9965ed95626474ad41271c4e3140f5df6 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 afb241fa459236921e95c77d8af61bb993fd583f..8a4f41b8fb5a0e2f1ed717b60bf9133347090da7 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 090f74e5d7cbdc3dfa022fd693c61ffcb88e9b03..8d0226a249a0af496eeee5a12073a4e12ec63b13 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 41c431243d1d3b5b22b78ecbae0304054ba9dd8a..2456f369371104994947a97dc1282cf0cf323618 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 c54887d7b29f9e20bb79c1296c369ca50d0363a0..eda461fd09b015de282cf6751da4deea408d4005 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 beaaa0f7ebd2dc71640304e520b9f32d8b3cd4e7..b1b3da00521dd4a733be10df09a6e8c92151f01a 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 bff9c8f874108da7322297e23ec39537fcb12269..2ff5fea7d42fb985add892182268cb9eab8c527b 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 d662e861fb44487600138e21d1ded48c99d4f348..6b222590fcd52dd251fdf0fe925749f56c8fb038 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 f3cd307c0cf1cd16a380efd9d42b635a536ea6c9..3cfebcaee2b59029e91a19f697bbe2230f54bb17 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 b84a1876c7972832e4833b22676830d043193b34..50435b5df7b8c0f904e6391332b8ad7cf656fe16 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 865ec145659e30741bbea25316d179c7ce7963a9..afade3b9a5428980bd358ff0ff5687c85e47feed 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 fae2b3a15ce4aa0650a727a95672613cd0a57212..df00a68006d220a064a99e5e6589cb2e4e4818f9 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 7dfd5906bd19102af28796030322e70079d0766f..ac17f6dc6d92a6ba471a4436a19a84ff3b7799ec 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 6026fe266ccd3615cd16e903decb8cdbb9d48d3c..79e044a360c837f15b9fb19a03b4406888f9d362 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 19e773d64da32ca995006d9e53b58b9237f3a510..49849ab088f3588b5fce16997da5d81c364250d3 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 5e133ffd641dcec17e6b33b67a081082932c8e15..f22c341aa45f8d987ed01b0e67a1477d6c647ceb 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 0101a1c8d5b376da6f8d3f083749971169704455..a56c4709bec5f4b9f19178c74781619175d96817 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 76cd0ad1000802a1c4c1d79ef48de353ae36566f..0418b50f46466c4111be7d11963b93fdeb2b4cee 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 662aa49f057a1063a03202ef8d66ab534f7be5da..16fe76b5fc329d4d32dab21080bebbfd72eca8f0 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 38d65e6eca6b1b4e1fbea583263d828d779e9fe4..4a5e0b233a68f4c3869180bffc89c57b54e56d29 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 6b04ae9ed5e44d3d6705b8540fbff2cff8f87934..6e74c2dd0958c8f98130b81bfe107dcfe436d67f 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 c50583e2466810ef142d5ddf51e52b4c8443bb61..f3d36a8aeb30ea63f1226bdde09891fe007672de 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 4cc8a0fe877d9268eead11c83ede8b2d565bf148..86b319e304eabb7186827d1c76bfbf1b73aaa764 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() {