From 92789b4fea27b7d2556a7c7c9cdca8250aa4f89d Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 02 Mar 2023 15:58:26 +0800 Subject: [PATCH] 增加活动公告 --- src/main/resources/templates/febs/views/modules/order/orderList.html | 28 ++++++++++++++++------------ 1 files changed, 16 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 ae54f9f..95b47e3 100644 --- a/src/main/resources/templates/febs/views/modules/order/orderList.html +++ b/src/main/resources/templates/febs/views/modules/order/orderList.html @@ -65,14 +65,14 @@ <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"> + placeholder="yyyy-MM-dd HH:mm:ss" 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"> + placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input"> </div> </div> </div> @@ -143,7 +143,7 @@ $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; @@ -153,11 +153,11 @@ currPageOrder = $view.find(".layui-laypage-em").next().html(); //日期范围 laydate.render({ - elem: '#febs-form-group-date-start' + elem: '#febs-form-group-date-start',type: 'datetime' }); laydate.render({ - elem: '#febs-form-group-date-end' + elem: '#febs-form-group-date-end',type: 'datetime' }); @@ -205,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(); @@ -393,6 +395,7 @@ {field: 'memberName', title: '购买人', minWidth: 100,align:'left'}, {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'}, {field: 'goodsName', title: '商品', minWidth: 160,align:'left'}, + {field: 'remark', title: '备注', minWidth: 160,align:'left'}, {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left'}, {field: 'carriage', title: '邮费', minWidth: 80,align:'left'}, {field: 'amount', title: '总金额', minWidth: 100,align:'left'}, @@ -513,7 +516,7 @@ //用于包含内容 var v = document.createElement("div"); //页面头部,导入css ,media="print"表示打印时使用该样式 - var f = ["<head>", "<style>", "div{font-size:8px;}", ".main{width:100%;height:20%}", + var f = ["<head>", "<style>", "div{font-size:8px;}", ".main{width:100%;height:10%}", ".main div{width:100%;display:inline-block;}", "</style>", "</head>" ].join(""); var contentHtml = ""; @@ -521,12 +524,13 @@ let data = allData[i] var template = "<div class='main'>" + - // "<div style='text-align: center;font-size: 22px;font-weight: bold;margin-bottom: 30px'>订单详情</div>" + - "<div>姓名:" + data.name + "</div><br><br>" + - "<div>电话:" + data.phone + "</div><br><br>" + - "<div>地址:" + data.address + "</div><br><br>" + - "<div>编号:" + data.orderNo + "</div><br><br>" + + "<div style='text-align: center;font-size: 10px;font-weight: bold;margin-bottom: 10px'>订单编号:" + data.orderNo + "</div>" + + "<div>收货人:" + data.name + ",电话:" + data.phone + ",地址:" + data.address + "</div><br><br>" + + // "<div>电话:" + data.phone + "</div><br><br>" + + // "<div>地址:" + data.address + "</div><br><br>" + + // "<div>编号:" + data.orderNo + "</div><br><br>" + "<div>商品:" + data.goodsName + "</div><br><br>" + + "<div>备注:" + data.remark + "</div><br><br>" + "</div>" contentHtml += template; -- Gitblit v1.9.1