From cf850c5d93b6b1dcfcd6da06faeb3ea7e093ad91 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Aug 2023 17:55:47 +0800
Subject: [PATCH] jufu商城
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 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 4921816..6e605f1 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -7,11 +7,17 @@
<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="accountLogin" 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="name" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<label class="layui-form-label">商品信息：</label>
<div class="layui-input-inline">
@@ -100,8 +106,9 @@
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderDetail:view" lay-event="seeOrder">详情</button>
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="orderMoneyFlow">资金流水</button>
{{# } else if(d.status === 7) { }}
- <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderDetail:view" lay-event="seeOrder">详情</button>
- <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="orderMoneyFlow">资金流水</button>
+<!-- <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderDetail:view" lay-event="seeOrder">详情</button>-->
+<!-- <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="orderMoneyFlow">资金流水</button>-->
+ <button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="delOrder">删除</button>
{{# } else { }}
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderDetail:view" lay-event="seeOrder">详情</button>
<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" shiro:hasPermission="orderMoneyFlow:update" lay-event="orderMoneyFlow">资金流水</button>
@@ -116,10 +123,11 @@
</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>
- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverDone">导出已发货订单</button>
- <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain">自定义打印</button>
+ <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" lay-event="exportDeliver">导出未发货订单</button>
+ <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" id="importDeliver" lay-event="importDeliver">导入发货</button>
+ <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" lay-event="exportDeliverDone">导出已发货订单</button>
+ <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view">自定义打印</button>
+ <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" shiro:hasPermission="orderDetail:view" lay-event="exportDeliverAll">导出全部订单</button>
</div>
</script>
<!-- 表格操作栏 end -->
@@ -164,6 +172,10 @@
if (event == 'exportDeliver') {
window.location.href = ctx + "admin/order/exportOrderList?orderType=1&status=2";
+ }
+
+ if (event == 'exportDeliverAll') {
+ window.location.href = ctx + "admin/order/exportOrderListAll?orderType=1&status=0";
}
if (event == 'exportDeliverDone') {
@@ -286,9 +298,10 @@
cols: [[
{type: 'checkbox',fixed: '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: 'accountLogin', title: '登录账户', minWidth: 120,align:'left'},
+ // {field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
+ {field: 'memberPhone', title: '手机号码', minWidth: 120,align:'left'},
+ // {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'goodsName', title: '商品信息', minWidth: 200,align:'left'},
{field: 'remark', title: '备注', minWidth: 200,align:'left'},
{field: 'amount', title: '订单金额', minWidth: 120,align:'left',totalRow: '{{= parseInt(d.amount) }}'},
@@ -365,7 +378,8 @@
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(),
+ accountLogin: $searchForm.find('input[name="accountLogin"]').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(),
--
Gitblit v1.9.1