From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/static/js/orderDetl/orderDetl.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index caef270..b6e3708 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -25,12 +25,12 @@
,{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: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿'}
+ ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
--
Gitblit v1.9.1