From 99c00652cf3895009eacdb05025e02967a670367 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 05 八月 2026 11:36:00 +0800
Subject: [PATCH] feat(mes): 实现生产报工批次属性管理和SRM投标优化功能
---
src/views/mes/pro/feedback/modules/form.vue | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 00ae80a..d0e4edf 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -5,6 +5,8 @@
import { computed, ref } from 'vue';
+import dayjs from 'dayjs';
+
import { useVbenModal } from '@vben/common-ui';
import { MesAutoCodeRuleCode, MesProFeedbackStatusEnum } from '@vben/constants';
import { useUserStore } from '@vben/stores';
@@ -16,6 +18,7 @@
import {
approveFeedback,
createFeedback,
+ getBatchRequirements,
getFeedback,
rejectFeedback,
submitFeedback,
@@ -25,6 +28,7 @@
import { $t } from '#/locales';
import { useFormSchema } from '../data';
+import BatchInputDialog from './batch-input-dialog.vue';
import ItemConsumeList from './item-consume-list.vue';
import ProductProduceList from './product-produce-list.vue';
@@ -161,14 +165,17 @@
}
}
-/** 瀹℃壒閫氳繃 */
-async function handleApprove() {
- if (!formData.value?.id) {
- return;
- }
+const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
+
+/** 鎵ц瀹℃壒锛堝惈鎵规灞炴�э級 */
+async function doApprove(batchFields?: Record<string, unknown>) {
+ if (!formData.value?.id) return;
modalApi.lock();
try {
- const finished = await approveFeedback(formData.value.id);
+ const finished = await approveFeedback({
+ id: formData.value.id,
+ ...batchFields,
+ });
await modalApi.close();
emit('success');
message.success(
@@ -177,6 +184,30 @@
} finally {
modalApi.unlock();
}
+}
+
+/** 瀹℃壒閫氳繃 */
+async function handleApprove() {
+ if (!formData.value?.id) {
+ return;
+ }
+ try {
+ const checkResult = await getBatchRequirements(formData.value.id);
+ if (checkResult?.needBatchInput) {
+ // 闇�瑕佸～鍐欐壒娆″睘鎬э紝寮圭獥鏀堕泦
+ batchDialogRef.value?.open({ checkResult });
+ } else {
+ await doApprove();
+ }
+ } catch {
+ // 妫�鏌ュけ璐ユ椂鐩存帴瀹℃壒锛堝吋瀹规棫閫昏緫锛�
+ await doApprove();
+ }
+}
+
+/** 鎵规寮圭獥纭鍥炶皟 */
+function handleBatchConfirm(batchData: Record<string, unknown>) {
+ doApprove(batchData);
}
/** 瀹℃壒涓嶉�氳繃 */
@@ -248,7 +279,7 @@
);
await formApi.setValues({
code,
- feedbackTime: Date.now(),
+ feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
feedbackUserId: userStore.userInfo?.id,
});
// 璁板綍鍒濆蹇収锛堝惈鏁伴噺瀵归綈缁撴灉锛夛紝submit 鏃剁敤浜庤烦杩囨棤鍙樻洿鐨勪繚瀛樿姹�
@@ -314,5 +345,6 @@
</Popconfirm>
</div>
</template>
+ <BatchInputDialog ref="batchDialogRef" @confirm="handleBatchConfirm" />
</Modal>
</template>
--
Gitblit v1.9.3