From 70b7935fc261cd5e8eaaf1cfbc8078b04db576d2 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 14:51:06 +0800
Subject: [PATCH] fix(mes): 自动回填销售订单生产信息

---
 src/views/mes/pro/feedback/modules/form.vue |   67 +++++++++++++++++++++++++++------
 1 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 00ae80a..f7e2e8f 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,8 +28,10 @@
 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';
+import FeedbackParamFields from '../components/FeedbackParamFields.vue';
 
 const emit = defineEmits(['success']);
 const formType = ref<FormType>('create');
@@ -35,6 +40,10 @@
 const userStore = useUserStore();
 const subTabsName = ref('itemConsume');
 const originalSnapshot = ref(''); // 琛ㄥ崟鍘熷鏁版嵁蹇収锛岀敤浜� submit 鏃惰烦杩囨湭鍙樻洿鐨勪繚瀛樿姹�
+const paramTaskId = ref<number>();
+const paramSnapshot = ref<string>();
+const paramFields = ref<InstanceType<typeof FeedbackParamFields>>();
+function onParamTaskChange(taskId?: number) { paramTaskId.value = taskId; paramSnapshot.value = undefined; }
 
 const isEditable = computed(() =>
   ['create', 'submit', 'update'].includes(formType.value),
@@ -98,9 +107,10 @@
 }
 
 /** 璇诲彇骞舵寜鎻愪氦瑙勫垯瀵归綈鍚庣殑琛ㄥ崟鏁版嵁锛岀敤浜庡揩鐓у拰淇濆瓨 */
-async function getAlignedData(): Promise<MesProFeedbackApi.Feedback> {
+async function getAlignedData(includeParams = true): Promise<MesProFeedbackApi.Feedback> {
   const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
   alignQuantity(data);
+  if (includeParams) data.paramValues = paramFields.value?.getValues();
   return data;
 }
 
@@ -121,7 +131,7 @@
         status: MesProFeedbackStatusEnum.PREPARE,
       };
       formType.value = 'update';
-      formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+      formApi.setState({ schema: useFormSchema(formType.value, formApi, onParamTaskChange) });
       await formApi.setFieldValue('id', id);
       message.success($t('common.createSuccess'));
     } else {
@@ -161,14 +171,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 +190,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);
 }
 
 /** 瀹℃壒涓嶉�氳繃 */
@@ -222,6 +259,8 @@
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
+      paramTaskId.value = undefined;
+      paramSnapshot.value = undefined;
       subTabsName.value = 'itemConsume';
       originalSnapshot.value = '';
       return;
@@ -230,7 +269,7 @@
     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.setState({ schema: useFormSchema(formType.value, formApi, onParamTaskChange) });
     // 瀹℃壒/璇︽儏鏁磋〃绂佺敤锛岄伩鍏嶅鏍镐汉璇敼鏈彁浜ょ殑瀛楁
     formApi.setDisabled(
       formType.value === 'approve' || formType.value === 'detail',
@@ -248,16 +287,18 @@
       );
       await formApi.setValues({
         code,
-        feedbackTime: Date.now(),
+        feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
         feedbackUserId: userStore.userInfo?.id,
       });
       // 璁板綍鍒濆蹇収锛堝惈鏁伴噺瀵归綈缁撴灉锛夛紝submit 鏃剁敤浜庤烦杩囨棤鍙樻洿鐨勪繚瀛樿姹�
-      originalSnapshot.value = JSON.stringify(await getAlignedData());
+      originalSnapshot.value = JSON.stringify(await getAlignedData(false));
       return;
     }
     modalApi.lock();
     try {
       formData.value = await getFeedback(data.id);
+      paramTaskId.value = formData.value.taskId;
+      paramSnapshot.value = formData.value.paramSnapshot;
       const checkFlag = await resolveCheckFlag(
         formData.value.routeId,
         formData.value.processId,
@@ -265,7 +306,7 @@
       // 璁剧疆鍒� values
       await formApi.setValues({ ...formData.value, checkFlag });
       // 璁板綍鍒濆蹇収锛堝惈鏁伴噺瀵归綈缁撴灉锛夛紝submit 鏃剁敤浜庤烦杩囨棤鍙樻洿鐨勪繚瀛樿姹�
-      originalSnapshot.value = JSON.stringify(await getAlignedData());
+      originalSnapshot.value = JSON.stringify(await getAlignedData(false));
     } finally {
       modalApi.unlock();
     }
@@ -276,6 +317,7 @@
 <template>
   <Modal :title="getTitle" class="w-3/5">
     <Form class="mx-4" />
+    <FeedbackParamFields ref="paramFields" :task-id="paramTaskId" :snapshot="paramSnapshot" :readonly="!isEditable" />
     <Tabs
       v-if="showSubTabs"
       v-model:active-key="subTabsName"
@@ -314,5 +356,6 @@
         </Popconfirm>
       </div>
     </template>
+    <BatchInputDialog ref="batchDialogRef" @confirm="handleBatchConfirm" />
   </Modal>
 </template>

--
Gitblit v1.9.3