From 24f27e8b65c0f58e2b58874b1d991b437e3859e8 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 15 六月 2024 13:11:30 +0800
Subject: [PATCH] #

---
 zy-asrs-wms/src/main/webapp/static/js/order/order.js |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 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 682849f..db68dae 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);
@@ -244,8 +244,12 @@
                         condition: decodeURI(docName)
                     },
                     success: function (res) {
-                        $("#docType").val(res.data[0].id)
-                        $(document.getElementById("docType$")).val(res.data[0].value)
+                        if (res.code == 200) {
+                            if (res.data.length > 0) {
+                                $("#docType").val(res.data[0].id);
+                                $(document.getElementById("docType$")).val(res.data[0].value)
+                            }
+                        }
                     }
                 })
 
@@ -561,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
@@ -574,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