From b64a0deae5b5d33f9e20671a68936b27f0b9b00b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 七月 2026 18:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/mes/pro/feedback/modules/form.vue |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 89e8a52..00ae80a 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -1,13 +1,13 @@
-<script lang="ts" setup>
+锘�<script lang="ts" setup>
 import type { FormType } from '../data';
 
 import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
 
 import { computed, ref } from 'vue';
 
-import { useVbenModal } from '..\..\..\..\..\packages\effects\common-ui\src';
-import { MesAutoCodeRuleCode, MesProFeedbackStatusEnum } from '..\..\..\..\..\packages\constants\src';
-import { useUserStore } from '..\..\..\..\..\packages\stores\src';
+import { useVbenModal } from '@vben/common-ui';
+import { MesAutoCodeRuleCode, MesProFeedbackStatusEnum } from '@vben/constants';
+import { useUserStore } from '@vben/stores';
 
 import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
 
@@ -30,6 +30,7 @@
 
 const emit = defineEmits(['success']);
 const formType = ref<FormType>('create');
+const showSubmitButton = ref(true);
 const formData = ref<MesProFeedbackApi.Feedback>();
 const userStore = useUserStore();
 const subTabsName = ref('itemConsume');
@@ -40,6 +41,7 @@
 );
 const canSubmit = computed(
   () =>
+    showSubmitButton.value &&
     isEditable.value &&
     formData.value?.status === MesProFeedbackStatusEnum.PREPARE,
 );
@@ -126,6 +128,7 @@
       await updateFeedback(data);
       formData.value = { ...formData.value, ...data };
       message.success($t('common.updateSuccess'));
+      await modalApi.close();
     }
     // 鍒锋柊蹇収锛堝凡瀵归綈鏁伴噺骞惰ˉ id锛夛紝鍚庣画 submit 鐢ㄤ簬鍒ゆ柇鏄惁闇�瑕佸啀淇濆瓨
     originalSnapshot.value = JSON.stringify(data);
@@ -152,7 +155,7 @@
     await submitFeedback(formData.value!.id!);
     await modalApi.close();
     emit('success');
-    message.success('鎶ュ伐鍗曞凡鎻愪氦');
+    message.success('鎶ヨ鍗曞凡鎻愪氦');
   } finally {
     modalApi.unlock();
   }
@@ -169,7 +172,7 @@
     await modalApi.close();
     emit('success');
     message.success(
-      finished ? '鎶ュ伐鍗曞凡瀹℃壒瀹屾垚' : '鎶ュ伐鎴愬姛锛岃绛夊緟璐ㄩ噺妫�楠屽畬鎴愶紒',
+      finished ? '鎶ヨ鍗曞凡瀹℃壒瀹屾垚' : '鎶ュ伐鎴愬姛锛岃绛夊緟璐ㄩ噺妫�楠屽畬鎴愶紒',
     );
   } finally {
     modalApi.unlock();
@@ -186,7 +189,7 @@
     await rejectFeedback(formData.value.id);
     await modalApi.close();
     emit('success');
-    message.success('鎶ュ伐鍗曞凡椹冲洖');
+    message.success('鎶ヨ鍗曞凡椹冲洖');
   } finally {
     modalApi.unlock();
   }
@@ -224,8 +227,9 @@
       return;
     }
     // 鍔犺浇鏁版嵁
-    const data = modalApi.getData<{ formType: FormType; id?: number }>();
+    const data = modalApi.getData<{ formType: FormType; id?: number; showSubmitButton?: boolean }>();
     formType.value = data.formType;
+    showSubmitButton.value = data.showSubmitButton !== false;
     formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     // 瀹℃壒/璇︽儏鏁磋〃绂佺敤锛岄伩鍏嶅鏍镐汉璇敼鏈彁浜ょ殑瀛楁
     formApi.setDisabled(
@@ -233,10 +237,12 @@
     );
     modalApi.setState({
       showConfirmButton:
-        formType.value !== 'detail' && formType.value !== 'approve',
+        formType.value !== 'detail' &&
+        formType.value !== 'approve' &&
+        formType.value !== 'submit',
     });
     if (!data?.id) {
-      // 鏂板锛氶粯璁ゆ姤宸ヤ汉鍜屾姤宸ユ椂闂达紝骞惰嚜鍔ㄧ敓鎴愭姤宸ュ崟鍙�
+      // 鏂板锛氶粯璁ゆ姤宸ヤ汉鍜屾姤宸ユ椂闂达紝骞惰嚜鍔ㄧ敓鎴愭姤璁㈠崟鍙�
       const code = await generateAutoCode(
         MesAutoCodeRuleCode.PRO_FEEDBACK_CODE,
       );
@@ -287,21 +293,21 @@
       <div class="flex flex-auto items-center justify-end gap-2">
         <Popconfirm
           v-if="canSubmit"
-          title="纭鎻愪氦璇ユ姤宸ュ崟锛熸彁浜ゅ悗灏嗕笉鑳戒慨鏀广��"
+          title="纭鎻愪氦璇ユ姤璁㈠崟锛熸彁浜ゅ悗灏嗕笉鑳戒慨鏀广��"
           @confirm="handleSubmit"
         >
           <Button type="primary">{{ $t('common.submit') }}</Button>
         </Popconfirm>
         <Popconfirm
           v-if="canApprove"
-          title="纭瀹℃壒閫氳繃璇ユ姤宸ュ崟锛�"
+          title="纭瀹℃壒閫氳繃璇ユ姤璁㈠崟锛�"
           @confirm="handleApprove"
         >
           <Button type="primary">閫氳繃</Button>
         </Popconfirm>
         <Popconfirm
           v-if="canApprove"
-          title="纭椹冲洖璇ユ姤宸ュ崟锛�"
+          title="纭椹冲洖璇ユ姤璁㈠崟锛�"
           @confirm="handleReject"
         >
           <Button danger>涓嶉�氳繃</Button>

--
Gitblit v1.9.3