From d1be26f8d8196716257de0d3b09daa83a62bfffe Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 04 十一月 2025 13:43:51 +0800
Subject: [PATCH] #1
---
src/main/webapp/static/js/order/order.js | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 6fd6cab..fc4197d 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -43,7 +43,9 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ {field: 'itemName', align: 'center', title: '瀹㈡埛po', minWidth: 160, width: 160},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {field: 'cstmrName', align: 'center', title: '璐т富', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
@@ -124,13 +126,13 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'specs', title: '瑙勬牸'},
- {field: 'batch', title: '鎵瑰彿'},
- {field: 'anfme', title: '寰呭畬缁撴暟閲�'},
- {field: 'qty', title: '寰呬笂鎶ユ暟閲�', style: 'font-weight: bold'},
- {field: 'workQty', title: '宸蹭笂鎶ユ暟閲�'},
+ {field: 'matnr', title: 'sku', width: 160},
+ {field: 'maktx', title: '鍚嶇О', width: 80},
+ {field: 'standby1', title: 'po'},
+ {field: 'standby2', title: 'upc'},
+ {field: 'anfme', title: '鏁伴噺', width: 80},
+ {field: 'qty', title: '涓婃姤鏁伴噺', style: 'font-weight: bold'},
+ {field: 'workQty', title: '鍘嗗彶涓婃姤鏁伴噺'},
// {field: 'unit', title: '鍗曚綅'},
// {
// field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -206,6 +208,8 @@
orderId: Number(data.field.id),
docType: Number(data.field.docType),
orderNo: data.field.orderNo,
+ standby1: data.field.standby1,
+ ownerId: Number(data.field.owner),
orderDetlList: nList
}),
contentType:'application/json;charset=UTF-8',
@@ -236,10 +240,12 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿', edit: true},
- {field: 'specs', title: '瑙勬牸'},
+ {field: 'matnr', title: 'sku', width: 160},
+ {field: 'maktx', title: '鍚嶇О', width: 80},
+ // {field: 'batch', title: '鎵瑰彿', edit: true},
+ // {field: 'specs', title: '瑙勬牸'},
+ {field: 'standby1', title: 'po'},
+ {field: 'standby2', title: 'upc'},
{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},
@@ -541,7 +547,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
@@ -554,13 +560,13 @@
// 璧嬪��
traceCharts.setOption({
title: {
- subtext: res.data.totalQty+"/"+res.data.wrkQty+"/"+res.data.endQty
+ subtext: res.data.totalQty+"/"+res.data.endQty+"/"+res.data.wrkQty
},
series: [
{
data: [
- {name: '宸蹭綔涓�', value: res.data.wrkQty},
- {name: '鏈綔涓�', value: res.data.totalQty-res.data.wrkQty-res.data.lackQty},
+ {name: '宸蹭綔涓�', value: res.data.wrkQty+res.data.endQty},
+ {name: '鏈綔涓�', value: res.data.totalQty-res.data.wrkQty-res.data.endQty-res.data.lackQty},
{name: '搴撳瓨涓嶈冻', value: res.data.lackQty},
]
}
--
Gitblit v1.9.1