From 06b783c6a4e78019f8682872a6af0138de636386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 26 Jan 2026 09:16:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor(wms):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=88=86=E6=9D=A1=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E5=B9=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将分条按钮从卡片内容区域移动到卡片底部，并根据 useSpecialSplit 条件决定显示分条或领料按钮
---
 klp-ui/src/views/wms/coil/panels/do.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index fab0aa0a..ba87a8bb 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -197,12 +197,14 @@
                   </div>
                 </div>
 
-                <el-button style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-scissors"
-                  size="mini" @click="handleStartSplit(item)" :loading="buttonLoading" class="action-btn">分条</el-button>
+                <!-- <el-button style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-scissors"
+                  size="mini" @click="handleStartSplit(item)" :loading="buttonLoading" class="action-btn">分条</el-button> -->
               </div>
 
               <div class="card-footer">
-                <el-button type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
+                <el-button v-if="useSpecialSplit" type="success" icon="el-icon-scissors"
+                  size="mini" @click="handleStartSplit(item)" :loading="buttonLoading" class="action-btn">分条</el-button>
+                <el-button v-else type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
                   :loading="buttonLoading" class="action-btn">领料</el-button>
                 <el-button type="danger" icon="el-icon-alarm-clock" :plain="item.abnormalCount == 0" size="mini"
                   @click="handleAddAbnormal(item)" :loading="buttonLoading" class="action-btn">

From e8a1c61729d8e00bc9e449892933635e4cfeff80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 26 Jan 2026 09:51:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=88=86?=
 =?UTF-8?q?=E6=9D=A1=E6=93=8D=E4=BD=9C=E4=B8=AD=E7=9A=84=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=92=8C=E8=B6=85=E6=97=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复分条操作中的表单验证逻辑，将验证提前到try块外以避免潜在错误。同时为特殊分条完成接口增加超时设置，并添加加载状态提示以改善用户体验。调整了未知状态标签的缩进格式。
---
 klp-ui/src/api/wms/coil.js                    |  1 +
 .../src/views/wms/coil/panels/stepSplit.vue   | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js
index 0de20e16..6b12c206 100644
--- a/klp-ui/src/api/wms/coil.js
+++ b/klp-ui/src/api/wms/coil.js
@@ -281,6 +281,7 @@ export function completeSpecialSplit(pendingActionId) {
   return request({
     url: '/wms/materialCoil/specialSplit/complete',
     method: 'post',
+    timeout: 100000,
     params: {
       pendingActionId
     }
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index 830ef885..e73f666f 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -49,7 +49,7 @@
                 <div v-else-if="scope.row.dataType == 0">
                   <el-tag type="warning">历史卷</el-tag>
                 </div>
-                 <div v-else>
+                <div v-else>
                   <el-tag type="danger">未知状态</el-tag>
                 </div>
               </template>
@@ -458,12 +458,13 @@ export default {
 
     // 新增/编辑分条
     async addSplit() {
+      // 表单验证
+      const valid = await this.$refs.splitFormRef.validate()
+      console.log('valid', valid)
+      if (!valid) {
+        return
+      }
       try {
-        // 表单验证
-        const valid = await this.$refs.splitFormRef.validate()
-        if (!valid) {
-          return
-        }
         // 区分新增/编辑：有coilId则为编辑，否则为新增
         let res
         this.buttonLoading = true
@@ -483,6 +484,7 @@ export default {
         this.getSplitList()
       } catch (error) {
         // 表单验证失败时的提示
+        console.log('error', error)
         if (error.name !== 'ValidationError') {
           this.$message.error((this.splitForm.coilId ? '编辑' : '新增') + '分条异常：' + error.message)
         }
@@ -498,9 +500,13 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       }).then(async () => {
+        const loading = this.$loading({
+          lock: true,
+          text: '正在记录分条操作...',
+          background: 'rgba(0, 0, 0, 0.7)',
+        })
         try {
           this.buttonLoading = true
-
           // 1. 完成分条主流程
           const splitRes = await completeSpecialSplit(this.actionId)
           if (splitRes.code !== 200) {
@@ -523,6 +529,8 @@ export default {
           if (error.message !== 'cancel') { // 排除取消确认的情况
             this.$message.error('完成分条异常：' + error.message)
           }
+        } finally {
+          loading.close()
         }
       })
     },

From 0d1e13928d3e3b8478a262b45f8b85344c87ac65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 26 Jan 2026 10:04:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?refactor(wms):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=88=86=E5=89=B2=E8=A1=A8=E5=8D=95=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除供应商原料卷号字段和注释掉的实际库区字段，简化表单结构
---
 klp-ui/src/views/wms/coil/panels/stepSplit.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index e73f666f..a74ac4d0 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -79,22 +79,10 @@
               <el-form-item label="当前钢卷号" prop="currentCoilNo">
                 <el-input v-model="splitForm.currentCoilNo" placeholder="请输入当前钢卷号" />
               </el-form-item>
-              <el-form-item label="厂家原料卷号" prop="supplierCoilNo">
-                <el-input v-model="splitForm.supplierCoilNo" placeholder="请输入厂家原料卷号" />
-              </el-form-item>
               <el-form-item label="所在库位" prop="warehouseId">
                 <warehouse-select v-model="splitForm.warehouseId" placeholder="请选择仓库/库区/库位" style="width: 100%;"
                   clearable />
               </el-form-item>
-              <!-- <el-form-item label="实际库区" prop="actualWarehouseId">
-                <actual-warehouse-select
-                  v-model="splitForm.actualWarehouseId"
-                  :clearInput="splitForm.coilId != null"
-                  placeholder="请选择实际库区"
-                  style="width: 100%;"
-                  clearable
-                />
-              </el-form-item> -->
               <el-form-item label="班组" prop="team">
                 <el-select v-model="splitForm.team" placeholder="请选择班组" style="width: 100%">
                   <el-option key="甲" label="甲" value="甲" />