From 945ab0817d60428288b2ae60378a9c117728cffa Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 29 三月 2022 10:54:39 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/order.js |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index ccfb577..76ac6e7 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -1,3 +1,4 @@
+var insTbCount = 0;
 layui.config({
     base: baseUrl + "/static/layui/lay/modules/"
 }).use(['layer', 'form', 'table', 'util', 'admin', 'xmSelect', 'laydate'], function () {
@@ -46,6 +47,7 @@
             if (res.code === 403) {
                 top.location.href = baseUrl+"/";
             }
+            insTbCount = count;
         }
     });
 
@@ -66,7 +68,7 @@
         if (layEvent === 'edit') {
             showEditModel(data);
         } else if (layEvent === 'del') {
-            doDel(data.billNo);
+            doDel(data.id);
         } else if (layEvent === 'look') {
             var $a = $(obj.tr).find('a[lay-event="look"]');
             var offset = $a.offset();
@@ -75,7 +77,7 @@
             layer.open({
                 type: 1,
                 title: false,
-                area: '700px',
+                area: '820px',
                 offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
                 shade: .01,
                 shadeClose: true,
@@ -97,6 +99,7 @@
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
                             {field: 'batch', title: '鎵瑰彿'},
                             {field: 'anfme', title: '鏁伴噺'},
+                            {field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
                             {field: 'unit', title: '鍗曚綅'},
                             // {
                             //     field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
@@ -144,7 +147,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 +154,6 @@
                 }
                 // 琛ㄥ崟鎻愪氦浜嬩欢
                 form.on('submit(orderEditSubmit)', function (data) {
-                    console.log(data);
-                    return false;
                     // 缁勮鏁版嵁
                     if (xxDataList.length <= 0) {
                         layer.tips('璇锋坊鍔犲崟鎹槑缁�', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
@@ -189,10 +189,13 @@
                     }
                     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({
-
+                            orderId: Number(data.field.id),
+                            docType: Number(data.field.docType),
+                            orderNo: data.field.orderNo,
+                            orderDetlList: nList
                         }),
                         contentType:'application/json;charset=UTF-8',
                         method: 'POST',
@@ -200,7 +203,7 @@
                             layer.closeAll('loading');
                             if (res.code === 200){
                                 layer.close(dIndex);
-                                insTb.reload({page: {curr: 1}});
+                                $(".layui-laypage-btn")[0].click();
                                 layer.msg(res.msg, {icon: 1});
                             } else if (res.code === 403){
                                 top.location.href = baseUrl+"/";
@@ -403,26 +406,28 @@
     }
 
     // 鍒犻櫎鍗曟嵁
-    function doDel(billNo) {
+    function doDel(orderId) {
         layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
             shade: .1,
             skin: 'layui-layer-admin'
         }, function (i) {
             layer.close(i);
             layer.load(2);
-
             $.ajax({
-                url: baseUrl+"/waitMatin/delete/auth",
+                url: baseUrl+"/order/delete/auth",
                 headers: {'token': localStorage.getItem('token')},
                 data: {
-                    billNo: billNo
+                    orderId: orderId
                 },
-                // contentType:'application/json;charset=UTF-8',
                 method: 'POST',
                 success: function (res) {
                     layer.closeAll('loading');
                     if (res.code === 200){
-                        insTb.reload({page: {curr: 1}});
+                        if (insTbCount === 0) {
+                            insTb.reload({page: {curr: 1}});
+                        } else {
+                            $(".layui-laypage-btn")[0].click();
+                        }
                         layer.msg(res.msg, {icon: 1});
                     } else if (res.code === 403){
                         top.location.href = baseUrl+"/";

--
Gitblit v1.9.1