From 0aaa01f4bf14af91d5f85c28f88cac9573b8ab8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 4 Mar 2026 10:58:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20CurrentCoilNo=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B9=B6=E6=9B=BF=E6=8D=A2=E5=8E=9F=E6=9C=89?=
 =?UTF-8?q?=E9=92=A2=E5=8D=B7=E5=8F=B7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

引入新的 CurrentCoilNo 组件用于统一显示钢卷号，支持不同长度钢卷号的格式化显示和颜色区分
替换多个视图中的 el-tag 和 CoilNo 组件为新的 CurrentCoilNo 组件
---
 .../KLPService/Renderer/CurrentCoilNo.vue     | 69 +++++++++++++++++++
 klp-ui/src/main.js                            |  4 +-
 klp-ui/src/views/wms/coil/do/correct.vue      |  6 +-
 klp-ui/src/views/wms/coil/do/packing.vue      |  2 +-
 klp-ui/src/views/wms/coil/do/search.vue       |  2 +-
 klp-ui/src/views/wms/coil/do/ship.vue         |  2 +-
 klp-ui/src/views/wms/coil/do/warehousing.vue  |  2 +-
 klp-ui/src/views/wms/coil/panels/base.vue     |  2 +-
 klp-ui/src/views/wms/coil/panels/do.vue       |  4 +-
 .../wms/delivery/components/detailTable.vue   |  6 +-
 10 files changed, 87 insertions(+), 12 deletions(-)
 create mode 100644 klp-ui/src/components/KLPService/Renderer/CurrentCoilNo.vue

diff --git a/klp-ui/src/components/KLPService/Renderer/CurrentCoilNo.vue b/klp-ui/src/components/KLPService/Renderer/CurrentCoilNo.vue
new file mode 100644
index 00000000..bcd59969
--- /dev/null
+++ b/klp-ui/src/components/KLPService/Renderer/CurrentCoilNo.vue
@@ -0,0 +1,69 @@
+<template>
+  <div class="current-coil-no">
+    <template v-if="currentCoilNo.length < 10">
+      {{ currentCoilNo }}
+    </template>
+    <template v-else>
+      <span v-if="remainingPart" class="green-part">{{ firstFive }}</span>
+      <span v-if="middlePart" class="default-part">{{ middlePart }}</span>
+      <span v-if="remainingPart && lastTwo" class="blue-part">{{ lastTwo }}</span>
+      <span v-if="splitPart" class="red-part">{{ splitPart }}</span>
+    </template>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'CurrentCoilNo',
+    props: {
+      currentCoilNo: {
+        type: String,
+        required: true
+      }
+    },
+    computed: {
+      splitPart() {
+        const index = Math.max(this.currentCoilNo.indexOf('-'), this.currentCoilNo.indexOf('/'));
+        return index > -1 ? this.currentCoilNo.substring(index) : '';
+      },
+      mainPart() {
+        const index = Math.max(this.currentCoilNo.indexOf('-'), this.currentCoilNo.indexOf('/'));
+        return index > -1 ? this.currentCoilNo.substring(0, index) : this.currentCoilNo;
+      },
+      firstFive() {
+        return this.mainPart.substring(0, 5);
+      },
+      middlePart() {
+        return this.mainPart.length > 7 ? this.mainPart.substring(5, this.mainPart.length - 2) : '';
+      },
+      lastTwo() {
+        return this.mainPart.length > 5 ? this.mainPart.substring(this.mainPart.length - 2) : '';
+      },
+      remainingPart() {
+        return this.mainPart.length > 0;
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.current-coil-no {
+  display: inline-block;
+  font-size: 12px;
+  background-color: #f4f4f5;
+  padding: 2px 4px;
+  border-radius: 4px;
+}
+.green-part {
+  color: rgb(0, 130, 46);
+}
+.default-part {
+  color: inherit;
+}
+.blue-part {
+  color: rgb(0, 149, 248);
+}
+.red-part {
+  color: rgb(250, 72, 72);
+}
+</style>
\ No newline at end of file
diff --git a/klp-ui/src/main.js b/klp-ui/src/main.js
index 23674f04..93611be2 100644
--- a/klp-ui/src/main.js
+++ b/klp-ui/src/main.js
@@ -46,7 +46,7 @@ import VueMeta from 'vue-meta'
 import DictData from '@/components/DictData'
 import KLPTable from '@/components/KLPUI/KLPTable/index.vue'
 import MemoInput from '@/components/MemoInput/index.vue'
-
+import CurrentCoilNo from '@/components/KLPService/Renderer/CurrentCoilNo.vue'
 
 
 // 全局方法挂载
@@ -73,6 +73,8 @@ Vue.component('ImagePreview', ImagePreview)
 Vue.component('KLPTable', KLPTable)
 Vue.component('MemoInput', MemoInput)
 
+Vue.component('CurrentCoilNo', CurrentCoilNo)
+
 Vue.use(vueFlvPlayer)
 Vue.use(directive)
 Vue.use(plugins)
diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue
index de049c62..6fa848cd 100644
--- a/klp-ui/src/views/wms/coil/do/correct.vue
+++ b/klp-ui/src/views/wms/coil/do/correct.vue
@@ -39,7 +39,7 @@
               :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>
+                  <current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
                   <el-tag type="info" size="small" class="coil-no-tag" :style="getBorderStyle(item)">{{
                     getTypeLabel(item) }}</el-tag>
                   <span class="material-type">{{ item.materialType || '原料' }}</span>
@@ -660,7 +660,7 @@ export default {
     // ========== 物料列表相关方法 ==========
     /** 查询物料列表 */
     handleRestoreMaterial(row) {
-      this.$modal.confirm('是否要将改钢卷还原到上次加工的状态（会删除该钢卷并将上一步的历史钢卷）').then(_ => {
+      this.$modal.confirm('是否要将改钢卷还原到上次加工的状态（会删除该钢卷并将上一步的历史钢卷还原）').then(_ => {
         const loading = this.$loading({
           lock: true,
           text: '处理中...',
@@ -753,7 +753,7 @@ export default {
     /** 删除按钮操作 */
     hanleDeleteMaterial(row) {
       const coilIds = row.coilId;
-      this.$modal.confirm('是否确认删除钢卷物料编号为"' + coilIds + '"的数据项，会同时清理刚钢卷相关的待操作记录且无法恢复！！！是否继续删除？').then(() => {
+      this.$modal.confirm('是否确认删除钢卷物料编号为"' + coilIds + '"的数据项？').then(() => {
         this.loading = true;
         return delMaterialCoil(coilIds);
       }).then(() => {
diff --git a/klp-ui/src/views/wms/coil/do/packing.vue b/klp-ui/src/views/wms/coil/do/packing.vue
index c75b328b..d36ca1f3 100644
--- a/klp-ui/src/views/wms/coil/do/packing.vue
+++ b/klp-ui/src/views/wms/coil/do/packing.vue
@@ -216,7 +216,7 @@
               'important-card': item.priority === 1
             }">
               <div class="card-header">
-                <el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
+                <current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
               </div>
 
               <div class="card-body">
diff --git a/klp-ui/src/views/wms/coil/do/search.vue b/klp-ui/src/views/wms/coil/do/search.vue
index 6ae00714..2f1674c7 100644
--- a/klp-ui/src/views/wms/coil/do/search.vue
+++ b/klp-ui/src/views/wms/coil/do/search.vue
@@ -167,7 +167,7 @@
             <div v-for="(item, index) in materialCoilList" :key="item.coilId || index" class="material-card">
               <div class="card-header">
                 <div class="header-left">
-                  <el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
+                  <current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
                   <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">
diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue
index 37620d80..acae9867 100644
--- a/klp-ui/src/views/wms/coil/do/ship.vue
+++ b/klp-ui/src/views/wms/coil/do/ship.vue
@@ -174,7 +174,7 @@
               }"
             >
               <div class="card-header">
-                <el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
+                <current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
               </div>
               
               <div class="card-body">
diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue
index 6f612b50..02ab9174 100644
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -176,7 +176,7 @@
           <el-table v-else v-loading="loading" border :data="pendingActions" highlight-current-row>
             <el-table-column label="钢卷号" align="center" prop="currentCoilNo" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <CoilNo :coil-no="scope.row.currentCoilNo" :coil-id="scope.row.coilId" />
+                <current-coil-no :current-coil-no="scope.row.currentCoilNo"></current-coil-no>
                 <!-- <el-tag type="info" size="small">{{ scope.row.currentCoilNo }}</el-tag> -->
               </template>
             </el-table-column>
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 62c32f47..e1211ff5 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -86,7 +86,7 @@
       </el-table-column>
       <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
         <template slot-scope="scope">
-          <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
+          <current-coil-no :current-coil-no="scope.row.currentCoilNo"></current-coil-no>
         </template>
       </el-table-column>
       <!-- <el-table-column label="厂家卷号" align="center" prop="supplierCoilNo" /> -->
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 1b949a34..b7217e23 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -41,7 +41,7 @@
               :style="{ border: item.abnormalCount > 0 ? '1px solid red' : ' 1px solid #e4e7ed' }">
               <div class="card-header">
                 <div class="header-left">
-                  <el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
+                  <current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
                   <!-- <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">
@@ -340,7 +340,7 @@
               'important-card': item.priority === 1
             }">
               <div class="card-header">
-                <el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
+                <current-coil-no :current-coil-no="item.currentCoilNo"></current-coil-no>
                 <div class="status-tags">
                   <el-tag v-if="item.actionStatus === 0" type="info" size="mini">待处理</el-tag>
                   <el-tag v-else-if="item.actionStatus === 1" type="warning" size="mini">处理中</el-tag>
diff --git a/klp-ui/src/views/wms/delivery/components/detailTable.vue b/klp-ui/src/views/wms/delivery/components/detailTable.vue
index 1fe43377..9666a1c4 100644
--- a/klp-ui/src/views/wms/delivery/components/detailTable.vue
+++ b/klp-ui/src/views/wms/delivery/components/detailTable.vue
@@ -38,7 +38,11 @@
         <el-table-column label="包装" align="center" prop="packaging" />
         <el-table-column label="结算方式" align="center" prop="settlementType" />
         <!-- <el-table-column label="原料厂家" align="center" prop="rawMaterialFactory" /> -->
-        <el-table-column label="卷号" align="center" prop="coilNo" />
+        <el-table-column label="卷号" align="center" prop="coilNo">
+          <template slot-scope="scope">
+            <current-coil-no :current-coil-no="scope.row.coilNo"></current-coil-no>
+          </template>
+        </el-table-column>
         <el-table-column label="规格" align="center" prop="specification" />
         <el-table-column label="材质" align="center" prop="material" />
         <el-table-column label="数量" align="center" prop="quantity" />