From 6fc7bb975eca07193843a031e378ac3f82317d35 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 12 八月 2025 15:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/SysApiLogList.vue | 3 ---
src/views/mes/MesProductionOrderList.vue | 10 ++++++++++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/mes/MesProductionOrderList.vue b/src/views/mes/MesProductionOrderList.vue
index 27c23e8..e48a9b7 100644
--- a/src/views/mes/MesProductionOrderList.vue
+++ b/src/views/mes/MesProductionOrderList.vue
@@ -143,6 +143,16 @@
dataIndex: 'orderQuantity'
},
{
+ title: '鍚堟牸鏁伴噺',
+ align: 'center',
+ dataIndex: 'qualifiedQuantity'
+ },
+ {
+ title: '鎶ュ簾鏁伴噺',
+ align: 'center',
+ dataIndex: 'scrapQuantity'
+ },
+ {
title: '鍩烘湰璁￠噺鍗曚綅',
align: 'center',
dataIndex: 'productionUnit'
diff --git a/src/views/system/SysApiLogList.vue b/src/views/system/SysApiLogList.vue
index bfe102b..b0d437f 100644
--- a/src/views/system/SysApiLogList.vue
+++ b/src/views/system/SysApiLogList.vue
@@ -87,20 +87,17 @@
customRender: function(t, r, index) {
return parseInt(index) + 1
},
- fixed: 'left',
},
{
title: 'API鍒嗙被',
align: 'center',
dataIndex: 'apiCategory',
- fixed: 'left',
width: 100,
},
{
title: '鎺ュ彛鍚嶇О',
align: 'center',
dataIndex: 'apiName',
- fixed: 'left',
width: 200,
ellipsis: true,
},
--
Gitblit v1.9.3