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 |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 6857a99..a295a40 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -26,10 +26,10 @@
 } from '#/api/mes/pro/feedback';
 import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
 import { getWorkOrder } from '#/api/mes/pro/workorder';
-import { getWorkOrderParamRecordPage } from '#/api/mes/pro/workorderparamrecord';
 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';
@@ -41,7 +41,6 @@
 const userStore = useUserStore();
 const subTabsName = ref('itemConsume');
 const originalSnapshot = ref(''); // 琛ㄥ崟鍘熷鏁版嵁蹇収锛岀敤浜� submit 鏃惰烦杩囨湭鍙樻洿鐨勪繚瀛樿姹�
-const paramDetails = ref<Array<{ id: number; paramName?: string; paramCode?: string; unitMeasureName?: string; paramValue?: string }>>([]);
 
 const isEditable = computed(() =>
   ['create', 'submit', 'update'].includes(formType.value),
@@ -118,6 +117,9 @@
   if (!valid) {
     return;
   }
+  if (!checkRequiredParams()) {
+    return;
+  }
   modalApi.lock();
   try {
     const data = await getAlignedData();
@@ -149,25 +151,21 @@
 const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
 const batchActionType = ref<'submit' | 'approve'>('');
 
-async function loadParamDetails(taskId?: number) {
-  paramDetails.value = [];
-  if (!taskId) return;
-  const page = await getWorkOrderParamRecordPage({ taskId, pageNo: 1, pageSize: 1 });
-  const record = page.list?.[0];
-  paramDetails.value = (record?.details ?? []).map((detail) => ({
-    id: detail.id!,
-    paramCode: detail.paramCode,
-    paramName: detail.paramName,
-    unitMeasureName: detail.unitMeasureName,
-    paramValue: detail.paramValue,
-  }));
-}
-
 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;
 }
 
 /** 鎵ц鎻愪氦锛堝惈鎵规灞炴�э級 */
@@ -188,6 +186,9 @@
 async function handleSubmit() {
   const { valid } = await formApi.validate();
   if (!valid) {
+    return;
+  }
+  if (!checkRequiredParams()) {
     return;
   }
   modalApi.lock();
@@ -326,6 +327,7 @@
       formData.value = undefined;
       subTabsName.value = 'itemConsume';
       originalSnapshot.value = '';
+      paramDetails.value = [];
       return;
     }
     // 鍔犺浇鏁版嵁
@@ -383,7 +385,8 @@
       <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-40 text-right text-sm text-gray-600">
+          <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="璇疯緭鍏ュ弬鏁板��" />

--
Gitblit v1.9.3