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 | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 3be8908..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
@@ -39,8 +39,6 @@
where.docName = decodeURI(docName);
}
- console.log(where)
-
// 娓叉煋琛ㄦ牸
var insTb = table.render({
elem: '#order',
@@ -165,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);
@@ -174,7 +172,7 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'origin', title: '浠撳簱鍙�'}
+ {field: 'threeCode', title: '浠撳簱鍙�'}
]],
request: {
pageName: 'curr',
@@ -237,6 +235,24 @@
area: '1300px',
success: function (layero, dIndex) {
$(layero).children('.layui-layer-content').css('overflow', 'visible');
+
+ $.ajax({
+ url: baseUrl + "/docTypeQuery/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ data: {
+ condition: decodeURI(docName)
+ },
+ success: function (res) {
+ if (res.code == 200) {
+ if (res.data.length > 0) {
+ $("#docType").val(res.data[0].id);
+ $(document.getElementById("docType$")).val(res.data[0].value)
+ }
+ }
+ }
+ })
+
var isExpAdd = !expTpe;
// 鍥炴樉鏁版嵁
form.val('editForm', expTpe);
@@ -549,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
@@ -562,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