From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/webapp/static/js/order/order.js | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index ba669b9..130efd6 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -53,11 +53,11 @@
//{field: 'defNumber', align: 'center', title: '涓氬姟绫诲瀷'},
//{field: 'postFee', align: 'center', title: '鎬绘暟閲�', minWidth: 130, width: 130},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
- {field: 'createTime$', title: '鍒涘缓鏃堕棿'},
+ {field: 'createTime$', title: '鍒涘缓鏃堕棿', hide: true},
+ {field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'},
{field: 'shipCode', align: 'center',title: '鍒跺崟浜�', hide: false},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡', hide: true},
{field: 'cstmrName', align: 'center',title: '渚涘簲鍟�/瀹㈡埛缂栫爜', hide: true},
{field: 'tel', align: 'center',title: '浠撳簱', hide: true},
{field: 'operMemb', align: 'center',title: '鍑哄叆搴撶被鍒�', hide: true},
@@ -147,8 +147,8 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 140},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 150},
//{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
@@ -167,6 +167,7 @@
{field: 'deadTime', title: '鑷敱椤�'},
{field: 'processSts$', title: '宸ュ簭'},
{field: 'specs', title: '瑙勬牸'},
+ {field: 'reportQty', title: '涓婃姤鏁伴噺'},
//{field: 'itemNum', title: '琛屽敮涓�鏍囪瘑'}
]],
request: {
--
Gitblit v1.9.1