From f11bd0d8d9c1190340a445a67df9e43cdbde0a3e Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 27 八月 2026 11:21:26 +0800
Subject: [PATCH] feat(mes): 基础参数与工序绑定前端 + 报工填写参数字段

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

diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 92bc22f..a295a40 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';
@@ -105,6 +106,7 @@
 /** 璇诲彇骞舵寜鎻愪氦瑙勫垯瀵归綈鍚庣殑琛ㄥ崟鏁版嵁锛岀敤浜庡揩鐓у拰淇濆瓨 */
 async function getAlignedData(): Promise<MesProFeedbackApi.Feedback> {
   const data = (await formApi.getValues()) as MesProFeedbackApi.Feedback;
+  syncParamValues(data);
   alignQuantity(data);
   return data;
 }
@@ -113,6 +115,9 @@
 async function handleSave() {
   const { valid } = await formApi.validate();
   if (!valid) {
+    return;
+  }
+  if (!checkRequiredParams()) {
     return;
   }
   modalApi.lock();
@@ -146,6 +151,23 @@
 const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
 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>) {
   if (!formData.value?.id) return;
@@ -164,6 +186,9 @@
 async function handleSubmit() {
   const { valid } = await formApi.validate();
   if (!valid) {
+    return;
+  }
+  if (!checkRequiredParams()) {
     return;
   }
   modalApi.lock();
@@ -302,6 +327,7 @@
       formData.value = undefined;
       subTabsName.value = 'itemConsume';
       originalSnapshot.value = '';
+      paramDetails.value = [];
       return;
     }
     // 鍔犺浇鏁版嵁
@@ -336,6 +362,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 +381,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