From 73df1a92d6fd2696d4f359efa19e4b684317d732 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 17 九月 2023 18:46:13 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 4eecb1c..467301f 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -104,7 +104,7 @@
layer.open({
type: 1,
title: false,
- area: '820px',
+ area: '1020px',
offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -124,10 +124,10 @@
{type: 'numbers'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'batch', title: '鎵瑰彿'},
- {field: 'anfme', title: '鏁伴噺'},
- {field: 'workQty', title: '浣滀笟鏁伴噺'},
- {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
+ {field: 'batch', title: '绠卞彿'},
+ {field: 'anfme', title: '鏈ㄧ涓摐绠旀暟閲�'},
+ // {field: 'workQty', title: '浣滀笟鏁伴噺'},
+
// {field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -136,7 +136,9 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '瑙勬牸'}
+ {field: 'specs', title: '瑙勬牸'},
+ {field: 'qty$', title: '鐘舵��', style: 'font-weight: bold'},
+ {field: 'source$', title: '鏄惁纭', style: 'font-weight: bold'}
]],
request: {
pageName: 'curr',
@@ -236,7 +238,7 @@
{type: 'numbers', title: '#'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿', edit: true},
+ {field: 'batch', title: '绠卞彿', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
@@ -501,20 +503,20 @@
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
},
color: ['#10B4E8', '#E0E0E0', '#FF0000'],
tooltip: {trigger: 'item'},
- series: [{name: '鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}]
+ series: [{name: '绠卞瓙鏁伴噺', type: 'pie', radius: ['75%', '80%'], label: {normal: {show: false}}}]
};
traceCharts.setOption(traceOptions);
// 璧嬪��
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