feat(钢卷管理): 添加真实库区选择功能并优化表单字段

- 在分卷、合卷和钢卷录入页面添加真实库区选择组件
- 将nextWarehouseId字段重命名为warehouseId以统一命名
- 添加加载状态提示提升用户体验
- 优化表单布局和字段验证规则

klp-ui/src/views/wms/coil/merge.vue

@@ -176,8 +176,8 @@
                   <template slot="append">吨</template>
                 </el-input>
               </el-form-item>
-              <el-form-item label="目标库区">
+              <el-form-item label="目标库位">
-                <el-select v-model="targetCoil.nextWarehouseId" placeholder="请选择" style="width: 100%" clearable :disabled="readonly">
+                <el-select v-model="targetCoil.warehouseId" placeholder="请选择" style="width: 100%" clearable :disabled="readonly">
                   <el-option
                     v-for="warehouse in warehouseList"
                     :key="warehouse.warehouseId"
@@ -186,6 +186,15 @@
                   />
                 </el-select>
               </el-form-item>
+              <el-form-item label="真实库区">
+                <actual-warehouse-select
+                  v-model="targetCoil.actualWarehouseId"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  clearable
+                  :disabled="readonly"
+                />
+              </el-form-item>
             </el-form>
           </div>
         </div>
@@ -238,7 +247,8 @@ export default {
         itemId: null,
         grossWeight: null,
         netWeight: null,
-        nextWarehouseId: null
+        warehouseId: null,
+        actualWarehouseId: null
       },
       loading: false,
       // 钢卷选择器可见性
@@ -370,7 +380,8 @@ export default {
           // 自动填充目标卷信息
           this.targetCoil.itemType = data.itemType;
           this.targetCoil.itemId = data.itemId;
-          this.targetCoil.nextWarehouseId = data.warehouseId;
+          this.targetCoil.warehouseId = data.warehouseId;
+          this.targetCoil.actualWarehouseId = data.actualWarehouseId;
 
           // 加载对应的物品列表
           if (data.itemType) {
@@ -566,7 +577,8 @@ export default {
       if (index === 0) {
         this.targetCoil.itemType = coil.itemType;
         this.targetCoil.itemId = coil.itemId;
-        this.targetCoil.nextWarehouseId = coil.warehouseId;
+        this.targetCoil.warehouseId = coil.warehouseId;
+        this.targetCoil.actualWarehouseId = coil.actualWarehouseId;
       }
 
       this.$message.success('钢卷选择成功');
@@ -619,7 +631,8 @@ export default {
           itemId: this.targetCoil.itemId,
           grossWeight: this.targetCoil.grossWeight,
           netWeight: this.targetCoil.netWeight,
-          nextWarehouseId: this.targetCoil.nextWarehouseId,
+          warehouseId: this.targetCoil.warehouseId,
+          actualWarehouseId: this.targetCoil.actualWarehouseId,
           hasMergeSplit: 2, // 2表示合卷
           newCoils: this.sourceCoils.map(item => ({
             coilId: item.coilId,
@@ -629,7 +642,11 @@ export default {
         };
 
         console.log('提交的合卷数据:', mergeData);
-
+        const loadingInstance = this.$loading({
+          lock: true,
+          text: '正在合卷，请稍后...',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         const response = await mergeMaterialCoil(mergeData);
         if (response.code === 200) {
           this.$message.success('合卷保存成功');
@@ -649,6 +666,7 @@ export default {
         console.error(error);
       } finally {
         this.loading = false;
+        loadingInstance.close();
       }
     },
 

klp-ui/src/views/wms/coil/split.vue

@@ -169,8 +169,8 @@
                 </el-form-item>
                 <el-form-item label="目标库区" required>
                   <el-select
-                    v-model="item.nextWarehouseId"
+                    v-model="item.warehouseId"
-                    placeholder="请选择目标库区"
+                    placeholder="请选择目标库位"
                     style="width: 100%"
                     filterable
                     :disabled="readonly"
@@ -183,6 +183,15 @@
                     />
                   </el-select>
                 </el-form-item>
+                <el-form-item label="展示库区" required>
+                  <ActualWarehouseSelect
+                    v-model="item.actualWarehouseId"
+                    placeholder="请选择真实库区"
+                    style="width: 100%"
+                    filterable
+                    :disabled="readonly"
+                  />
+                </el-form-item>
               </el-form>
             </div>
           </div>
@@ -212,11 +221,13 @@ import { listWarehouse } from '@/api/wms/warehouse';
 import { listRawMaterial } from '@/api/wms/rawMaterial';
 import { listProduct } from '@/api/wms/product';
 import CoilSelector from '@/components/CoilSelector';
+import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
 
 export default {
   name: 'SplitCoil',
   components: {
-    CoilSelector
+    CoilSelector,
+    ActualWarehouseSelect
   },
   data() {
     return {
@@ -245,7 +256,8 @@ export default {
           itemId: null,
           grossWeight: null,
           netWeight: null,
-          nextWarehouseId: null
+          warehouseId: null,
+          actualWarehouseId: null
         }
       ],
       loading: false,
@@ -441,7 +453,8 @@ export default {
         itemId: null,
         grossWeight: null,
         netWeight: null,
-        nextWarehouseId: null
+        warehouseId: null,
+        actualWarehouseId: null
       });
     },
 
@@ -495,12 +508,18 @@ export default {
           this.$message.error(`第${i + 1}个子卷的净重不能为空`);
           return;
         }
-        if (!item.nextWarehouseId) {
+        if (!item.warehouseId) {
           this.$message.error(`第${i + 1}个子卷的目标库区不能为空`);
           return;
         }
       }
 
+       const loadingInstance = this.$loading({
+          lock: true,
+          text: '正在分卷，请稍后...',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
       try {
         this.loading = true;
 
@@ -518,7 +537,8 @@ export default {
             itemId: item.itemId || this.motherCoil.itemId,
             grossWeight: item.grossWeight,
             netWeight: item.netWeight,
-            nextWarehouseId: item.nextWarehouseId,
+            warehouseId: item.warehouseId,
+            actualWarehouseId: item.actualWarehouseId,
             hasMergeSplit: 1
           }))
         };
@@ -535,11 +555,13 @@ export default {
         } else {
           this.$message.error(response.msg || '分卷保存失败');
         }
+       
       } catch (error) {
         this.$message.error('分卷保存失败');
         console.error(error);
       } finally {
         this.loading = false;
+        loadingInstance.close();
       }
     },
 

klp-ui/src/views/wms/coil/typing.vue

@@ -76,19 +76,9 @@
             </el-button>
           </div>
 
-          <el-form 
+          <el-form ref="updateForm" :model="updateForm" :rules="rules" label-width="120px" size="small">
-            ref="updateForm" 
-            :model="updateForm" 
-            :rules="rules" 
-            label-width="120px" 
-            size="small"
-          >
             <el-form-item label="当前钢卷号" prop="currentCoilNo">
-              <el-input 
+              <el-input v-model="updateForm.currentCoilNo" placeholder="请输入当前钢卷号" :disabled="readonly">
-                v-model="updateForm.currentCoilNo" 
-                placeholder="请输入当前钢卷号"
-                :disabled="readonly"
-              >
                 <template slot="prepend">
                   <i class="el-icon-document"></i>
                 </template>
@@ -96,11 +86,7 @@
             </el-form-item>
 
             <el-form-item label="班组" prop="team">
-              <el-input 
+              <el-input v-model="updateForm.team" placeholder="请输入班组名称" :disabled="readonly">
-                v-model="updateForm.team" 
-                placeholder="请输入班组名称"
-                :disabled="readonly"
-              >
                 <template slot="prepend">
                   <i class="el-icon-user-solid"></i>
                 </template>
@@ -108,88 +94,49 @@
             </el-form-item>
 
             <el-form-item label="物品类型" prop="itemType">
-              <el-select 
+              <el-select v-model="updateForm.itemType" placeholder="请选择物品类型" style="width: 100%" :disabled="readonly">
-                v-model="updateForm.itemType" 
-                placeholder="请选择物品类型" 
-                style="width: 100%"
-                :disabled="readonly"
-              >
                 <el-option label="原材料" value="raw_material" />
                 <el-option label="产品" value="product" />
               </el-select>
             </el-form-item>
 
             <el-form-item label="物品" prop="itemId">
-              <el-select 
+              <el-select v-model="updateForm.itemId" placeholder="请选择物品" filterable remote :remote-method="searchItems"
-                v-model="updateForm.itemId" 
+                :loading="itemSearchLoading" style="width: 100%" :disabled="readonly">
-                placeholder="请选择物品"
+                <el-option v-for="item in currentItemList" :key="item.id" :label="item.name" :value="item.id" />
-                filterable
-                remote
-                :remote-method="searchItems"
-                :loading="itemSearchLoading"
-                style="width: 100%"
-                :disabled="readonly"
-              >
-                <el-option
-                  v-for="item in currentItemList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
               </el-select>
             </el-form-item>
 
             <el-form-item label="毛重(t)" prop="grossWeight">
-              <el-input 
+              <el-input v-model.number="updateForm.grossWeight" placeholder="请输入毛重" type="number" step="0.01"
-                v-model.number="updateForm.grossWeight" 
+                :disabled="readonly">
-                placeholder="请输入毛重"
-                type="number"
-                step="0.01"
-                :disabled="readonly"
-              >
                 <template slot="append">吨</template>
               </el-input>
             </el-form-item>
 
             <el-form-item label="净重(t)" prop="netWeight">
-              <el-input 
+              <el-input v-model.number="updateForm.netWeight" placeholder="请输入净重" type="number" step="0.01"
-                v-model.number="updateForm.netWeight" 
+                :disabled="readonly">
-                placeholder="请输入净重"
-                type="number"
-                step="0.01"
-                :disabled="readonly"
-              >
                 <template slot="append">吨</template>
               </el-input>
             </el-form-item>
 
-            <el-form-item label="目标库区" prop="nextWarehouseId">
+            <el-form-item label="目标库位" prop="warehouseId">
-              <el-select 
+              <el-select v-model="updateForm.warehouseId" placeholder="请选择目标库区" style="width: 100%" filterable
-                v-model="updateForm.nextWarehouseId" 
+                :disabled="readonly">
-                placeholder="请选择目标库区" 
+                <el-option v-for="warehouse in warehouseList" :key="warehouse.warehouseId"
-                style="width: 100%"
+                  :label="warehouse.warehouseName" :value="warehouse.warehouseId" />
-                filterable
-                :disabled="readonly"
-              >
-                <el-option
-                  v-for="warehouse in warehouseList"
-                  :key="warehouse.warehouseId"
-                  :label="warehouse.warehouseName"
-                  :value="warehouse.warehouseId"
-                />
               </el-select>
             </el-form-item>
 
+            <el-form-item label="真实库区" prop="warehouseId">
+              <ActualWarehouseSelect v-model="updateForm.actualWarehouseId" placeholder="请选择真实库区" style="width: 100%"
+                filterable :disabled="readonly" />
+            </el-form-item>
+
             <el-form-item label="备注" prop="remark">
-              <el-input 
+              <el-input v-model="updateForm.remark" type="textarea" :rows="4" placeholder="请输入备注信息（非必填）" maxlength="500"
-                v-model="updateForm.remark" 
+                show-word-limit :disabled="readonly" />
-                type="textarea" 
-                :rows="4"
-                placeholder="请输入备注信息（非必填）"
-                maxlength="500"
-                show-word-limit
-                :disabled="readonly"
-              />
             </el-form-item>
           </el-form>
         </el-card>
@@ -207,13 +154,9 @@
         </div>
 
         <el-timeline v-if="historySteps.length > 0">
-          <el-timeline-item
+          <el-timeline-item v-for="(step, index) in historySteps" :key="index"
-            v-for="(step, index) in historySteps"
+            :timestamp="`步骤 ${step.display_step || step.step}`" placement="top"
-            :key="index"
+            :type="step.operation === '新增' ? 'success' : 'primary'">
-            :timestamp="`步骤 ${step.display_step || step.step}`"
-            placement="top"
-            :type="step.operation === '新增' ? 'success' : 'primary'"
-          >
             <div class="history-item">
               <div class="history-title">{{ step.operation || step.action }}</div>
               <div class="history-detail" v-if="step.operator">
@@ -247,9 +190,13 @@ import { completeAction } from '@/api/wms/pendingAction';
 import { listWarehouse } from '@/api/wms/warehouse';
 import { listRawMaterial } from '@/api/wms/rawMaterial';
 import { listProduct } from '@/api/wms/product';
+import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
 
 export default {
   name: 'TypingCoil',
+  components: {
+    ActualWarehouseSelect
+  },
   data() {
     return {
       loading: false,
@@ -267,7 +214,7 @@ export default {
         grossWeight: null,
         netWeight: null,
         warehouseId: null,
-        nextWarehouseId: null,
+        warehouseId: null,
         nextWarehouseName: '',
         status: 0,
         remark: ''
@@ -280,7 +227,8 @@ export default {
         itemId: null,
         grossWeight: null,
         netWeight: null,
-        nextWarehouseId: null,
+        warehouseId: null,
+        actualWarehouseId: null,
         remark: ''
       },
       rules: {
@@ -304,8 +252,11 @@ export default {
           { required: true, message: '请输入净重', trigger: 'blur' },
           { type: 'number', message: '净重必须为数字', trigger: 'blur' }
         ],
-        nextWarehouseId: [
+        warehouseId: [
           { required: true, message: '请选择目标库区', trigger: 'change' }
+        ],
+        actualWarehouseId: [
+          { required: true, message: '请选择真实库区', trigger: 'change' }
         ]
       },
       warehouseList: [],
@@ -389,16 +340,16 @@ export default {
             grossWeight: data.grossWeight,
             netWeight: data.netWeight,
             warehouseId: data.warehouseId,
-            nextWarehouseId: data.nextWarehouseId,
+            actualWarehouseId: data.actualWarehouseId,
-            nextWarehouseName: this.getWarehouseName(data.nextWarehouseId),
+            nextWarehouseName: this.getWarehouseName(data.warehouseId),
             remark: data.remark || ''
           };
 
           console.log('当前信息加载完成:', this.currentInfo);
 
           // 重新获取库区名称（确保warehouseList已加载）
-          if (data.nextWarehouseId) {
+          if (data.warehouseId) {
-            this.currentInfo.nextWarehouseName = this.getWarehouseName(data.nextWarehouseId);
+            this.currentInfo.nextWarehouseName = this.getWarehouseName(data.warehouseId);
           }
 
           // 加载对应类型的物品列表
@@ -550,7 +501,7 @@ export default {
         itemId: this.currentInfo.itemId,
         grossWeight: parseFloat(this.currentInfo.grossWeight) || null,
         netWeight: parseFloat(this.currentInfo.netWeight) || null,
-        nextWarehouseId: this.currentInfo.nextWarehouseId,
+        warehouseId: this.currentInfo.warehouseId,
         remark: this.currentInfo.remark
       };
 
@@ -571,6 +522,12 @@ export default {
           return false;
         }
 
+        const loadingInstance = this.$loading({
+          lock: true,
+          text: '正在更新钢卷信息，请稍后...',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+
         try {
           this.loading = true;
 
@@ -585,8 +542,9 @@ export default {
             itemId: this.updateForm.itemId,
             grossWeight: this.updateForm.grossWeight,
             netWeight: this.updateForm.netWeight,
-            warehouseId: this.currentInfo.warehouseId,  // 当前库区ID（保持不变）
+            // warehouseId: this.currentInfo.warehouseId,  // 当前库区ID（保持不变）
-            nextWarehouseId: this.updateForm.nextWarehouseId,  // 目标库区ID
+            actualWarehouseId: this.updateForm.actualWarehouseId,  // 真实库区ID
+            warehouseId: this.updateForm.warehouseId,  // 目标库区ID
             remark: this.updateForm.remark
           };
 
@@ -614,6 +572,7 @@ export default {
           console.error(error);
         } finally {
           this.loading = false;
+          loadingInstance.close();
         }
       });
     },