From 86fb7988d3597c0e66a5e063f385a213849253bf Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 07 四月 2021 09:16:53 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/controller/MatController.java | 12 ++++ src/main/webapp/views/pda/selectMat.html | 104 ++++++++++++++++++++++++++-------- src/main/webapp/static/js/mat/mat.js | 2 src/main/java/zy/cloud/wms/manager/controller/TagController.java | 4 + src/main/webapp/views/tag/tag.html | 6 +- 5 files changed, 98 insertions(+), 30 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 365eee8..4bc7cef 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java @@ -33,6 +33,18 @@ @Autowired private MatService matService; + @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){ + EntityWrapper<Mat> wrapper = new EntityWrapper<>(); + wrapper.eq("tag_id", tagId); + 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/java/zy/cloud/wms/manager/controller/TagController.java b/src/main/java/zy/cloud/wms/manager/controller/TagController.java index 4f3c8b1..b5d596e 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/TagController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/TagController.java @@ -33,8 +33,10 @@ @ManagerAuth public R pdaList(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, - @RequestParam Map<String, Object> param){ + @RequestParam(required = false)Long parentId){ EntityWrapper<Tag> wrapper = new EntityWrapper<>(); + wrapper.eq("parent_id", parentId==null?getOriginTag().getId():parentId); + wrapper.orderBy("sort"); List<Tag> tags = tagService.selectList(wrapper); return R.ok().add(tags); } diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js index 117704c..db18b32 100644 --- a/src/main/webapp/static/js/mat/mat.js +++ b/src/main/webapp/static/js/mat/mat.js @@ -360,7 +360,7 @@ var tpl = templateDom.html(); var template = Handlebars.compile(tpl); var html = template(res); - let box = $("#box"); + var box = $("#box"); box.html(html);box.show(); box.print({mediaPrint:true}); box.hide(); diff --git a/src/main/webapp/views/pda/selectMat.html b/src/main/webapp/views/pda/selectMat.html index b88d19a..41ecdc6 100644 --- a/src/main/webapp/views/pda/selectMat.html +++ b/src/main/webapp/views/pda/selectMat.html @@ -72,53 +72,107 @@ <header> <div class="search-box"> - <input type="text"> + <input type="text" placeholder="璇疯緭鍏ュ晢鍝佺紪鐮�/鍚嶇О"> <button> <i class="layui-icon"></i> </button> </div> </header> -<main> - <div class="box-item"> - <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div> - </div> - <div class="box-item"> - <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div> - </div> - <div class="box-item"> - <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div> - </div> - <div class="box-item"> - <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div> - </div> - <div class="box-item"> - <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div> - </div> - <div class="box-item"> - <div class="box-item-label">灏奸緳澶磋灪涓濈洅瑁�</div> - </div> - +<main id="main-contain"> </main> </body> <script> $(function () { - - + showTag(); }) $(document).on('click','.box-item', function () { + var tagId = $(this).children('input').get(0).value; + showTag(tagId); }) + + // 灞曠ず褰掔被 + function showTag(parentId){ + $.ajax({ + url: baseUrl + "/tag/list/pda/auth", + headers: {'token': localStorage.getItem('token')}, + data: { + parentId: parentId + }, + method: 'POST', + success: function (res) { + if (res.code === 200) { + if (res.data != null && res.data.length > 0) { + console.log(res.data) + var tplDom = $("#tagTpl"); + var tpl = tplDom.html(); + var template = Handlebars.compile(tpl); + var html = template(res); + $('#main-contain').html(html); + } else { + var tagId = parentId; + showMat(tagId); + } + } else if (res.code === 403) { + top.location.href = baseUrl + "/pda"; + } else { + parent.layer.msg(res.msg, {icon: 2}); + } + } + }) + } + + // 灞曠ず鍟嗗搧 + function showMat(tagId) { + if (isEmpty(tagId)) { + return; + } + $.ajax({ + url: baseUrl + "/mat/list/pda/auth", + headers: {'token': localStorage.getItem('token')}, + data: { + tagId: tagId + }, + method: 'POST', + success: function (res) { + if (res.code === 200) { + if (res.data != null && res.data.length > 0) { + console.log(res.data) + var tplDom = $("#matTpl"); + var tpl = tplDom.html(); + var template = Handlebars.compile(tpl); + var html = template(res); + $('#main-contain').html(html); + } else { + + } + } else if (res.code === 403) { + top.location.href = baseUrl + "/pda"; + } else { + parent.layer.msg(res.msg, {icon: 2}); + } + } + }) + } + + </script> <script type="text/template" id="tagTpl"> {{#each data}} - <option value="{{this}}">{{this}}</option> + <div class="box-item"> + <input name="tagId" type="hidden" value="{{this.id}}"> + <div class="box-item-label">{{this.name}}</div> + </div> {{/each}} </script> <script type="text/template" id="matTpl"> {{#each data}} - <option value="{{this}}">{{this}}</option> + <div class="box-item"> + <input name="matId" type="hidden" value="{{this.id}}"> + <div class="box-item-label">{{this.maktx}}</div> + </div> {{/each}} </script> </html> diff --git a/src/main/webapp/views/tag/tag.html b/src/main/webapp/views/tag/tag.html index 8b59cf5..a219525 100644 --- a/src/main/webapp/views/tag/tag.html +++ b/src/main/webapp/views/tag/tag.html @@ -92,9 +92,9 @@ </div> <div class="layui-form-item"> - <label class="layui-form-label">绠�瑕佹弿杩�</label> + <label class="layui-form-label">鎺掑簭</label> <div class="layui-input-block"> - <input name="brief" placeholder="璇疯緭鍏ョ畝瑕佹弿杩�" class="layui-input"> + <input name="sort" placeholder="璇疯緭鍏ユ帓搴�" class="layui-input"> </div> </div> @@ -157,7 +157,7 @@ ,{field: 'img', align: 'center',title: '鍥剧墖', hide: true} // ,{field: 'brief', align: 'center',title: '绠�瑕佹弿杩�'} // ,{field: 'count', align: 'center',title: '鏁伴噺'} - ,{field: 'sort', align: 'center',title: '鎺掑簭', hide: true} + ,{field: 'sort', align: 'center',title: '鎺掑簭'} ,{field: 'status$', align: 'center',title: '鐘舵��'} ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true} -- Gitblit v1.9.1