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 @@
+
@@ -60,9 +61,9 @@
-
- {{ getOperationTypeText(scope.row.operationType) }}
-
+
+ {{ scope.row.operationType || '-' }}
+
@@ -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 @@
{{ scope.row.transportFlag === 'Y' ? '是' : '否' }}
-
+
- {{ scope.row.orderType || '-' }}
+ {{ getOrderTypeText(scope.row.orderType) }}
{{ scope.row[item.columnProp] }}
@@ -120,9 +120,9 @@
{{ scope.row.issureFlag === 'Y' ? '是' : '否' }}
-
+
- {{ scope.row.orderType || '-' }}
+ {{ getOrderTypeText(scope.row.orderType) }}
{{ scope.row[item.columnProp] }}
@@ -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 @@
-
- {{ getOperationTypeText(scope.row.operationType) }}
-
+
+ {{ scope.row.operationType || '-' }}
+
@@ -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