From 04f031ac6a0b3ae0551fc0173868a7f3cc57f921 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 四月 2022 16:28:54 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index ea2b065..d9f86e2 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -253,6 +253,20 @@
         }
     }
 
+    @RequestMapping(value = "/order/update/auth")
+    @ManagerAuth
+    public R update(Order order){
+        if (Cools.isEmpty(order) || null == order.getId()){
+            return R.error();
+        }
+        order.setUpdateBy(getUserId());
+        order.setUpdateTime(new Date());
+        if (!orderService.updateById(order)) {
+            throw new CoolException("淇敼璁㈠崟澶辫触");
+        }
+        return R.ok();
+    }
+
     @RequestMapping(value = "/order/delete/auth")
     @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
     @Transactional
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index d85f0c4..483f715 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -26,7 +26,7 @@
             {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
             {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl',  minWidth: 160, width: 160},
             {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
-            {align: 'center', title: '鎿嶄綔', toolbar: '#operate', minWidth: 130, width: 130}
+            {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
         ]],
         request: {
             pageName: 'curr',
@@ -69,6 +69,8 @@
             showEditModel(data);
         } else if (layEvent === 'del') {
             doDel(data.id);
+        } else if (layEvent === 'complete') {
+            doModify(data.id, 4);
         } else if (layEvent === 'look') {
             var $a = $(obj.tr).find('a[lay-event="look"]');
             var offset = $a.offset();
@@ -400,6 +402,43 @@
         });
     }
 
+    // 淇敼璁㈠崟鐘舵��
+    function doModify(orderId, settle) {
+        layer.confirm('纭畾瑕佹墜鍔ㄥ畬缁撳悧锛�', {
+            shade: .1,
+            skin: 'layui-layer-admin'
+        }, function (i) {
+            layer.close(i);
+            layer.load(2);
+            console.log(orderId);
+            console.log(settle);
+            $.ajax({
+                url: baseUrl+"/order/update/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {
+                    id: orderId,
+                    settle: settle
+                },
+                method: 'POST',
+                success: function (res) {
+                    layer.closeAll('loading');
+                    if (res.code === 200){
+                        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+"/";
+                    }else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
     layDate.render({
         elem: '.layui-laydate-range'
         ,type: 'datetime'
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 101cce5..41ed176 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -55,7 +55,12 @@
 </div>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="operate">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>
+    {{# if (d.settle == 1 || d.settle == 2) { }}
+        <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>
+        {{# if (d.settle == 2) { }}
+            <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs" lay-event="complete">瀹岀粨</a>
+        {{# } }}
+    {{# } }}
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
 </script>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->

--
Gitblit v1.9.1