From c52d9b49a54c5e31ed05d74b672954d1dbb648b1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 18:01:38 +0800
Subject: [PATCH] 20220902

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   67 ++++++++++++++++++++++++++++++++-
 1 files changed, 64 insertions(+), 3 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 b95c28e..b9f7828 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -13,6 +13,11 @@
                                 </div>
                                 <div class="layui-inline">
                                     <div class="layui-input-inline">
+                                        <input type="text" placeholder="商品名称" name="goodsName" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <div class="layui-input-inline">
                                         <input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
@@ -39,6 +44,20 @@
                                             <option value="1">成功</option>
                                             <option value="2">未成功</option>
                                         </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label layui-form-label-sm">开始时间</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" name="startTime" id="febs-form-group-date-start" lay-verify="date"
+                                               placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label layui-form-label-sm">结束时间</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" name="endTime" id="febs-form-group-date-end" lay-verify="date"
+                                               placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                             </div>
@@ -83,12 +102,13 @@
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliver">导出未发货订单</button>
         <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button>
+        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverDone">导出已发货订单</button>
     </div>
 </script>
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
     // 引入组件并初始化
-    layui.use([ 'jquery', 'form', 'table', 'febs', 'upload'], function () {
+    layui.use([ 'jquery', 'form', 'table', 'febs', 'upload','laydate'], function () {
         var $ = layui.jquery,
             febs = layui.febs,
             form = layui.form,
@@ -100,7 +120,17 @@
             $searchForm = $view.find('form'),
             $add = $view.find('#add'),
             sortObject = {field: 'phone', type: null},
+            laydate = layui.laydate,
             tableIns;
+
+        //日期范围
+        laydate.render({
+            elem: '#febs-form-group-date-start'
+        });
+
+        laydate.render({
+            elem: '#febs-form-group-date-end'
+        });
 
         form.render();
 
@@ -112,6 +142,10 @@
 
             if (event == 'exportDeliver') {
                 window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=2";
+            }
+
+            if (event == 'exportDeliverDone') {
+                window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=3";
             }
         });
 
@@ -149,6 +183,11 @@
                     cancelOrder(data.id);
                 });
             }
+            if (layEvent === 'delOrder') {
+                febs.modal.confirm('删除订单', '确认删除订单?', function () {
+                    delOrder(data.id);
+                });
+            }
             if (layEvent === 'seePayImage') {
                 var t = $view.find('#seePayImage'+data.id+'');
                 //页面层
@@ -168,6 +207,13 @@
 
         function cancelOrder(id) {
             febs.get(ctx + 'admin/order/cancelOrder/' + id, null, function () {
+                febs.alert.success('操作成功');
+                $query.click();
+            });
+        }
+
+        function delOrder(id) {
+            febs.get(ctx + 'admin/order/delOrder/' + id, null, function () {
                 febs.alert.success('操作成功');
                 $query.click();
             });
@@ -197,12 +243,15 @@
                 url: ctx + 'admin/order/orderList?orderType=1',
                 defaultToolbar: [],
                 toolbar: '#tableToolBar',
+                totalRow: true ,// 开启合计行
                 cols: [[
-                        {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
+                        {field: 'orderNo', title: '订单编号', minWidth: 120,align:'left', totalRowText: '合计:'},
                         {field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
                         {field: 'memberPhone', title: '账号', minWidth: 120,align:'left'},
                         {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
-                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
+                        {field: 'goodsName', title: '商品信息', minWidth: 200,align:'left'},
+                        {field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
+                        {field: 'carriage', title: '运费', minWidth: 120,align:'left'},
                         {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
                         {field: 'status', title: '状态',
                             templet: function (d) {
@@ -232,6 +281,9 @@
                                     if (d.status === 2) {
                                         return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
                                             +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+                                    }else if(d.status === 7){
+                                        return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+                                            +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="delOrder" shiro:hasPermission="user:update">删除</button>'
                                     }else{
                                         return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                     }
@@ -243,9 +295,18 @@
 
         // 获取查询参数
         function getQueryParams() {
+            let startTimestr = $searchForm.find('input[name="startTime"]').val().trim();
+            let endTimeStr = $searchForm.find('input[name="endTime"]').val().trim();
+            if(startTimestr != '' && endTimeStr != '' && startTimestr >= endTimeStr){
+                febs.alert.warn('开始时间需要小于结束时间');
+                return{};
+            }
             return {
+                startTime: $searchForm.find('input[name="startTime"]').val().trim(),
+                endTime: $searchForm.find('input[name="endTime"]').val().trim(),
                 name: $searchForm.find('input[name="name"]').val().trim(),
                 orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
+                goodsName: $searchForm.find('input[name="goodsName"]').val().trim(),
                 payResult: $searchForm.find("select[name='payResult']").val(),
                 status: $searchForm.find("select[name='status']").val(),
             };

--
Gitblit v1.9.1