From c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 14:31:31 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/webapp/static/js/pack/pack.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/pack/pack.js b/src/main/webapp/static/js/pack/pack.js
index b98b1af..76d9fca 100644
--- a/src/main/webapp/static/js/pack/pack.js
+++ b/src/main/webapp/static/js/pack/pack.js
@@ -24,8 +24,8 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
,{field: 'barcode',title: '鏉＄爜'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', minWidth: 250, width: 250}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�', minWidth: 250, width: 250}
+ ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', hide: true}
,{field: 'settle$', align: 'center',title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
@@ -149,7 +149,7 @@
admin.open({
type: 1,
area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ title: (mData ? '淇敼' : '娣诲姞') + '鏁版嵁',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
layDateRender(mData);
--
Gitblit v1.9.1