From d1733a6f090c0caf96c30c4b2f4f08c7d43c8d3c Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 18 三月 2026 14:35:34 +0800
Subject: [PATCH] Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材

---
 src/views/basicData/product/ProductSelectDialog.vue |   43 +++++++++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/views/basicData/product/ProductSelectDialog.vue b/src/views/basicData/product/ProductSelectDialog.vue
index bd0c7f5..cd6b85e 100644
--- a/src/views/basicData/product/ProductSelectDialog.vue
+++ b/src/views/basicData/product/ProductSelectDialog.vue
@@ -8,14 +8,14 @@
              :model="query"
              class="mb-2 search-form">
       <el-form-item label="浜у搧鍚嶇О">
-        <el-input v-model="query.materialName"
+        <el-input v-model="query.productName"
                   size="small"
                   placeholder="杈撳叆浜у搧鍚嶇О"
                   clearable
                   @keyup.enter="onSearch" />
       </el-form-item>
       <el-form-item label="瑙勬牸">
-        <el-input v-model="query.specification"
+        <el-input v-model="query.model"
                   size="small"
                   placeholder="杈撳叆瑙勬牸"
                   clearable
@@ -42,7 +42,7 @@
               :data="tableData"
               height="420"
               highlight-current-row
-              row-key="skuId"
+              row-key="id"
               @selection-change="handleSelectionChange"
               @select="handleSelect">
       <el-table-column type="selection"
@@ -50,16 +50,16 @@
       <el-table-column type="index"
                        label="搴忓彿"
                        width="60" />
-      <el-table-column prop="materialName"
+      <el-table-column prop="productName"
                        label="浜у搧鍚嶇О"
                        min-width="160" />
       <el-table-column prop="materialCode"
                        label="鐗╂枡缂栫爜"
                        min-width="200" />
-      <el-table-column prop="specification"
+      <el-table-column prop="model"
                        label="瑙勬牸"
                        min-width="200" />
-      <el-table-column prop="baseUnit"
+      <el-table-column prop="unit"
                        label="鍗曚綅"
                        min-width="160" />
     </el-table>
@@ -90,11 +90,11 @@
   import { modelListPage } from "@/api/basicData/newProduct";
 
   export type ProductRow = {
-    skuId: number;
-    specification: string;
+    id: number;
+    model: string;
     materialCode: string;
-    baseUnit?: string;
-    materialName?: string;
+    unit?: string;
+    productName?: string;
   };
 
   const props = defineProps<{
@@ -110,9 +110,9 @@
   });
 
   const query = reactive({
-    specification: "",
+    model: "",
     materialCode: "",
-    materialName: "",
+    productName: "",
   });
 
   const page = reactive({
@@ -157,7 +157,7 @@
         nextTick(() => {
           if (tableRef.value) {
             tableData.value.forEach(item => {
-              if (item.skuId !== row.skuId) {
+              if (item.id !== row.id) {
                 tableRef.value.toggleRowSelection(item, false);
               }
             });
@@ -173,9 +173,9 @@
   }
 
   function onReset() {
-    query.specification = "";
+    query.model = "";
     query.materialCode = "";
-    query.materialName = "";
+    query.productName = "";
     page.pageNum = 1;
     loadData();
   }
@@ -205,9 +205,9 @@
     try {
       multipleSelection.value = []; // 缈婚〉/鎼滅储鍚庢竻绌洪�夋嫨鏇寸鍚堥鏈�
       const res: any = await modelListPage({
-        specification: query.specification.trim(),
+        model: query.model.trim(),
         materialCode: query.materialCode.trim(),
-        materialName: query.materialName.trim(),
+        productName: query.productName.trim(),
         type: 1,
         current: page.pageNum,
         size: page.pageSize,
@@ -219,12 +219,19 @@
     }
   }
 
-  // 鐩戝惉寮圭獥鎵撳紑锛岄噸缃�夋嫨
+  // 鐩戝惉寮圭獥鎵撳紑锛岄噸缃�夋嫨鍜屾悳绱㈡潯浠�
   watch(
     () => props.modelValue,
     visible => {
       if (visible) {
         multipleSelection.value = [];
+        // 閲嶇疆鎼滅储鏉′欢
+        query.model = "";
+        query.materialCode = "";
+        query.productName = "";
+        page.pageNum = 1;
+        // 閲嶆柊鍔犺浇鏁版嵁
+        loadData();
       }
     }
   );

--
Gitblit v1.9.3