From 192834a2160e2aa0f8a4bad9b13bdd535df57e9c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 26 九月 2023 20:14:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/webapp/static/js/order/out.js | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index bfe89c1..ac322ac 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -39,6 +39,8 @@
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
+ ,{field: 'color', align: 'center',title: '閿�鍞鍗曞彿'}
+ ,{field: 'origin', align: 'center',title: '閿�鍞鍗曡鍙�'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
// ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
--
Gitblit v1.9.1