From 6c0b0dd81a98a3163e45f1b5b5417e02af165fd8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 29 八月 2026 10:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/mes/pro/feedback/modules/form.vue |   63 ++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 92bc22f..9e5a9a3 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -11,7 +11,7 @@
 import { MesAutoCodeRuleCode, MesProFeedbackStatusEnum } from '@vben/constants';
 import { useUserStore } from '@vben/stores';
 
-import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
+import { Button, Input, message, Popconfirm, Tabs } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
@@ -29,6 +29,7 @@
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
+import { findMissingRequiredParams, loadParamDetails, paramDetails } from '../param-state';
 import BatchInputDialog from './batch-input-dialog.vue';
 import ItemConsumeList from './item-consume-list.vue';
 import ProductProduceList from './product-produce-list.vue';
@@ -86,25 +87,20 @@
   wrapperClass: 'grid-cols-3',
 });
 
-/** 鎻愪氦鍓嶅榻愭暟閲忥細鏍规嵁 checkFlag 鍐冲畾 uncheck/鍚堟牸/涓嶈壇褰掗浂绛栫暐 */
+/** 鎻愪氦鍓嶅榻愭暟閲忥細鎶ュ伐鍙～鍐欐姤宸ユ暟閲忥紝鍚堟牸/涓嶈壇/搴熷搧鏁伴噺鐢辫川妫�纭畾锛屾姤宸ョ幆鑺備笉閲囬泦 */
 function alignQuantity(data: MesProFeedbackApi.Feedback) {
-  if (data.checkFlag) {
-    data.uncheckQuantity = data.feedbackQuantity;
-    data.qualifiedQuantity = 0;
-    data.unqualifiedQuantity = 0;
-    data.laborScrapQuantity = 0;
-    data.materialScrapQuantity = 0;
-    data.otherScrapQuantity = 0;
-  } else {
-    data.feedbackQuantity =
-      (data.qualifiedQuantity || 0) + (data.unqualifiedQuantity || 0);
-    data.uncheckQuantity = 0;
-  }
+  data.uncheckQuantity = data.checkFlag ? data.feedbackQuantity : 0;
+  delete data.qualifiedQuantity;
+  delete data.unqualifiedQuantity;
+  delete data.laborScrapQuantity;
+  delete data.materialScrapQuantity;
+  delete data.otherScrapQuantity;
 }
 
 /** 璇诲彇骞舵寜鎻愪氦瑙勫垯瀵归綈鍚庣殑琛ㄥ崟鏁版嵁锛岀敤浜庡揩鐓у拰淇濆瓨 */
 async function getAlignedData(): Promise<MesProFeedbackApi.Feedback> {
   const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+  syncParamValues(data);
   alignQuantity(data);
   return data;
 }
@@ -113,6 +109,9 @@
 async function handleSave() {
   const { valid } = await formApi.validate();
   if (!valid) {
+    return;
+  }
+  if (!checkRequiredParams()) {
     return;
   }
   modalApi.lock();
@@ -144,7 +143,24 @@
 }
 
 const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
-const batchActionType = ref<'submit' | 'approve'>('');
+const batchActionType = ref<'' | 'submit' | 'approve'>('');
+
+function syncParamValues(data: MesProFeedbackApi.Feedback) {
+  data.paramValues = paramDetails.value.map((detail) => ({
+    detailId: detail.id,
+    value: detail.paramValue,
+  }));
+}
+
+/** 鏍￠獙蹇呭～鍙傛暟鏄惁濉啓瀹屾暣 */
+function checkRequiredParams(): boolean {
+  const missing = findMissingRequiredParams();
+  if (missing.length > 0) {
+    message.warning(`蹇呭～鍙傛暟鏈～鍐欙細${missing.join('銆�')}`);
+    return false;
+  }
+  return true;
+}
 
 /** 鎵ц鎻愪氦锛堝惈鎵规灞炴�э級 */
 async function doSubmit(batchFields?: Record<string, unknown>) {
@@ -164,6 +180,9 @@
 async function handleSubmit() {
   const { valid } = await formApi.validate();
   if (!valid) {
+    return;
+  }
+  if (!checkRequiredParams()) {
     return;
   }
   modalApi.lock();
@@ -302,6 +321,7 @@
       formData.value = undefined;
       subTabsName.value = 'itemConsume';
       originalSnapshot.value = '';
+      paramDetails.value = [];
       return;
     }
     // 鍔犺浇鏁版嵁
@@ -336,6 +356,7 @@
     modalApi.lock();
     try {
       formData.value = await getFeedback(data.id);
+      await loadParamDetails(formData.value.taskId);
       const checkFlag = await resolveCheckFlag(
         formData.value.routeId,
         formData.value.processId,
@@ -354,6 +375,18 @@
 <template>
   <Modal :title="getTitle" class="w-3/5">
     <Form class="mx-4" />
+    <div v-if="paramDetails.length" class="mx-4 mt-4 rounded border border-gray-200 p-4">
+      <div class="mb-3 font-medium">宸ヨ壓鍙傛暟</div>
+      <div class="grid grid-cols-2 gap-3">
+        <div v-for="detail in paramDetails" :key="detail.id" class="flex items-center gap-2">
+          <span class="w-44 text-right text-sm text-gray-600">
+            <span v-if="detail.required" class="text-red-500">*&nbsp;</span>
+            {{ detail.paramName || detail.paramCode }}{{ detail.unitMeasureName ? `锛�${detail.unitMeasureName}锛塦 : '' }}
+          </span>
+          <Input v-model:value="detail.paramValue" :disabled="!isEditable" placeholder="璇疯緭鍏ュ弬鏁板��" />
+        </div>
+      </div>
+    </div>
     <Tabs
       v-if="showSubTabs"
       v-model:active-key="subTabsName"

--
Gitblit v1.9.3