From 83c548d3dba59aaed9b52b5d413c6912a87d2efc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 16 六月 2024 15:50:14 +0800
Subject: [PATCH] #

---
 zy-asrs-wms/src/main/webapp/static/js/order/order.js |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zy-asrs-wms/src/main/webapp/static/js/order/order.js b/zy-asrs-wms/src/main/webapp/static/js/order/order.js
index 65e68c7..ed18cb4 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/order/order.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/order/order.js
@@ -163,8 +163,8 @@
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
                             {field: 'batch', title: '搴忓垪鐮�'},
                             {field: 'anfme', title: '鏁伴噺'},
-                            {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
-                            // {field: 'unit', title: '鍗曚綅'},
+                            {field: 'workQty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
+                            {field: 'qty', title: '瀹屾垚鏁伴噺'},
                             // {
                             //     field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
                             //         return util.toDateString(d.createTime);
@@ -172,7 +172,7 @@
                             // },
                             // {field: 'inQty', title: '宸插叆搴撻噺'},
                             // {field: 'color', title: '棰滆壊'},
-                            {field: 'origin', title: '浠撳簱鍙�'}
+                            {field: 'threeCode', title: '浠撳簱鍙�'}
                         ]],
                         request: {
                             pageName: 'curr',
@@ -565,7 +565,7 @@
                                 var traceCharts = echarts.init(document.getElementById('wrkTraceCharts'));
                                 var traceOptions = {
                                     title: {
-                                        text: '浣滀笟/鎬婚噺', x: 'center', y: '38%',
+                                        text: '鎬婚噺/浣滀笟/瀹屾垚', x: 'center', y: '38%',
                                         textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'},
                                         subtextStyle: {fontSize: 36, color: '#10B4E8'},
                                         itemGap: 20
@@ -578,7 +578,7 @@
                                 // 璧嬪��
                                 traceCharts.setOption({
                                     title: {
-                                        subtext: res.data.wrkQty+"/"+res.data.totalQty
+                                        subtext: res.data.totalQty+"/"+res.data.wrkQty+"/"+res.data.endQty
                                     },
                                     series: [
                                         {

--
Gitblit v1.9.1