From 172f7410f5576a19b2380b5ec0da3de76ce37283 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Feb 2023 11:56:38 +0800
Subject: [PATCH] 商品单位

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 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 d257f3d..85bf849 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -7,9 +7,9 @@
                         <div class="layui-form-item">
                             <div class="layui-col-md10">
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">用户名：</label>
+                                    <label class="layui-form-label">购买人：</label>
                                     <div class="layui-input-inline">
-                                        <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+                                        <input type="text" placeholder="购买人" name="name" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -19,7 +19,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label layui-form-label-sm">订单状态</label>
+                                    <label class="layui-form-label layui-form-label-sm">状态</label>
                                     <div class="layui-input-inline">
                                         <select name="status">
                                             <option value="">请选择</option>
@@ -89,7 +89,7 @@
                     </form>
                     <table lay-filter="orderTable" lay-data="{id: 'orderTable'}"></table>
                     <style type="text/css">
-                        .layui-table-cell{
+                        .layui-table cell{
                             text-align:center;
                             height: auto;
                             white-space: nowrap; /*文本不会换行，在同一行显示*/
@@ -98,6 +98,11 @@
                         }
                         .layui-table img{
                             max-width:100px
+                        }
+
+                        ::-webkit-scrollbar {
+                            height: 20px !important;
+                            background-color: #f4f4f4;
                         }
                     </style>
                 </div>
@@ -113,7 +118,7 @@
     <a lay-event="edit" shiro:hasPermission="user:update"><i
             class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
 </script>
-<script type="text/html" id="tableToolBar">
+<script type="text/html" id="tableToolBarOrder">
     <div class="layui-btn-container">
 <!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverOne">导出待发货订单,系统自动发货</button>-->
 <!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="confirmOrder">确认到货</button>-->
@@ -138,11 +143,14 @@
             $reset = $view.find('#reset'),
             $searchForm = $view.find('form'),
             $add = $view.find('#add'),
-            sortObject = {field: 'phone', type: null},
+            sortObject = {field: 'orderTime', type: 'desc'},
             formSelects = layui.formSelects,
             laydate = layui.laydate,
             tableIns;
 
+        let currPageOrder = 1;//首先默认值为1，防止出错
+        //获取当前页
+        currPageOrder = $view.find(".layui-laypage-em").next().html();
         //日期范围
         laydate.render({
             elem: '#febs-form-group-date-start'
@@ -197,9 +205,11 @@
                     febs.alert.warn('请选择需要统计的订单');
                     return;
                 }
-                febs.modal.open( '商品数量统计', 'modules/order/goodsStatistics/'+statistics, {
+                let statisticIds = statistics;
+                febs.modal.open( '商品数量统计', 'modules/order/goodsStatistics/'+statisticIds, {
                     maxmin: true,
                 });
+                statistics = 0;
                 // febs.get(ctx + 'admin/order/goodsStatistics?orderIds='+ids, null, function () {
                 //     febs.alert.success('操作成功');
                 //     $query.click();
@@ -357,14 +367,14 @@
         // 查询按钮
         $query.on('click', function () {
             var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
-            tableIns.reload({where: params, page: {curr: 1}});
+            tableIns.reload({where: params, page: {curr: currPageOrder}});
         });
 
         // 刷新按钮
         $reset.on('click', function () {
             $searchForm[0].reset();
             sortObject.type = 'null';
-            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+            tableIns.reload({where: getQueryParams(), page: {curr: currPageOrder}, initSort: sortObject});
         });
 
         $add.on('click', function () {
@@ -378,7 +388,7 @@
                 url: ctx + 'admin/order/orderList?orderType=1',
                 // defaultToolbar: [],
                 //系统自带打印导出
-                toolbar: '#tableToolBar',
+                toolbar: '#tableToolBarOrder',
                 cols: [[
                         {type: 'checkbox', fixed: 'left'},
                         {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},

--
Gitblit v1.9.1