From 6592c7de3c380dd464e05ca4b47ae5d2d5536a6e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 25 三月 2021 10:44:44 +0800
Subject: [PATCH] #
---
src/main/webapp/views/check/check.html | 24 ++++++++++++++++++++++++
src/main/webapp/static/js/check/check.js | 13 +++++++++----
src/main/java/zy/cloud/wms/manager/controller/NodeController.java | 2 +-
3 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/NodeController.java b/src/main/java/zy/cloud/wms/manager/controller/NodeController.java
index dcbda41..71dfff8 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/NodeController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/NodeController.java
@@ -144,7 +144,7 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<Node> wrapper = new EntityWrapper<>();
- wrapper.like("name", condition).or().like("uuid", condition);
+ wrapper.like("name", condition).or().like("uuid", condition).eq("type", 3);
Page<Node> page = nodeService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Node node : page.getRecords()){
diff --git a/src/main/webapp/static/js/check/check.js b/src/main/webapp/static/js/check/check.js
index 20e21a5..c340769 100644
--- a/src/main/webapp/static/js/check/check.js
+++ b/src/main/webapp/static/js/check/check.js
@@ -32,11 +32,11 @@
,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'oriQty', align: 'center',title: '璐﹂潰鏁伴噺 (鍘�)', style: 'font-weight: bolder'}
,{field: 'cekQty', align: 'center',title: '瀹炵洏鏁伴噺 (鐜�)', style: 'font-weight: bolder'}
- ,{field: 'settle$', align: 'center',title: '鐩堜簭', templet: '#checkTpl', width: 100}
,{field: 'diffQty', align: 'center',title: '宸��', style: 'font-weight: bolder; color: blue'}
+ ,{field: 'settle$', align: 'center',title: '鐩堜簭', templet: '#checkTpl', width: 100}
+ ,{field: 'status$', align: 'center',title: '鐘舵��', templet: '#statusTpl', width: 110}
,{field: 'createTime$', align: 'center',title: '鐩樼偣鏃堕棿'}
,{field: 'createBy$', align: 'center',title: '鐩樼偣浜哄憳'}
- ,{field: 'status$', align: 'center',title: '鐘舵��', templet: '#statusTpl', width: 110}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
@@ -209,7 +209,7 @@
// 瀹℃牳
case 'auditing':
layer.confirm(data.nodeUuid +'璐т綅 鐩樼偣瀹℃牳 '+ data.matnr + ' ?', function(){
- var index = layer.load(1, {shade: [0.5,'#000']});
+ var index = layer.load(1, {shade: [0.1,'#000']});
$.ajax({
url: baseUrl+"/work/stock/check/auditing",
headers: {'token': localStorage.getItem('token')},
@@ -221,6 +221,7 @@
success: function (res) {
if (res.code === 200) {
layer.msg(res.msg, {icon: 1})
+ $(".layui-laypage-btn")[0].click();
} else if (res.code === 403) {
top.location.href = baseUrl+"/";
} else {
@@ -329,7 +330,11 @@
elem: '#updateTime\\$',
type: 'datetime'
});
-
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
});
diff --git a/src/main/webapp/views/check/check.html b/src/main/webapp/views/check/check.html
index a328f90..bbecf43 100644
--- a/src/main/webapp/views/check/check.html
+++ b/src/main/webapp/views/check/check.html
@@ -35,6 +35,30 @@
<input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="settle">
+ <option value="" style="display: none">鐩堜簭鎯呭喌</option>
+ <option value="1">鐩樼泩</option>
+ <option value="2">鐩樹簭</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="status">
+ <option value="" style="display: none">閫夋嫨鐘舵��</option>
+ <option value="1">寰呭鏍�</option>
+ <option value="2">宸查�氳繃</option>
+ <option value="3">鍙栨秷</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="鐩樼偣璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
--
Gitblit v1.9.1