xc-mall.git - Gitblit

			@@ -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();
			@@ -319,9 +321,22 @@
			layEvent = obj.event;
			if (layEvent === 'deliverGoods') {
			febs.modal.open('发货', 'modules/order/deliverGoods/' + data.id, {
			btn: ['确认', '取消'],
			btn: ['确认','取消'],
			yes: function (index, layero) {
			$('#deliver-update').find('#submit').trigger('click');
			// $query.click();
			},
			btn2: function () {
			layer.closeAll();
			}
			});
			}
			if (layEvent === 'updateDeliver') {
			febs.modal.open('修改物流信息', 'modules/order/deliverGoods/' + data.id, {
			btn: ['确认','取消'],
			yes: function (index, layero) {
			$('#deliver-update').find('#deliverInfoSubmit').trigger('click');
			// $query.click();
			},
			btn2: function () {
			layer.closeAll();
			@@ -386,16 +401,18 @@
			url: ctx + 'admin/order/orderList?orderType=1',
			// defaultToolbar: [],
			//系统自带打印导出
			totalRow : true,
			toolbar: '#tableToolBarOrder',
			cols: [[
			{type: 'checkbox', fixed: 'left'},
			{field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
			{field: 'orderNo', title: '订单编号', minWidth: 200,align:'left' ,totalRowText:"合计"},
			{field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
			{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
			{field: 'goodsName', 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'},
			{field: 'remark', title: '备注', minWidth: 160,align:'left'},
			{field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
			{field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
			{field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true},
			{field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
			{field: 'status', title: '状态',
			templet: function (d) {
			@@ -437,6 +454,9 @@
			if(d.status === 2){
			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="deliverGoods" shiro:hasPermission="user:update">发货</button>'
			}else if(d.status === 3){
			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="updateDeliver" 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>'
			}
			@@ -513,7 +533,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%;}",
			".main div{width:100%;display:inline-block;}", "</style>", "</head>"
			].join("");
			var contentHtml = "";
			@@ -521,12 +541,12 @@
			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>商品：" + data.goodsName + "</div><br><br>" +
			"<div style='text-align: center;font-size: 10px;font-weight: bold;margin-bottom: 10px'>订单编号：" + data.orderNo + "</div>" +
			"<span style='font-size: 10px;font-weight: bold;'>收货人：</span><span>" + data.name + "，</span>" +
			"<span style='font-size: 10px;font-weight: bold;'>电话：</span><span>" + data.phone + "，</span>" +
			"<span style='font-size: 10px;font-weight: bold;'>地址：</span><span>" + data.address + "</span><br>" +
			"<span style='font-size: 10px;font-weight: bold;'>商品：</span><span>" + data.goodsName + "</span><br>" +
			"<span style='font-size: 10px;font-weight: bold;'>备注：</span><span>" + data.remark + "</span><br>" +
			"</div>"

			contentHtml += template;