From 4a868400b87fa0d1ebfb83a530d786fd7b2f6459 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 07 四月 2021 09:58:17 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/MatController.java | 16 ++++++-
src/main/webapp/views/pda/selectMat.html | 45 +++++++++++++++++++++-
src/main/webapp/views/pda/comb.html | 1
src/main/webapp/views/pda/matQuery.html | 3 +
4 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/MatController.java b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
index 4bc7cef..faf2fb1 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java
@@ -35,9 +35,7 @@
@RequestMapping(value = "/mat/list/pda/auth")
@ManagerAuth
- public R pdaList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = true)Long tagId){
+ public R pdaList(@RequestParam(required = true)Long tagId){
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
wrapper.eq("tag_id", tagId);
wrapper.orderBy("create_time", false);
@@ -45,6 +43,18 @@
return R.ok().add(mats);
}
+ @RequestMapping(value = "/mat/search/pda/auth")
+ @ManagerAuth
+ public R pdaSearch(@RequestParam(required = false)String condition){
+ EntityWrapper<Mat> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like("matnr", condition).or().like("maktx", condition);
+ }
+ wrapper.orderBy("create_time", false);
+ List<Mat> mats = matService.selectList(wrapper);
+ return R.ok().add(mats);
+ }
+
@RequestMapping(value = "/mat/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 920dc31..35a31ee 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -167,6 +167,7 @@
$('#mat-btn').focus();
}
});
+ // layer.full(matCodeLayerIdx)
}
// 娣诲姞琛ㄦ牸鏁版嵁
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index a20a665..7b67459 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -51,6 +51,7 @@
#selectBtn {
vertical-align: middle;
padding: 3px 5px;
+ height: 32px;
}
#confirm {
@@ -145,7 +146,7 @@
$('#specs').val(res.data.specs);
$('#unit').val(res.data.unit);
countDom.val(initMatCount);
- $('#count').focus().select();
+ // $('#count').focus().select();
}
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
diff --git a/src/main/webapp/views/pda/selectMat.html b/src/main/webapp/views/pda/selectMat.html
index 2f85405..58fef5a 100644
--- a/src/main/webapp/views/pda/selectMat.html
+++ b/src/main/webapp/views/pda/selectMat.html
@@ -19,7 +19,16 @@
height: 100%;
background-color: #f1f1f1;
padding: 5px;
+ position: relative;
+ /*overflow: hidden;*/
}
+
+ /*header {*/
+ /* position: absolute;*/
+ /*}*/
+ /*main {*/
+ /* padding-top: 30px;*/
+ /*}*/
/* 澶撮儴鎼滅储鏍� */
.search-box {
@@ -31,7 +40,7 @@
border-radius: 20px;
height: 30px;
box-shadow: 0 0 3px rgba(0,0,0,.3);
- width: 75%;
+ width: 73%;
padding-left: 15px;
vertical-align: middle;
}
@@ -92,8 +101,8 @@
<header>
<div class="search-box">
- <input type="text" placeholder="璇疯緭鍏ュ晢鍝佺紪鐮�/鍚嶇О">
- <button>
+ <input id="search-msg" type="text" placeholder="璇疯緭鍏ュ晢鍝佺紪鐮�/鍚嶇О">
+ <button onclick="search()">
<i class="layui-icon"></i>
</button>
</div>
@@ -108,6 +117,36 @@
showTag();
})
+ // 鎼滅储
+ function search(){
+ var condition = $('#search-msg').val();
+ $.ajax({
+ url: baseUrl + "/mat/search/pda/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ condition: condition
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ if (res.data != null && res.data.length > 0) {
+ var tplDom = $("#matTpl");
+ var tpl = tplDom.html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ $('#main-contain').html(html);
+ } else {
+ $('#main-contain').html('<div style="text-align: center; margin-top: 15px"><span style="font-size: large">鏆傛棤鍟嗗搧</span></div>');
+ }
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ parent.layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }
+
// 褰掔被鐐瑰嚮
$(document).on('click','.box-tag-item', function () {
var tagId = $(this).children('input').get(0).value;
--
Gitblit v1.9.1