From 7bd0780b7a3e10c52a9aa22263ed84d9d5a9092e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Wed, 3 Dec 2025 09:39:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=89=B9=E6=AE=8A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handlingUnitOperationLog.vue              | 48 ++++++-------------
 .../automatedWarehouse/notifyDetailQuery.vue  | 40 ++++++++++++++--
 .../automatedWarehouse/palletOperationLog.vue | 42 +++++-----------
 3 files changed, 62 insertions(+), 68 deletions(-)

diff --git a/src/views/modules/automatedWarehouse/handlingUnitOperationLog.vue b/src/views/modules/automatedWarehouse/handlingUnitOperationLog.vue
index ab88db0..2108c8e 100644
--- a/src/views/modules/automatedWarehouse/handlingUnitOperationLog.vue
+++ b/src/views/modules/automatedWarehouse/handlingUnitOperationLog.vue
@@ -13,6 +13,7 @@
           <el-option label="全部" value=""></el-option>
           <el-option label="扫入" value="扫入"></el-option>
           <el-option label="扫出" value="扫出"></el-option>
+          <el-option label="调用栈板" value="调用栈板"></el-option>
           <el-option label="自动分拣" value="自动分拣"></el-option>
         </el-select>
       </el-form-item>
@@ -60,9 +61,9 @@
       <el-table-column prop="site" header-align="center" align="center" min-width="80" label="站点"></el-table-column>
       <el-table-column prop="operationType" header-align="center" align="center" min-width="100" label="操作类型">
         <template slot-scope="scope">
-          <el-tag :type="getOperationTypeColor(scope.row.operationType)" size="mini">
-            {{ getOperationTypeText(scope.row.operationType) }}
-          </el-tag>
+          <span :style="getOperationTypeStyle(scope.row.operationType)">
+            {{ scope.row.operationType || '-' }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="operationReason" header-align="center" align="left" min-width="200" label="操作原因" show-overflow-tooltip></el-table-column>
@@ -193,38 +194,19 @@ export default {
       this.getDataList()
     },
 
-    // 获取操作类型文本 - rqrq
-    getOperationTypeText(type) {
-      const typeMap = {
-        'CREATE': '创建标签',
-        'UPDATE': '更新字段',
-        'DELETE': '删除',
-        'MERGE': '合并',
-        'SPLIT': '拆分',
-        'FREEZE': '冻结',
-        'UNFREEZE': '解冻',
-        'MOVE': '移库',
-        'RESERVE': '预留',
-        'UNRESERVE': '取消预留'
-      }
-      return typeMap[type] || type
-    },
-
-    // 获取操作类型颜色 - rqrq
-    getOperationTypeColor(type) {
+    // 获取操作类型样式（加粗+颜色）- rqrq
+    getOperationTypeStyle(type) {
+      // 扫入是绿色、扫出是蓝色、调用栈板是蓝色 - rqrq
       const colorMap = {
-        'CREATE': 'success',
-        'UPDATE': 'primary',
-        'DELETE': 'danger',
-        'MERGE': 'warning',
-        'SPLIT': 'info',
-        'FREEZE': 'danger',
-        'UNFREEZE': 'success',
-        'MOVE': 'info',
-        'RESERVE': 'warning',
-        'UNRESERVE': 'success'
+        '扫入': '#67C23A',        // 绿色
+        '扫出': '#409EFF',        // 蓝色
+        '调用栈板': '#409EFF',    // 蓝色
+        '自动分拣': '#E6A23C'     // 橙色
+      }
+      return {
+        fontWeight: 'bold',
+        color: colorMap[type] || '#606266'  // 默认灰色
       }
-      return colorMap[type] || ''
     },
 
     // 格式化日期 - rqrq
diff --git a/src/views/modules/automatedWarehouse/notifyDetailQuery.vue b/src/views/modules/automatedWarehouse/notifyDetailQuery.vue
index 5cc0200..9d28e68 100644
--- a/src/views/modules/automatedWarehouse/notifyDetailQuery.vue
+++ b/src/views/modules/automatedWarehouse/notifyDetailQuery.vue
@@ -70,9 +70,9 @@
           <span v-else-if="item.columnProp === 'transportFlag'" :style="{color: scope.row.transportFlag === 'Y' ? '#67C23A' : '#909399'}">
             {{ scope.row.transportFlag === 'Y' ? '是' : '否' }}
           </span>
-          <!-- 订单类型特殊显示 - rqrq -->
+          <!-- 订单类型特殊显示（中文）- rqrq -->
           <span v-else-if="item.columnProp === 'orderType'" :style="{color: getOrderTypeColor(scope.row.orderType), fontWeight: 'bold'}">
-            {{ scope.row.orderType || '-' }}
+            {{ getOrderTypeText(scope.row.orderType) }}
           </span>
           <!-- 普通列显示 -->
           <span v-else-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
@@ -120,9 +120,9 @@
               <span v-else-if="item.columnProp === 'issureFlag'" :style="{color: scope.row.issureFlag === 'Y' ? '#67C23A' : '#909399'}">
                 {{ scope.row.issureFlag === 'Y' ? '是' : '否' }}
               </span>
-              <!-- 订单类型特殊显示 - rqrq -->
+              <!-- 订单类型特殊显示（中文）- rqrq -->
               <span v-else-if="item.columnProp === 'orderType'" :style="{color: getOrderTypeColor(scope.row.orderType), fontWeight: 'bold'}">
-                {{ scope.row.orderType || '-' }}
+                {{ getOrderTypeText(scope.row.orderType) }}
               </span>
               <!-- 普通列显示 -->
               <span v-else-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
@@ -436,6 +436,25 @@ export default {
           columnWidth: 100,
           showOverflowTooltip: true
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 801001,
+          serialNumber: '801001Table2ComponentPartNo',
+          tableId: '801001Table2',
+          tableName: '预留标签清单表',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+          showOverflowTooltip: true
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 801001,
@@ -572,6 +591,19 @@ export default {
           return '#909399'  // 灰色
       }
     },
+    // 获取订单类型中文文本 - rqrq
+    getOrderTypeText(orderType) {
+      switch (orderType) {
+        case 'shoporder':
+          return '生产订单'
+        case 'shipment':
+          return '销售发货'
+        case 'slittingorder':
+          return '分切订单'
+        default:
+          return orderType || '-'
+      }
+    },
     // 查询主表数据 - rqrq
     searchTable() {
       this.dataListLoading = true
diff --git a/src/views/modules/automatedWarehouse/palletOperationLog.vue b/src/views/modules/automatedWarehouse/palletOperationLog.vue
index 4c22256..7115f35 100644
--- a/src/views/modules/automatedWarehouse/palletOperationLog.vue
+++ b/src/views/modules/automatedWarehouse/palletOperationLog.vue
@@ -58,9 +58,9 @@
       <el-table-column prop="site" header-align="center" align="center" min-width="80" label="站点"></el-table-column>
       <el-table-column prop="operationType" header-align="center" align="center" min-width="100" label="操作类型">
         <template slot-scope="scope">
-          <el-tag :type="getOperationTypeColor(scope.row.operationType)" size="mini">
-            {{ getOperationTypeText(scope.row.operationType) }}
-          </el-tag>
+          <span :style="getOperationTypeStyle(scope.row.operationType)">
+            {{ scope.row.operationType || '-' }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="operationReason" header-align="center" align="left" min-width="200" label="操作原因" show-overflow-tooltip></el-table-column>
@@ -191,36 +191,16 @@ export default {
       this.getDataList()
     },
 
-    // 获取操作类型文本 - rqrq
-    getOperationTypeText(type) {
-      const typeMap = {
-        'CALL': '调用托盘',
-        'UPDATE': '更新字段',
-        'DISPATCH': '任务下发',
-        'DELETE': '删除',
-        'LOCK': '锁定',
-        'UNLOCK': '解锁',
-        'MOVE': '移库',
-        'BIND': '绑定站点',
-        'UNBIND': '解绑站点'
-      }
-      return typeMap[type] || type
-    },
-
-    // 获取操作类型颜色 - rqrq
-    getOperationTypeColor(type) {
+    // 获取操作类型样式（加粗+颜色）- rqrq
+    getOperationTypeStyle(type) {
+      // 调用托盘是蓝色 - rqrq
       const colorMap = {
-        'CALL': 'primary',
-        'UPDATE': 'success',
-        'DISPATCH': 'warning',
-        'DELETE': 'danger',
-        'LOCK': 'danger',
-        'UNLOCK': 'success',
-        'MOVE': 'info',
-        'BIND': 'success',
-        'UNBIND': 'warning'
+        '调用托盘': '#409EFF'     // 蓝色
+      }
+      return {
+        fontWeight: 'bold',
+        color: colorMap[type] || '#606266'  // 默认灰色
       }
-      return colorMap[type] || ''
     },
 
     // 格式化日期 - rqrq