From c7ad20b2170aa3e30e271c2f3031c28a8deb3bf6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 17 Aug 2022 15:34:05 +0800
Subject: [PATCH] 20220810

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index dd32e2f..f2da7d7 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -162,7 +162,11 @@
                     febs.alert.warn('请选择团长');
                     return;
                 }
-                window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
+                febs.get(ctx + 'admin/order/confirmOrder?takeUniqueCode='+uniqueCodeValue+'&orderIds='+ids, null, function () {
+                    febs.alert.success('操作成功');
+                    $query.click();
+                });
+                // window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
             }
             if (event == 'exportDeliverOne') {
                 let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
@@ -191,17 +195,6 @@
         table.on('tool(orderTable)', function (obj) {
             var data = obj.data,
                 layEvent = obj.event;
-            // if (layEvent === 'deliverGoods') {
-            //     febs.modal.open('发货', 'modules/order/deliverGoods/' + data.id, {
-            //         btn: ['确认', '取消'],
-            //         yes: function (index, layero) {
-            //             $('#deliver-update').find('#submit').trigger('click');
-            //         },
-            //         btn2: function () {
-            //             layer.closeAll();
-            //         }
-            //     });
-            // }
             if (layEvent === 'deliverGoods') {
                 febs.modal.open('发货', 'modules/order/deliverGoods/' + data.id, {
                     btn: ['确认', '取消'],

--
Gitblit v1.9.1