From ce6b5be6c0e1544bcc66f9fce9efec3ced724d95 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 11 七月 2020 15:46:29 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pakStore/matQuery.html | 95 +++++++++++++----------------------------------
1 files changed, 27 insertions(+), 68 deletions(-)
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index c593f17..f929872 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -26,12 +26,21 @@
<legend>鎼滅储鏍�</legend>
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡缂栫爜锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="mat_no" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="鐗╂枡缂栫爜" autocomplete="off">
</div>
</div>
-
+ <!-- 鏃ユ湡鑼冨洿 -->
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -55,17 +64,16 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStore/pakStore.js" charset="utf-8"></script>
</body>
<script>
- var initCountVal = 1;
- var matCodeData = [];
+
var pageCurr;
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;
// 鐗╂枡鏌ヨ鏁版嵁琛�
matQueryTable = table.render({
@@ -80,12 +88,13 @@
toolbar: '#toolbar',
cols: [[
{type: 'checkbox', fixed: 'left'},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜', sort: 'true'},
+ {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
{field: 'barcode', align: 'center', title: '鏉＄爜'},
{field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
{field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
{field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
- {field: 'count', title: '鏁伴噺', align: 'center', edit:'text', width: 100}
+ {field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true},
+ {field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
]],
request: {
pageName: 'curr',
@@ -106,41 +115,7 @@
if (res.code === 403) {
top.location.href = baseUrl + "/";
}
- $('td[data-field=count] div').html("1");
- setMatCodeData(res.data);
}
- });
-
- // 椤甸潰淇敼
- table.on('edit(matCode)', function (obj) {
- if (!isNaN(obj.value)) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
- } else {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- }
- });
-
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(matCode)', function (obj) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- searchData['orderByField'] = obj.field;
- searchData['orderByType'] = obj.type;
- matQueryTable.reload({
- where: searchData,
- page: {
- curr: 1
- },
- done: function (res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- limit();
- }
- });
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -149,15 +124,11 @@
var data = checkStatus.data;
switch(obj.event) {
case 'confirm':
- // 鏁版嵁鏍煎紡妫�鏌�
- for (var i=0;i<data.length;i++){
- if (isNaN(data[i]["count"])) {
- layer.msg("鏁伴噺閿欒");
- return;
- }
+ if (data.length === 0){
+ layer.msg("璇烽�夋嫨鏁版嵁");
+ return;
}
- parent.layer.close(parent.matCodeLayerIdx);
- parent.tableIns.reload({data: data})
+ parent.addTableData(data);
break;
}
});
@@ -174,23 +145,13 @@
clearFormVal($('#search-box'));
tableReload();
});
+
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
})
-
- function setMatCodeData(data) {
- matCodeData = data;
- for (var i=0;i<matCodeData.length;i++){
- matCodeData[i]["count"] = initCountVal;
- }
- }
-
- function updateMatCodeData(matNo, count) {
- for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
- matCodeData[i]["count"] = count;
- }
- }
- console.log(matCodeData);
- }
function tableReload(child) {
var searchData = {};
@@ -206,8 +167,6 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
- $('td[data-field=count] div').html("1");
- setMatCodeData(res.data);
pageCurr=curr;
if (res.data.length === 0 && count !== 0) {
tableIns.reload({
--
Gitblit v1.9.1