From 50fc41db4bc1b62346cc4203ec978f9039426131 Mon Sep 17 00:00:00 2001 From: ctw Date: Mon, 3 Nov 2025 15:37:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=85=B1=E5=AF=8C?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=BD=AE=E6=92=AD=E5=9B=BE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/supermarket/mallProduct/form.vue | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/views/supermarket/mallProduct/form.vue b/src/views/supermarket/mallProduct/form.vue index d92eae7..619fe50 100644 --- a/src/views/supermarket/mallProduct/form.vue +++ b/src/views/supermarket/mallProduct/form.vue @@ -30,18 +30,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -72,7 +72,7 @@ - + @@ -134,7 +134,7 @@
Date: Tue, 4 Nov 2025 17:44:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/supermarket/mallProduct/form.vue | 6 ++--- .../supermarketerp/report/inventory/index.vue | 27 ++++++++++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/views/supermarket/mallProduct/form.vue b/src/views/supermarket/mallProduct/form.vue index 619fe50..fe41dc4 100644 --- a/src/views/supermarket/mallProduct/form.vue +++ b/src/views/supermarket/mallProduct/form.vue @@ -72,7 +72,7 @@ - + @@ -170,13 +170,13 @@ - + @@ -99,6 +99,9 @@ + + +
@@ -110,11 +113,13 @@ import { useDict } from "/@/hooks/dict" // 引入组件 const FormDialog = defineAsyncComponent(() => import("./form.vue")) +const HandleDialog = defineAsyncComponent(() => import("./handleDialog.vue")) // 定义查询字典 const { maintenance_urgency, maintenance_status } = useDict("maintenance_urgency", "maintenance_status") // 定义变量内容 const formDialogRef = ref() +const handleDialogRef = ref() // 搜索变量 const queryRef = ref() const showSearch = ref(true) @@ -167,19 +172,8 @@ const handleDelete = async (ids: string[]) => { } } -// 添加已处理操作 -const handleProcessed = async (row: any) => { - try { - await useMessageBox().confirm("确定将该工单标记为已处理吗?") - } catch { - return - } - try { - await putObj({ ...row, status: 1 }) - useMessage().success("已处理") - getDataList() - } catch (err: any) { - useMessage().error(err.msg) - } +// 开始处理操作 +const handleProcessed = (row: any) => { + handleDialogRef.value.openDialog(row.id) } diff --git a/src/views/integrated/notice/form.vue b/src/views/integrated/notice/form.vue index 01982e5..61e0799 100644 --- a/src/views/integrated/notice/form.vue +++ b/src/views/integrated/notice/form.vue @@ -81,7 +81,7 @@ const loading = ref(false) const {push_status, is_top} = useDict('push_status', 'is_top') // 提交表单数据 -const form = reactive({ +const defaultForm = { id: '', description: '', status: '', @@ -92,7 +92,8 @@ const form = reactive({ isTop: '', viewCount: '', expireTime: '', -}); +} +const form = reactive({ ...defaultForm }) // 定义校验规则 const dataRules = ref({ @@ -115,7 +116,7 @@ const disabledTime = () => { // 打开弹窗 const openDialog = (id: string) => { visible.value = true - form.id = '' + Object.assign(form, defaultForm) // 重置表单数据 nextTick(() => {