From 3d321d82df16121e1c21fb2113757e5a16de54a2 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp' into phyzasrs-erp
---
src/main/webapp/static/js/orderDetl/orderDetl.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index 1117f77..b6e3708 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -25,11 +25,11 @@
,{field: 'id', align: 'center',title: 'ID'}
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '鎵规'}
+ ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿'}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
--
Gitblit v1.9.1