From 85354b486f791dc9412502a5dee7ff8a0ed57e75 Mon Sep 17 00:00:00 2001 From: siontion Date: Mon, 26 Feb 2024 20:19:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 采购订单 路由跳转优化 --- .../mes-ui-admin-vue3/src/views/heli/materialplan/add.vue | 5 +++++ .../src/views/heli/materialplan/edit.vue | 8 +++++++- .../src/views/heli/purchaseorder/add.vue | 5 ++++- .../src/views/heli/purchaseorder/edit.vue | 8 +++++++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue index 922a8037..bbe26aaf 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/add.vue @@ -92,11 +92,15 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import * as MaterialPlanApi from '@/api/heli/materialplan' import { Search, Plus } from '@element-plus/icons-vue' +import { useTagsViewStore } from "@/store/modules/tagsView" import ProjectPlanDialog from '@/views/heli/materialplan/ProjectPlanDialog.vue' const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const router = useRouter() +const tagsViewStore = useTagsViewStore(); + +const currentTag = router.currentRoute.value; const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 @@ -148,6 +152,7 @@ const submitForm = async () => { dialogVisible.value = false } finally { formLoading.value = false + tagsViewStore.delVisitedView(currentTag); } } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue index a4f1ecb5..e4c4d801 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/edit.vue @@ -265,7 +265,7 @@
- 取 消 + 取 消 删 除 保 存 送 审 @@ -286,12 +286,14 @@ import download from '@/utils/download' import { getAccessToken, getTenantId } from '@/utils/auth' import { dateFormatter, formatDate } from '@/utils/formatTime' import { useUserStore } from '@/store/modules/user' +import { useTagsViewStore } from "@/store/modules/tagsView" const reload = inject('reload') const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const { query } = useRoute() const router = useRouter() +const tagsViewStore = useTagsViewStore(); const dialogVisible = ref(false) // 弹窗的是否展示 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 @@ -506,6 +508,10 @@ const saveMaterials = async () =>{ }) } +const closeForm = async () =>{ + router.push({ path: '/purchase/materialplan' }) + tagsViewStore.delVisitedView(router.currentRoute.value); +} const deleteForm = async () =>{ // 提示用户是否保存入库信息 await message.confirm('确认删除当前物料需求计划?') diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue index fbfc4114..6c413b55 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/add.vue @@ -128,11 +128,14 @@ import * as SupplierApi from '@/api/heli/supplier' import * as PurchaseOrderApi from '@/api/heli/purchaseorder' import { Search, Plus } from '@element-plus/icons-vue' import ProjectPlanDialog from '@/views/heli/materialplan/ProjectPlanDialog.vue' +import { useTagsViewStore } from "@/store/modules/tagsView" const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const router = useRouter() +const tagsViewStore = useTagsViewStore(); +const currentTag = router.currentRoute.value; const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 @@ -193,7 +196,7 @@ const submitForm = async () => { dialogVisible.value = false } finally { formLoading.value = false - + tagsViewStore.delVisitedView(currentTag) //this.$tab.closePage(); } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue index 0675e30a..1e0b2341 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue @@ -325,7 +325,7 @@
- 取 消 + 取 消 删 除 保 存 送 审 @@ -344,6 +344,7 @@ import download from '@/utils/download' import { getAccessToken, getTenantId } from '@/utils/auth' import { dateFormatter, formatDate } from '@/utils/formatTime' import { useUserStore } from '@/store/modules/user' +import { useTagsViewStore } from "@/store/modules/tagsView" const reload = inject('reload') @@ -351,6 +352,7 @@ const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 const { query } = useRoute() const router = useRouter() +const tagsViewStore = useTagsViewStore(); const dialogVisible = ref(false) // 弹窗的是否展示 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 @@ -569,6 +571,10 @@ const saveMaterials = async () =>{ }) } +const closeForm = async () =>{ + router.push({ path: '/purchase/purchaseorder' }) + tagsViewStore.delVisitedView(router.currentRoute.value); +} const deleteForm = async () =>{ // 提示用户是否保存入库信息 await message.confirm('确认删除当前采购订单?')