From 09211d189468e0901180c4dde8340d5487657ccb Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期四, 31 七月 2025 10:50:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/webapp/static/js/order/order.js | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 20b90d0..320f168 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -55,7 +55,8 @@
{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},
- {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
+ {field: 'cstmrName', align: 'center',title: '瀹㈡埛鍚嶇О'},
+ {field: 'memo', align: 'center',title: '澶囨敞'},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 240}
]],
request: {
@@ -247,8 +248,8 @@
{type: 'numbers'},
{field: 'brand', title: '鍖呰缁勫彿', width: 160},
// {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- // {field: 'batch', title: '绠卞彿'},
- // {field: 'anfme', title: '鏁伴噺'},
+ {field: 'supp', title: '瀹㈡埛鍚嶇О'},
+ {field: 'memo', title: '澶囨敞'},
// {field: 'workQty', title: '浣滀笟鏁伴噺'},
// {field: 'unit', title: '鍗曚綅'},
@@ -260,8 +261,12 @@
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
// {field: 'specs', title: '鎺ュご'},
- {field: 'qty$', title: '鐘舵��', style: 'font-weight: bold'},
- {field: 'source$', title: '鏄惁纭', style: 'font-weight: bold'}
+ {field: 'qty$', title: '鍑哄簱鐘舵��', style: 'font-weight: bold'},
+ {field: 'specs', title: '婧愬簱浣�', style: 'font-weight: bold'},
+ {field: 'model', title: '鐩爣搴撲綅', style: 'font-weight: bold'},
+ {field: 'beBatch', title: '璺ㄥ贩閬�', style: 'font-weight: bold'},
+ {field: 'danger$', title: '绉诲簱鐘舵��', style: 'font-weight: bold'},
+ {field: 'inspect$', title: '澶囪揣鐘舵��', style: 'font-weight: bold'}
]],
request: {
pageName: 'curr',
--
Gitblit v1.9.1