From 641de82a0458ab5ba66b5e735895caad26708fa8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 12 四月 2021 11:24:56 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/ioWorks/matQuery.js                     |   74 ++++++++++++++++++++++++
 src/main/java/zy/cloud/wms/manager/controller/WorkController.java |   43 ++++++++++++--
 src/main/webapp/views/order/matQuery.html                         |   51 ++++++++++++-----
 3 files changed, 144 insertions(+), 24 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index 40ab8f9..9e38fa4 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -12,14 +12,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import zy.cloud.wms.common.web.BaseController;
-import zy.cloud.wms.manager.entity.CustOrder;
-import zy.cloud.wms.manager.entity.Pakout;
-import zy.cloud.wms.manager.entity.WrkSts;
+import zy.cloud.wms.manager.entity.*;
 import zy.cloud.wms.manager.entity.param.*;
-import zy.cloud.wms.manager.service.CustOrderService;
-import zy.cloud.wms.manager.service.PakoutService;
-import zy.cloud.wms.manager.service.WorkService;
-import zy.cloud.wms.manager.service.WrkStsService;
+import zy.cloud.wms.manager.service.*;
 
 import java.util.List;
 
@@ -162,4 +157,38 @@
         return workService.stockCheckAuditing(checkId, getUserId());
     }
 
+
+    /******************************************************************************************************/
+
+    @Autowired
+    private DocTypeService docTypeService;
+    @Autowired
+    private CstmrService cstmrService;
+    @Autowired
+    private ItemService itemService;
+
+    // 鑾峰彇鎵�鏈夊崟鎹被鍨�
+    @RequestMapping("/docType/all/get")
+    @ManagerAuth
+    public R getDocTypeData() {
+        List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("status", 1).orderBy("create_time", false));
+        return R.ok().add(docTypes);
+    }
+
+    // 鑾峰彇鎵�鏈夊鎴�
+    @RequestMapping("/cstmr/all/get")
+    @ManagerAuth
+    public R getCstmrData() {
+        List<Cstmr> cstmrs = cstmrService.selectList(new EntityWrapper<Cstmr>().eq("status", 1).orderBy("create_time", false));
+        return R.ok().add(cstmrs);
+    }
+
+    // 鑾峰彇鎵�鏈夐」鐩�
+    @RequestMapping("/item/all/get")
+    @ManagerAuth
+    public R getItemData() {
+        List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
+        return R.ok().add(items);
+    }
+
 }
diff --git a/src/main/webapp/static/js/ioWorks/matQuery.js b/src/main/webapp/static/js/ioWorks/matQuery.js
index 4fcf307..1fb11d4 100644
--- a/src/main/webapp/static/js/ioWorks/matQuery.js
+++ b/src/main/webapp/static/js/ioWorks/matQuery.js
@@ -19,6 +19,7 @@
     var layer = layui.layer;
     var form = layui.form;
     var notice = layui.notice;
+    var layDate = layui.laydate;
 
     tableIns = table.render({
         elem: '#chooseData',
@@ -61,16 +62,79 @@
                             return false;
                         }
                     }
+                    var index = layer.load(1, {shade: [0.1,'#000']});
+                    // 鍗曟嵁绫诲瀷
+                    var docTypeData;
+                    $.ajax({
+                        url: baseUrl+"/work/docType/all/get",
+                        headers: {'token': localStorage.getItem('token')},
+                        method: 'POST',
+                        async: false,
+                        success: function (res) {
+                            if (res.code === 200){
+                                docTypeData = res;
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                    var tpl1 = $('#docTypeSelectTpl').html();
+                    var template1 = Handlebars.compile(tpl1);
+                    var html1 = template1(docTypeData);
+                    $("#docType").html(html1);
+
+                    // 瀹㈡埛
+                    var cstmrData;
+                    $.ajax({
+                        url: baseUrl+"/work/cstmr/all/get",
+                        headers: {'token': localStorage.getItem('token')},
+                        method: 'POST',
+                        async: false,
+                        success: function (res) {
+                            if (res.code === 200){
+                                cstmrData = res;
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                    var tpl2 = $('#cstmrSelectTpl').html();
+                    var template2 = Handlebars.compile(tpl2);
+                    var html2 = template2(cstmrData);
+                    $("#cstmr").html(html2);
+
+                    // 椤圭洰
+                    var itemData;
+                    $.ajax({
+                        url: baseUrl+"/work/item/all/get",
+                        headers: {'token': localStorage.getItem('token')},
+                        method: 'POST',
+                        async: false,
+                        success: function (res) {
+                            if (res.code === 200){
+                                itemData = res;
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                    var tpl3 = $('#itemSelectTpl').html();
+                    var template3 = Handlebars.compile(tpl3);
+                    var html3 = template3(itemData);
+                    $("#item").html(html3);
+
+                    layer.close(index);
                     if (success) {
                         layer.open({
                             type: 1,
-                            title: '瀹氫箟閲囪喘閫�璐у崟缂栧彿',
+                            title: '鍗曟嵁濉厖',
                             offset: '100px',
                             area: ['360px'],
                             shade: 0.1,
                             content: $('#getOrderNo'),
                             success: function(layero, index){
-                                layer.iframeAuto(index)
+                                layer.iframeAuto(index);
+                                layui.form.render('select');
                             },
                             cancel: function () {
                                 $('#orderNo').val('');
@@ -172,6 +236,12 @@
         }});
     }
 
+    layDate.render({
+        elem: '#orderTime',
+        trigger: 'click',
+        type: 'date'
+    });
+
 })
 
 // 鎻愬彇鐗╂枡
diff --git a/src/main/webapp/views/order/matQuery.html b/src/main/webapp/views/order/matQuery.html
index 0fa462b..1dc4dbc 100644
--- a/src/main/webapp/views/order/matQuery.html
+++ b/src/main/webapp/views/order/matQuery.html
@@ -152,33 +152,36 @@
     <!-- 璁㈠崟缂栧彿銆佸崟鎹棩鏈熴�佸崟鎹被鍨嬨�侀」鐩紪鍙枫�佸鎴风紪鍙枫�� -->
     <div class="layui-form">
         <div class="layui-form-item">
+            <label class="layui-form-label layui-form-required">鍗曟嵁绫诲瀷:</label>
+            <div class="layui-input-block">
+                <select id="docType" name="docType" lay-verType="tips" lay-verify="required" required>
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item">
             <label class="layui-form-label layui-form-required">鍗曟嵁缂栧彿:</label>
             <div class="layui-input-block">
                 <input id="orderNo" name="orderNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" class="layui-input" lay-verify="required" autocomplete="off">
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label layui-form-required">瀹㈡埛缂栧彿:</label>
+            <label class="layui-form-label layui-form-required">鍗曟嵁鏃ユ湡:</label>
             <div class="layui-input-block">
-                <input id="customerTypeId" name="customerTypeId" placeholder="璇疯緭鍏ュ鎴风紪鍙�" class="layui-input" lay-verify="required" autocomplete="off">
+                <input id="orderTime" name="orderTime" placeholder="璇疯緭鍏ュ鎴风紪鍙�" class="layui-input" lay-verify="required" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label layui-form-required">椤圭洰缂栧彿:</label>
+            <div class="layui-input-block">
+                <select id="item" name="item" lay-verType="tips" lay-verify="required" required lay-search="">
+                </select>
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label layui-form-required">瀹㈡埛缂栧彿:</label>
             <div class="layui-input-block">
-                <input id="customerTypeId" name="customerTypeId" placeholder="璇疯緭鍏ュ鎴风紪鍙�" class="layui-input" lay-verify="required" autocomplete="off">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label layui-form-required">瀹㈡埛缂栧彿:</label>
-            <div class="layui-input-block">
-                <input id="customerTypeId" name="customerTypeId" placeholder="璇疯緭鍏ュ鎴风紪鍙�" class="layui-input" lay-verify="required" autocomplete="off">
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label layui-form-required">瀹㈡埛缂栧彿:</label>
-            <div class="layui-input-block">
-                <input id="customerTypeId" name="customerTypeId" placeholder="璇疯緭鍏ュ鎴风紪鍙�" class="layui-input" lay-verify="required" autocomplete="off">
+                <select id="cstmr" name="cstmr" lay-verType="tips" lay-verify="required" required lay-search="">
+                </select>
             </div>
         </div>
         <div class="layui-form-item cool-button-contain">
@@ -188,5 +191,23 @@
     </div>
 </div>
 </body>
+<script type="text/html" id="docTypeSelectTpl">
+    <option value="">璇烽�夋嫨鍗曟嵁绫诲瀷</option>
+    {{#each data}}
+    <option value="{{this.docId}}">{{this.docName}}</option>
+    {{/each}}
+</script>
+<script type="text/html" id="itemSelectTpl">
+    <option value="">璇烽�夋嫨椤圭洰</option>
+    {{#each data}}
+    <option value="{{this.id}}">{{this.name}}</option>
+    {{/each}}
+</script>
+<script type="text/html" id="cstmrSelectTpl">
+    <option value="">璇烽�夋嫨瀹㈡埛</option>
+    {{#each data}}
+    <option value="{{this.id}}">{{this.name}}</option>
+    {{/each}}
+</script>
 </html>
 

--
Gitblit v1.9.1