From 1771ad243a53fcd59c92c3849c0349e7fd6b25d3 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 21 五月 2025 13:12:22 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index e46458c..46246c8 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -44,7 +44,7 @@
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
- {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
+ {align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 240, width: 240},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
@@ -122,9 +122,12 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 150},
+ {field: 'model', title: '鐗╂枡浠ｇ爜', width: 150},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
{field: 'batch', title: '鎵瑰彿'},
+ {field: 'proType', title: '灞炴��'},
+ {field: 'temp1', title: '鍚堝悓鍙�'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
@@ -237,10 +240,14 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
{field: 'batch', title: '鎵瑰彿', edit: true},
+ {field: 'proType', title: '灞炴��', edit: true},
+ {field: 'model', title: '浠ｇ爜', edit: true},
+ {field: 'threeCode', 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},
// {field: 'unit', title: '鍗曚綅', width: 80},
+ {field: 'wareName', title: '浠撳簱', edit: true},
{field: 'memo', title: '澶囨敞' , edit: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
]],
@@ -501,7 +508,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
@@ -514,7 +521,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