From 714ab13b7d3ad5be0e2ec3af2eaa240c9d3f43f3 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 二月 2026 15:36:05 +0800
Subject: [PATCH] 进销存升级 1.生产报工带出来的原材料、过程、出厂检数据编辑时,规格型号回显还是有问题

---
 src/views/qualityManagement/rawMaterialInspection/components/formDia.vue |   44 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 3323986..21c4323 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -218,21 +218,49 @@
 const modelOptions = ref([]);
 
 // 鎵撳紑寮规
-const openDialog = (type, row) => {
+const openDialog = async (type, row) => {
   operationType.value = type;
-  dialogFormVisible.value = true;
   getOptions().then((res) => {
     supplierList.value = res.data;
   });
-	form.value = {}
+  // 鍏堥噸缃〃鍗曟暟鎹紙淇濇寔瀛楁瀹屾暣锛岄伩鍏嶅脊绐楅娆℃覆鏌撴椂瑙﹀彂蹇呭~绾㈡鈥滈棯涓�涓嬧�濓級
+	form.value = {
+    checkTime: "",
+    supplier: "",
+    checkName: "",
+    productName: "",
+    productId: "",
+    productModelId: "",
+    model: "",
+    testStandardId: "",
+    unit: "",
+    quantity: "",
+    checkCompany: "",
+    checkResult: "",
+  }
   testStandardOptions.value = [];
   tableData.value = [];
-  getProductOptions();
+  // 鍏堢‘淇濅骇鍝佹爲宸插姞杞斤紝鍚﹀垯缂栬緫鏃朵骇鍝�/瑙勬牸鍨嬪彿鏃犳硶鍙嶆樉
+  await getProductOptions();
   if (operationType.value === 'edit') {
     // 鍏堜繚瀛� testStandardId锛岄伩鍏嶈娓呯┖
     const savedTestStandardId = row.testStandardId;
     form.value = {...row}
     currentProductId.value = row.productId || 0
+    // 鍏抽敭锛氱紪杈戞椂鍔犺浇瑙勬牸鍨嬪彿涓嬫媺閫夐」锛屾墠鑳藉弽鏄� productModelId
+    if (currentProductId.value) {
+      try {
+        const res = await modelList({ id: currentProductId.value });
+        modelOptions.value = res || [];
+        // 鍚屾鍥炲~ model / unit锛堟湁浜涙帴鍙h繑鍥炵殑 row 閲屽彲鑳芥病甯﹀叏锛�
+        if (form.value.productModelId) {
+          handleChangeModel(form.value.productModelId);
+        }
+      } catch (e) {
+        console.error("鍔犺浇瑙勬牸鍨嬪彿澶辫触", e);
+        modelOptions.value = [];
+      }
+    }
     // 缂栬緫妯″紡涓嬶紝鍏堝姞杞芥寚鏍囬�夐」锛岀劧鍚庡姞杞藉弬鏁板垪琛�
     if (currentProductId.value) {
       // 鍏堝姞杞芥寚鏍囬�夐」
@@ -273,10 +301,16 @@
       getQualityInspectParamList(row.id);
     }
   }
+  // 鏈�鍚庡啀鎵撳紑寮圭獥锛屽苟娓呯悊鏍¢獙鎬侊紝閬垮厤蹇呭~鎻愮ず闂儊
+  dialogFormVisible.value = true;
+  nextTick(() => {
+    proxy.$refs?.formRef?.clearValidate?.();
+  });
 }
 const getProductOptions = () => {
-  productTreeList().then((res) => {
+  return productTreeList().then((res) => {
     productOptions.value = convertIdToValue(res);
+    return productOptions.value;
   });
 };
 const getModels = (value) => {

--
Gitblit v1.9.3