From 5fe9c379f0cc696568a0db249026a1e8a3b02a5a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 15 九月 2020 13:52:39 +0800
Subject: [PATCH] Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs
---
src/main/webapp/views/pda/comb.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index c3931c3..5d0dddb 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -55,8 +55,8 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {field: 'matNo', align: 'center', title: '浜у搧浠ｅ彿'},
+ {field: 'matName', align: 'center', title: '浜у搧鍚嶇О'}
]],
done: function (res, curr, count) {
}
@@ -77,7 +77,7 @@
function getMat() {
matCodeLayerIdx = layer.open({
type: 2,
- title: '鎻愬彇鐗╂枡',
+ title: '鎻愬彇浜у搧',
shade: [0.3,'#000'],
area: ['90%', '80%'],
content: 'matQuery.html',
@@ -131,7 +131,7 @@
return;
}
if (matData.length === 0) {
- tips("璇锋彁鍙栫墿鏂�", true);
+ tips("璇锋彁鍙栦骇鍝�", true);
return;
}
$.ajax({
--
Gitblit v1.9.1