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/stockIn.html | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index a2b72d8..ccc4650 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -120,8 +120,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) {
@@ -160,12 +160,12 @@
})
}
- // 鎻愬彇鐗╂枡
+ // 鎻愬彇浜у搧
var matCodeLayerIdx;
function getMat() {
matCodeLayerIdx = layer.open({
type: 2,
- title: '鐗╂枡',
+ title: '浜у搧',
shade: [0.3,'#000'],
area: ['90%', '80%'],
content: 'matQuery.html',
@@ -221,7 +221,7 @@
return;
}
if (matData.length === 0) {
- tips("璇锋彁鍙栫墿鏂�", true);
+ tips("璇锋彁鍙栦骇鍝�", true);
return;
}
// var site = $('input:radio[name="site"]:checked').next("span").html();
--
Gitblit v1.9.1