From dcf33da35caf9a37638d4dd19bc2620621e14b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Thu, 20 Nov 2025 15:53:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=8E=9F?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E9=80=89=E6=8B=A9=E5=92=8C=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=A6=81=E7=94=A8=E7=8A=B6=E6=80=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复原材料选择组件中ID比较类型不一致导致的选择问题，移除表单中成品相关字段的禁用状态限制，并初始化表单默认值
---
 .../KLPService/RawMaterialSelect/index.vue    | 23 ++++++++-----------
 klp-ui/src/views/wms/coil/do/warehousing.vue  | 22 ++++++++++++++----
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
index 393a61fb..19320267 100644
--- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
+++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
@@ -129,6 +129,7 @@ export default {
       // 如果为选中任何原材料，显示选择原材料
       // 如果为选中多个原材料，显示已选 X 项
       // 如果为选中单个原材料，显示原材料名称
+      console.log(this.selectedIds);
       if (this.selectedIds.length === 0) {
         return '请选择原材料';
       }
@@ -146,12 +147,14 @@ export default {
       } else {
         return this.selectedRows[0]?.rawMaterialName || '未选择';
       }
-    }
+    },
+
   },
   watch: {
     value: {
       immediate: true,
       handler(val) {
+        console.log('watch触发val', val);
         this.selectedIds = val ? val.split(',').filter(id => id) : [];
         // this.syncSelectedRows();
         this.$forceUpdate(); // 新增：强制刷新视图
@@ -169,22 +172,13 @@ export default {
       return this.selectedIds.includes(rawMaterialId);
     },
 
-    // 同步选中行数据
-    // syncSelectedRows() {
-    //   if (this.rawMaterialList.length === 0) return;
-    //   this.selectedRows = this.rawMaterialList.filter(item => 
-    //     this.selectedIds.includes(item.rawMaterialId)
-    //   );
-    // },
-
     // 卡片选择事件（多选）
     handleCardSelection(checked, item) {
       if (checked) {
         !this.selectedIds.includes(item.rawMaterialId) && this.selectedIds.push(item.rawMaterialId);
       } else {
-        this.selectedIds = this.selectedIds.filter(id => id !== item.rawMaterialId);
+        this.selectedIds = this.selectedIds.filter(id => id != item.rawMaterialId);
       }
-      // this.syncSelectedRows();
     },
 
     // 原有方法保持不变（仅修改同步选中状态逻辑）
@@ -194,9 +188,11 @@ export default {
         const params = { ...this.queryParams, ...this.filters };
         const response = await listRawMaterial(params);
         if (response.code === 200) {
-          this.rawMaterialList = response.rows || [];
+          this.rawMaterialList = response.rows.map(item => ({
+            ...item,
+            rawMaterialId: item.rawMaterialId.toString()
+          })) || [];
           this.total = response.total || 0;
-          // this.syncSelectedRows(); // 加载数据后同步选中状态
         }
         return this.rawMaterialList;
       } catch (error) {
@@ -252,7 +248,6 @@ export default {
       const emitValue = this.selectedIds.join(',');
       this.$emit('input', emitValue);
       this.$emit('change', emitValue, this.selectedRows);
-      this.$forceUpdate(); // 新增：强制刷新视图
       this.dialogVisible = false;
     },
 
diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue
index ad69a625..1ebd4d00 100644
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -68,25 +68,25 @@
             <el-row v-if="form.materialType === '成品'">
               <el-col :span="12">
                 <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
-                  <el-input v-model="form.qualityStatus" placeholder="请输入质量状态" :disabled="readonly">
+                  <el-input v-model="form.qualityStatus" placeholder="请输入质量状态">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
-                  <el-input v-model="form.trimmingRequirement" placeholder="请输入切边要求" :disabled="readonly">
+                  <el-input v-model="form.trimmingRequirement" placeholder="请输入切边要求">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item v-if="form.materialType === '成品'" label="打包状态" prop="packingStatus">
-                  <el-input v-model="form.packingStatus" placeholder="请输入打包状态" :disabled="readonly">
+                  <el-input v-model="form.packingStatus" placeholder="请输入打包状态">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
-                  <el-input v-model="form.packagingRequirement" placeholder="请输入包装要求" :disabled="readonly">
+                  <el-input v-model="form.packagingRequirement" placeholder="请输入包装要求">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -201,7 +201,19 @@ export default {
     return {
       pendingActions: [],
       // 表单参数
-      form: {},
+      form: {
+        materialType: null,
+        enterCoilNo: null,
+        currentCoilNo: null,
+        itemId: null,
+        itemType: null,
+        netWeight: null,
+        grossWeight: null,
+        remark: null,
+        trimmingRequirement: null,
+        packingStatus: null,
+        packagingRequirement: null,
+      },
       loading: false,
       buttonLoading: false,
       queryForm: {