From 0ef2ea54b85d11f537a761e2028a40ec1ec1df1b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Feb 2023 15:55:31 +0800
Subject: [PATCH] 订单发货设置
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 48 ++++++++++++++++++++----------------------------
1 files changed, 20 insertions(+), 28 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 8053601..b75c886 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -116,7 +116,7 @@
<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="exportDeliverOne">导出待发货订单,系统自动发货</button>-->
- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="confirmOrder">确认到货</button>
+<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="confirmOrder">确认到货</button>-->
<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>-->
@@ -207,7 +207,7 @@
// window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
}
if(event === 'confirmOrder'){
- let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
+ // let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
// if(uniqueCodeValue == '' || uniqueCodeValue == null){
// febs.alert.warn('请选择团长');
// return;
@@ -231,7 +231,7 @@
febs.alert.warn('请选择确认到货的订单');
return;
}
- febs.get(ctx + 'admin/order/confirmOrder?takeUniqueCode='+uniqueCodeValue+'&orderIds='+ids, null, function () {
+ febs.get(ctx + 'admin/order/confirmOrder?orderIds='+ids, null, function () {
febs.alert.success('操作成功');
$query.click();
});
@@ -300,6 +300,8 @@
,accept: 'file' //普通文件
,done: function(res){
console.log("123");
+ febs.alert.success('操作成功');
+ $query.click();
}
});
@@ -381,21 +383,11 @@
{field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
{field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
- // {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
- {field: 'amount', title: '订单金额', minWidth: 160,align:'left'},
- // {field: 'leaderName', title: '团长', minWidth: 120,align:'left'},
+ {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left'},
+ {field: 'carriage', title: '邮费', minWidth: 80,align:'left'},
+ {field: 'amount', title: '总金额', minWidth: 100,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
- // {field: 'isHome', title: '配送方式',
- // templet: function (d) {
- // if (d.isHome === 2) {
- // return '<span style="color:dodgerblue;">自提</span>'
- // } else if (d.isHome === 1) {
- // return '<span style="color:forestgreen;">送货上门</span>'
- // }else{
- // return ''
- // }
- // }, minWidth: 100,align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -416,18 +408,18 @@
return ''
}
}, minWidth: 80,align:'center'},
- {field: 'deliveryState', title: '配送状态',
- templet: function (d) {
- if (d.deliveryState === 1) {
- return '<span style="color:dodgerblue;">待配送</span>'
- } else if (d.deliveryState === 2) {
- return '<span style="color:forestgreen;">配送中</span>'
- } else if (d.deliveryState === 3) {
- return '<span style="color:forestgreen;">已送达</span>'
- }else{
- return ''
- }
- }, minWidth: 80,align:'center'},
+ // {field: 'deliveryState', title: '配送状态',
+ // templet: function (d) {
+ // if (d.deliveryState === 1) {
+ // return '<span style="color:dodgerblue;">待配送</span>'
+ // } else if (d.deliveryState === 2) {
+ // return '<span style="color:forestgreen;">配送中</span>'
+ // } else if (d.deliveryState === 3) {
+ // return '<span style="color:forestgreen;">已送达</span>'
+ // }else{
+ // return ''
+ // }
+ // }, minWidth: 80,align:'center'},
{field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
{field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
// {field: 'wxOrderNo', title: '支付订单号', minWidth: 120,align:'left'},
--
Gitblit v1.9.1