From 7ecd2c9bb7b1a77fd2d55a59b2ce85c9ddb26ee7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 13 Oct 2023 11:11:06 +0800
Subject: [PATCH] redbagprod

---
 src/main/resources/templates/febs/views/modules/score/orderList.html |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/score/orderList.html b/src/main/resources/templates/febs/views/modules/score/orderList.html
index 6c7918b..1241ac6 100644
--- a/src/main/resources/templates/febs/views/modules/score/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/score/orderList.html
@@ -7,13 +7,15 @@
                         <div class="layui-form-item">
                             <div class="layui-col-md10">
                                 <div class="layui-inline">
+                                    <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="orderNo" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
+                                    <label class="layui-form-label">购买人:</label>
                                     <div class="layui-input-inline">
-                                        <input type="text" placeholder="订单编号" name="orderNo" autocomplete="off" class="layui-input">
+                                        <input type="text" placeholder="购买人" name="name" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -69,6 +71,12 @@
     <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">
+    <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>
+    </div>
+</script>
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
     // 引入组件并初始化
@@ -89,6 +97,14 @@
 
         // 表格初始化
         initTable();
+
+        table.on('toolbar(orderTable)', function(obj){
+            var event = obj.event;
+
+            if (event == 'exportDeliver') {
+                window.location.href = ctx + "admin/order/exportOrderList?orderType=2&status=2";
+            }
+        });
 
         // 初始化表格操作栏各个按钮功能
         table.on('tool(orderTable)', function (obj) {
@@ -161,12 +177,14 @@
                 elem: $view.find('table'),
                 id: 'orderTable',
                 url: ctx + 'admin/order/orderList?orderType=2',
+                defaultToolbar: [],
+                toolbar: '#tableToolBar',
                 cols: [[
                         {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
                         {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: 'amount', title: 'H金劵', minWidth: 120,align:'left'},
                         {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
                         {field: 'payTime', title: '支付时间', minWidth: 200,align:'left'},
                         {field: 'status', title: '状态',

--
Gitblit v1.9.1