From 4eb7bd043cc1fe6bf0cdf44f8c045698c0e9e21b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 20 Jan 2025 11:34:01 +0800
Subject: [PATCH] refactor(mall): 确认收货功能
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 e4791c1..c1f94d5 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -125,8 +125,8 @@
<button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="printSelect">自定义打印</button>
<button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="goodsStatistics">统计商品份数</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" lay-event="exportDeliverTwo">导出未发货订单（快递）</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="exportDeliverTwo">导出未发货订单</button>
+<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button>-->
</div>
</script>
<!-- 表格操作栏 end -->
@@ -195,17 +195,20 @@
printSelect(checkStatus.data)
}
}
+ let statisticIds = 0;
if(event === 'goodsStatistics'){
var data = checkStatus.data;
let statistics = 0;
for(let i = 0;i < data.length;i++){
statistics = statistics+ "," + data[i].id;
}
+ console.log(statistics);
if(statistics == null || statistics == ""){
febs.alert.warn('请选择需要统计的订单');
return;
}
- let statisticIds = statistics;
+ statisticIds = statistics;
+ console.log(statisticIds);
febs.modal.open( '商品数量统计', 'modules/order/goodsStatistics/'+statisticIds, {
maxmin: true,
});
@@ -332,7 +335,7 @@
});
}
if (layEvent === 'updateDeliver') {
- febs.modal.open('修改物流信息', 'modules/order/deliverGoods/' + data.id, {
+ febs.modal.open('确认收货', 'modules/order/deliverGoods/' + data.id, {
btn: ['确认','取消'],
yes: function (index, layero) {
$('#deliver-update').find('#deliverInfoSubmit').trigger('click');
@@ -408,10 +411,11 @@
{field: 'orderNo', title: '订单编号', minWidth: 200,align:'left' ,totalRowText:"合计"},
{field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
+ // {field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'goodsName', title: '商品', minWidth: 160,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: '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: '状态',
@@ -446,7 +450,7 @@
// return ''
// }
// }, minWidth: 80,align:'center'},
- {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
+ // {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
{field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
// {field: 'wxOrderNo', title: '支付订单号', minWidth: 120,align:'left'},
{title: '操作',
@@ -456,7 +460,7 @@
+'<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>'
+ +'<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>'
}
--
Gitblit v1.9.1