From 5ad8b0705e74a6a6268bc0353847e7dce30f8bdd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 三月 2022 10:25:37 +0800
Subject: [PATCH] #杰克缝纫机立库 【生成/修改单据】 1

---
 src/main/java/com/zy/asrs/controller/OrderController.java |   10 ++++++++--
 src/main/webapp/static/js/order/order.js                  |   11 +++++------
 src/main/webapp/views/order/order.html                    |    2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 6dac0da..b65313a 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -52,13 +52,19 @@
         return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
     }
 
-    @RequestMapping(value = "/order/init/auth")
+    @RequestMapping(value = "/order/form/add/auth")
     @ManagerAuth
-    public R init(@RequestBody InitOrderParam param){
+    public R formAdd(@RequestBody InitOrderParam param){
         System.out.println(JSON.toJSONString(param));
         return R.ok();
     }
 
+    @RequestMapping(value = "/order/form/modify/auth")
+    @ManagerAuth
+    public R formModify(@RequestBody InitOrderParam param){
+        System.out.println(JSON.toJSONString(param));
+        return R.ok();
+    }
 
 
 
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index ccfb577..5cd8afc 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -75,7 +75,7 @@
             layer.open({
                 type: 1,
                 title: false,
-                area: '700px',
+                area: '750px',
                 offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                 shade: .01,
                 shadeClose: true,
@@ -144,7 +144,6 @@
             success: function (layero, dIndex) {
                 $(layero).children('.layui-layer-content').css('overflow', 'visible');
                 var isExpAdd = !expTpe;
-                console.log(expTpe)
                 // 鍥炴樉鏁版嵁
                 form.val('editForm', expTpe);
                 if (expTpe) {
@@ -152,8 +151,6 @@
                 }
                 // 琛ㄥ崟鎻愪氦浜嬩欢
                 form.on('submit(orderEditSubmit)', function (data) {
-                    console.log(data);
-                    return false;
                     // 缁勮鏁版嵁
                     if (xxDataList.length <= 0) {
                         layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
@@ -189,10 +186,12 @@
                     }
                     layer.load(2);
                     $.ajax({
-                        url: baseUrl+"/order/" + (isExpAdd?"add":"modify") + "/auth",
+                        url: baseUrl+"/order/form/" + (isExpAdd?"add":"modify") + "/auth",
                         headers: {'token': localStorage.getItem('token')},
                         data: JSON.stringify({
-
+                            docType: Number(data.field.docType),
+                            orderNo: data.field.orderNo,
+                            orderDetlList: nList
                         }),
                         contentType:'application/json;charset=UTF-8',
                         method: 'POST',
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index bd2c62d..154b231 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -77,7 +77,7 @@
             <label class="layui-form-label">鍗曟嵁绫诲瀷: </label>
             <div class="layui-input-block cool-auto-complete">
                 <input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
-                <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur()>
+                <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
                 <div class="cool-auto-complete-window">
                     <input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                     <select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">

--
Gitblit v1.9.1