From 3c4d241b9ef0d14a0cea5cd69b7919dfba1d14c5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 24 七月 2026 16:17:15 +0800
Subject: [PATCH] 银川 1.销售订单生产状态不匹配, 2.采购订单中没有退货状态字段,筛选项有退货状态 3.采购申请添加查看订单、查看审批功能 4.物料管理与mes产品管理的联动逻辑修改

---
 src/views/wls/returnissue/modules/form.vue |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/views/wls/returnissue/modules/form.vue b/src/views/wls/returnissue/modules/form.vue
index 341d637..1546dd4 100644
--- a/src/views/wls/returnissue/modules/form.vue
+++ b/src/views/wls/returnissue/modules/form.vue
@@ -5,8 +5,8 @@
 
 import { computed, ref } from 'vue';
 
-import { useVbenModal } from '../../../../packages/effects/common-ui/src';
-import { MesWmReturnIssueStatusEnum } from '../../../../packages/constants/src';
+import { useVbenModal } from '@vben/common-ui';
+import { MesWmReturnIssueStatusEnum } from '@vben/constants';
 
 import { Button, Divider, message, Popconfirm } from 'ant-design-vue';
 
@@ -142,17 +142,21 @@
       if (formData.value?.id) {
         await updateReturnIssue({ ...formData.value, ...data });
         formData.value = { ...formData.value, ...data };
-      } else {
-        const id = await createReturnIssue(data);
-        formData.value = {
-          ...data,
-          id,
-          status: MesWmReturnIssueStatusEnum.PREPARE,
-        };
-        await formApi.setFieldValue('id', id);
-        await formApi.setFieldValue('status', formData.value.status);
-        formType.value = 'update';
+        emit('success');
+        message.success($t('ui.actionMessage.operationSuccess'));
+        await modalApi.close();
+        return;
       }
+      // 鏂板锛氫繚鎸佸脊绐楁墦寮�锛屽垏鎹㈠埌缂栬緫妯″紡
+      const id = await createReturnIssue(data);
+      formData.value = {
+        ...data,
+        id,
+        status: MesWmReturnIssueStatusEnum.PREPARE,
+      };
+      await formApi.setFieldValue('id', id);
+      await formApi.setFieldValue('status', formData.value.status);
+      formType.value = 'update';
       originalSnapshot.value = JSON.stringify(await formApi.getValues());
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));

--
Gitblit v1.9.3