From 3a3169ca676a3dae6eaaa1eee01884fc677b9ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sat, 17 Jan 2026 17:06:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E4=BF=AE=E6=AD=A3):?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=8F=91=E8=B4=A7=E9=92=A2?=
 =?UTF-8?q?=E5=8D=B7=E7=9A=84=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=E5=92=8C?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加蓝色边框样式和"已发货"标签用于区分已发货钢卷，同时重构边框样式和类型标签为独立方法
---
 klp-ui/src/views/wms/coil/do/correct.vue | 43 +++++++++++++++++++++---
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue
index c1f61220..56904af3 100644
--- a/klp-ui/src/views/wms/coil/do/correct.vue
+++ b/klp-ui/src/views/wms/coil/do/correct.vue
@@ -7,7 +7,7 @@
           <div class="section-header">
             <h3 class="section-title">
               查找钢卷并修正
-              <span class="section-desc">绿色边框表示当前钢卷，灰色边框表示历史钢卷</span>
+              <span class="section-desc">绿色边框表示当前钢卷，灰色边框表示历史钢卷, 蓝色边框表示已发货钢卷</span>
             </h3>
 
             <el-button size="mini" icon="el-icon-refresh" @click="getMaterialCoil">刷新</el-button>
@@ -35,12 +35,12 @@
               <i class="el-icon-box"></i>
               <p>暂无待领物料</p>
             </div>
-            <!-- 根据item.dataType决定边框颜色，为0使用当前的颜色，为1使用绿色，为2使用黄色   -->
             <div v-for="(item, index) in materialCoilList" :key="item.coilId || index" class="material-card"
-              :style="item.dataType === 0 ? 'border: 1.5px solid #e4e7ed' : item.dataType === 1 ? 'border: 1.5px solid green' : 'border: 1.5px solid yellow'">
+              :style="getBorderStyle(item)">
               <div class="card-header">
                 <div class="header-left">
                   <el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
+                  <el-tag type="info" size="small" class="coil-no-tag" :style="getBorderStyle(item)">{{ getTypeLabel(item) }}</el-tag>
                   <span class="material-type">{{ item.materialType || '原料' }}</span>
                   <el-popover v-if="item.rawMaterial || item.product" placement="top" width="280" trigger="hover"
                     popper-class="material-params-popover">
@@ -383,7 +383,7 @@ export default {
         pageNum: 1,
         pageSize: 20,
         // dataType: 1,
-        status: 0,
+        // status: 0,
         enterCoilNo: null,
         currentCoilNo: null
       },
@@ -568,6 +568,41 @@ export default {
   },
   methods: {
     parseTime,
+    getBorderStyle(row) {
+      console.log(row);
+      // 已发货
+      if (row.status == 1) {
+        return {border: '1.5px solid #007bff'}
+      }
+      // 历史钢卷
+      if (row.dataType == 0) {
+        return {border: '1.5px solid #6c757d'}
+      }
+      // 当前钢卷
+      if (row.dataType == 1) {
+        return {border: '1.5px solid #28a745'}
+      }
+      // 还未入库的钢卷
+      if (row.dataType == 10) {
+        return {border: '1.5px solid #ffc107'}
+      }
+      return {border: '1.5px solid #e4e7ed'}
+    },
+    getTypeLabel(row) {
+      if (row.status == 1) {
+        return '已发货'
+      }
+      if (row.dataType == 0) {
+        return '历史钢卷'
+      }
+      if (row.dataType == 1) {
+        return '当前钢卷'
+      }
+      if (row.dataType == 10) {
+        return '还未入库的钢卷'
+      }
+      return '未知'
+    },
     /** 查询用户列表 */
     getUsers() {
       listUser({ pageNum: 1, pageSize: 1000 }).then(response => {

From b157affdcf0ee2845e04dd8ae2db718f3a8b332a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sat, 17 Jan 2026 20:59:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(coil):=20=E4=BF=AE=E5=A4=8D=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=90=8E=E8=A1=A8=E5=8D=95=E9=87=8D=E7=BD=AE=E5=92=8C?=
 =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=8F=B7=E8=8E=B7=E5=8F=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复入库成功后表单重置不完整的问题，添加materialType字段
修正planId重置错误，使用当前表单的planId而非todayPlanId
使用$set方法更新enterCoilNo以确保响应式更新
添加入库后自动获取最大钢卷号功能
---
 klp-ui/src/views/wms/coil/do/warehousing.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue
index 471c3e78..014fc406 100644
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -607,9 +607,11 @@ export default {
           handleCoil(COIL_ACTIONS.RECEIVE, this.form, this.form.planId)
             .then(res => {
               this.$modal.msgSuccess("入库成功");
+
               this.form = {
                 itemId: null,
                 itemType: 'raw_material',
+                materialType: '原料',
                 warehouseId: '1988150044862377986', // 酸连轧原料库
                 netWeight: null,
                 grossWeight: null,
@@ -618,8 +620,9 @@ export default {
                 trimmingRequirement: null,
                 packingStatus: null,
                 packagingRequirement: null,
-                planId: this.todayPlanId,
+                planId: this.form.planId,
               }
+              this.getMaxCoilNoByPrefix()
               this.getList()
             }).finally(() => {
               this.buttonLoading = false;
@@ -731,7 +734,7 @@ export default {
       getMaxCoilNo(prefix).then(res => {
         console.log(res)
         // 扣掉最后一位
-        this.form.enterCoilNo = res.data.maxEnterCoilNo.slice(0, -1);
+        this.$set(this.form, 'enterCoilNo', res.data.maxEnterCoilNo.slice(0, -1));
       })
     },
     // 检查钢卷号是否合法（后端检查）