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 | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index bc928b7..00ae80a 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.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);
@@ -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,7 +237,9 @@
);
modalApi.setState({
showConfirmButton:
- formType.value !== 'detail' && formType.value !== 'approve',
+ formType.value !== 'detail' &&
+ formType.value !== 'approve' &&
+ formType.value !== 'submit',
});
if (!data?.id) {
// 鏂板锛氶粯璁ゆ姤宸ヤ汉鍜屾姤宸ユ椂闂达紝骞惰嚜鍔ㄧ敓鎴愭姤璁㈠崟鍙�
--
Gitblit v1.9.3