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/workbench/components/tabs/FeedbackTab.vue |  102 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/src/views/mes/workbench/components/tabs/FeedbackTab.vue b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
index 22e58f9..a5dc6e4 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
@@ -4,13 +4,15 @@
 
 import { computed, ref, watch } from 'vue';
 
+import dayjs from 'dayjs';
+
 import {
   MesAutoCodeRuleCode,
   MesProFeedbackStatusEnum,
 } from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 
-import { Button, message, Popconfirm } from 'ant-design-vue';
+import { Button, message, Modal, Popconfirm } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
@@ -18,6 +20,7 @@
   approveFeedback,
   createFeedback,
   getFeedback,
+  getFeedbackPage,
   rejectFeedback,
   submitFeedback,
   updateFeedback,
@@ -26,6 +29,7 @@
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../../../pro/feedback/data';
+import FeedbackParamFields from '../../../pro/feedback/components/FeedbackParamFields.vue';
 
 defineOptions({ name: 'WorkbenchFeedbackTab' });
 
@@ -44,6 +48,9 @@
 const feedbackId = ref<number>();
 const feedbackStatus = ref<number>();
 const originalSnapshot = ref('');
+const paramFields = ref<InstanceType<typeof FeedbackParamFields>>();
+const paramSnapshot = ref<string>();
+const paramRenderKey = ref(0);
 
 const isEditable = computed(() =>
   ['create', 'submit', 'update'].includes(formType.value),
@@ -83,9 +90,14 @@
   }
 }
 
-async function getAlignedData() {
+async function getAlignedData(includeParams = true) {
   const data = (await formApi.getValues()) as any;
+  // 鏂板缓鏃朵笉鑳芥惡甯︿笂涓�寮犳姤宸ュ崟娈嬬暀鐨� id锛屽惁鍒欏悗绔寜涓婚敭鎻掑叆浼氬啿绐�
+  if (formType.value === 'create') {
+    delete data.id;
+  }
   alignQuantity(data);
+  if (includeParams) data.paramValues = paramFields.value?.getValues();
   return data;
 }
 
@@ -106,6 +118,8 @@
   feedbackId.value = undefined;
   feedbackStatus.value = undefined;
   originalSnapshot.value = '';
+  paramSnapshot.value = undefined;
+  paramRenderKey.value++;
 
   formApi.setState({ schema: useFormSchema(formType.value, formApi) });
 
@@ -115,7 +129,7 @@
   await formApi.setValues({
     code,
     type: 1,
-    feedbackTime: Date.now(),
+    feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
     feedbackUserId: userStore.userInfo?.id,
     taskId: task.id,
     workOrderId: task.workOrderId,
@@ -128,10 +142,11 @@
     itemSpecification: task.itemSpecification,
     unitMeasureName: task.unitMeasureName,
     scheduledQuantity: task.quantity,
+    reportableQuantity: task.reportableQuantity,
     checkFlag,
   });
 
-  originalSnapshot.value = JSON.stringify(await getAlignedData());
+  originalSnapshot.value = JSON.stringify(await getAlignedData(false));
 }
 
 /** 淇濆瓨 */
@@ -140,6 +155,7 @@
   if (!valid) return;
 
   const data = await getAlignedData();
+  const code = data.code as string;
 
   if (formType.value === 'create') {
     const id = await createFeedback(data);
@@ -148,12 +164,73 @@
     formType.value = 'update';
     formApi.setState({ schema: useFormSchema(formType.value, formApi) });
     await formApi.setFieldValue('id', id);
-    message.success($t('common.createSuccess'));
   } else {
     await updateFeedback(data);
-    message.success($t('common.updateSuccess'));
   }
   originalSnapshot.value = JSON.stringify(data);
+
+  // 鏄剧ず鏄剧溂鐨勬垚鍔熸彁绀�
+  Modal.success({
+    title: '淇濆瓨鎴愬姛',
+    content: `鎶ュ伐鍗� ${code} 宸蹭繚瀛榒,
+    centered: true,
+  });
+
+  // 閲嶇疆琛ㄥ崟涓烘柊寤烘ā寮忥紝閲嶆柊鐢熸垚鎶ヨ鍗曞彿
+  if (props.task) {
+    await resetForTask(props.task);
+  }
+  emit('reported');
+}
+
+/** 淇濆瓨骞舵彁浜わ紙鍏堜繚瀛橈紝鍐嶆煡璇㈠苟鎻愪氦锛� */
+async function handleSaveAndSubmit() {
+  const { valid } = await formApi.validate();
+  if (!valid) return;
+
+  const data = await getAlignedData();
+  const code = data.code as string;
+
+  // 1. 鍏堜繚瀛�
+  if (formType.value === 'create') {
+    const id = await createFeedback(data);
+    feedbackId.value = id;
+    feedbackStatus.value = MesProFeedbackStatusEnum.PREPARE;
+    formType.value = 'update';
+    formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+    await formApi.setFieldValue('id', id);
+  } else {
+    await updateFeedback(data);
+  }
+  originalSnapshot.value = JSON.stringify(data);
+
+  // 2. 鏌ヨ鎶ュ伐璁板綍锛屽尮閰嶈鎶ュ伐鍗曞彿
+  const pageResult = await getFeedbackPage({ code, pageNo: 1, pageSize: 1 });
+  const record = pageResult.list?.[0];
+
+  // 3. 妫�鏌ユ槸鍚﹀彲鎻愪氦锛堣崏绋跨姸鎬侊級
+  if (!record || record.status !== MesProFeedbackStatusEnum.PREPARE) {
+    message.warning('淇濆瓨鎴愬姛锛屼絾褰撳墠鎶ュ伐鍗曠姸鎬佷笉鍙彁浜�');
+    emit('reported');
+    return;
+  }
+
+  // 4. 璋冪敤鎻愪氦鎺ュ彛
+  await submitFeedback(record.id!);
+  feedbackId.value = record.id;
+  feedbackStatus.value = record.status;
+
+  // 鏄剧ず鏄剧溂鐨勬垚鍔熸彁绀�
+  Modal.success({
+    title: '淇濆瓨骞舵彁浜ゆ垚鍔�',
+    content: `鎶ュ伐鍗� ${code} 宸叉彁浜,
+    centered: true,
+  });
+
+  // 閲嶇疆琛ㄥ崟涓烘柊寤烘ā寮忥紝閲嶆柊鐢熸垚鎶ヨ鍗曞彿
+  if (props.task) {
+    await resetForTask(props.task);
+  }
   emit('reported');
 }
 
@@ -179,7 +256,7 @@
 /** 瀹℃壒閫氳繃 */
 async function handleApprove() {
   if (!feedbackId.value) return;
-  const finished = await approveFeedback(feedbackId.value);
+  const finished = await approveFeedback({ id: feedbackId.value });
   message.success(
     finished ? '鎶ヨ鍗曞凡瀹℃壒瀹屾垚' : '鎶ュ伐鎴愬姛锛岃绛夊緟璐ㄩ噺妫�楠屽畬鎴愶紒',
   );
@@ -204,12 +281,13 @@
 async function loadFeedback(id: number) {
   const data = await getFeedback(id);
   feedbackId.value = data.id;
+  paramSnapshot.value = data.paramSnapshot;
   feedbackStatus.value = data.status;
   formType.value = 'update';
   formApi.setState({ schema: useFormSchema(formType.value, formApi) });
   const checkFlag = await resolveCheckFlag(data.routeId, data.processId);
   await formApi.setValues({ ...data, checkFlag });
-  originalSnapshot.value = JSON.stringify(await getAlignedData());
+  originalSnapshot.value = JSON.stringify(await getAlignedData(false));
 }
 
 // 鐩戝惉浠诲姟鍙樻洿锛堜粎褰撲换鍔� ID 鐪熸鍙樺寲鏃舵墠閲嶇疆琛ㄥ崟锛�
@@ -243,6 +321,7 @@
       </div>
 
       <Form class="feedback-tab__form" />
+      <FeedbackParamFields :key="paramRenderKey" ref="paramFields" :task-id="task.id" :snapshot="paramSnapshot" :readonly="!isEditable" />
 
       <div class="feedback-tab__actions">
         <Button
@@ -252,6 +331,13 @@
         >
           淇濆瓨
         </Button>
+        <Button
+          v-if="isEditable"
+          type="primary"
+          @click="handleSaveAndSubmit"
+        >
+          淇濆瓨骞舵彁浜�
+        </Button>
         <Popconfirm
           v-if="canSubmit"
           title="纭鎻愪氦璇ユ姤璁㈠崟锛熸彁浜ゅ悗灏嗕笉鑳戒慨鏀广��"

--
Gitblit v1.9.3