From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master
---
src/main/webapp/views/pda/comb.html | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 9cc59d2..0369016 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -19,7 +19,7 @@
<!-- 澶撮儴 -->
<header>
<div class="layui-input-inline">
- <label class="layui-form-label">鏉＄爜</label>
+ <label class="layui-form-label">鎵樼洏鐮�</label>
<input class="layui-input" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
</div>
<div style="margin: 5px 5px">
@@ -36,6 +36,7 @@
<div class="layui-btn-container">
<button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
<button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">缁勬墭</button>
+ <button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()" style="margin-left: 20px">杩斿洖</button>
<span id="tips"></span>
</div>
</footer>
@@ -51,11 +52,13 @@
tableIns = table.render({
elem: '#chooseData',
data: [],
+ width: 320,
limit: 500,
cellMinWidth: 50,
cols: [[
- {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
+ {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿'},
+ {field: 'count', align: 'center', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
@@ -79,7 +82,7 @@
type: 2,
title: '鎻愬彇鐗╂枡',
shade: [0.3,'#000'],
- area: ['90%', '80%'],
+ area: ['90%', '90%'],
content: 'matQuery.html',
success: function(layero, index){
$('.layui-layer-title').css('font-size', '16px');
@@ -181,5 +184,9 @@
$("#code").focus();
}
}
+
+ function back() {
+ parent.backIndex();
+ }
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1