From 98b29f7bfcea7d367428df66aef2eabe140bd4a5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 28 六月 2020 09:18:11 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/comb.html | 78 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 482e69b..8961e5e 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -43,15 +43,27 @@
padding: 6px 10px;
}
#code {
- width: 70%;
+ width: 75%;
height: 30px;
+ margin-right: 0;
}
header button {
height: 20px;
width: 70px;
}
+ /* layer */
+ .layui-layer-title {
+ font-size: 11px;
+ height: 20px;
+ line-height: 20px;
+ }
+
/* 涓讳綋 */
+ main {
+ height: 170px;
+ overflow: auto;
+ }
.layui-table, .layui-table-view {
margin: 0;
}
@@ -59,9 +71,13 @@
padding: 0;
}
.layui-table-cell {
+ height: 22px;
+ line-height: 22px;
padding: 0;
}
-
+ .layui-table-grid-down {
+ display: none;
+ }
/* 灏鹃儴 */
footer {
position: absolute;
@@ -79,10 +95,10 @@
<header>
<div class="layui-input-inline">
<label class="layui-form-label">鏉＄爜</label>
- <input class="layui-input" type="text" id="code" placeholder="璇锋壂鐮佹垨杈撳叆" autocomplete="off">
+ <input class="layui-input" type="text" id="code" placeholder="鎵爜/杈撳叆" autocomplete="off">
</div>
<div style="margin: 5px 5px">
- <button type="button" class="layui-btn layui-btn-normal layui-btn-xs"><i class="layui-icon">+</i>鎻愬彇</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
</div>
</header>
@@ -93,27 +109,26 @@
<!-- 灏鹃儴 -->
<footer>
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-xs">閲嶇疆</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-xs">缁勬墭</button>
+ <button type="button" class="layui-btn layui-btn-xs" onclick="reset()">閲嶇疆</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="comb">缁勬墭</button>
</div>
</footer>
</body>
<script>
+ var tableIns;
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
- var layDate = layui.laydate;
var form = layui.form;
tableIns = table.render({
elem: '#chooseData',
data: [],
- even: true,
limit: 500,
cellMinWidth: 50,
cols: [[
- {fixed: 'left', field: 'count', title: '鏁伴噺', align: 'center', edit:'text', style:'color: blue;font-weight: bold', width:50},
+ {fixed: 'left', align: 'center', field: 'count', title: '閲�', style:'color: blue', width:20},
{field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
{field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
@@ -122,5 +137,50 @@
});
});
+
+ window.onload = function(){document.getElementById("code").focus();}
+
+ var matCodeLayerIdx;
+ function getMat() {
+ matCodeLayerIdx = layer.open({
+ type: 2,
+ title: '鐗╂枡',
+ shade: [0.3,'#000'],
+ area: ['90%', '90%'],
+ content: 'matQuery.html',
+ success: function(layero, index){
+ $('.layui-layer-title').css('height', '20px').css('line-height', '20px').css('font-size', '12px').css('padding-left', '10px')
+ $('.layui-layer-setwin').css("top", '2px').css('right', '3px')
+ }
+ });
+ }
+
+ // 娣诲姞琛ㄦ牸鏁版嵁
+ var matData = [];
+ function addTableData(data) {
+ let toPush = true;
+ for (var j=0;j<matData.length;j++){
+ if (data.matNo === matData[j].matNo) {
+ matData[j].count = Number(matData[j].count) + Number(data.count);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ matData.push(data);
+ }
+ tableIns.reload({data: matData});
+ }
+
+ // 閲嶇疆
+ function reset() {
+ $('#code').val("");
+ matData = [];
+ tableIns.reload({data: matData});
+ }
+
+ // 缁勬墭
+ function comb() {
+
+ }
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1