From aa2885980b4b6aeb309aab9762a6220e903b498a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 24 Sep 2022 15:16:12 +0800
Subject: [PATCH] 20220902
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 100 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 83 insertions(+), 17 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 f2da7d7..4db20d2 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -42,10 +42,10 @@
<div class="layui-inline">
<label class="layui-form-label layui-form-label-sm">配送方式</label>
<div class="layui-input-inline">
- <select name="deliveryType">
+ <select name="isHome">
<option value="">请选择</option>
- <option value="1">自提</option>
- <option value="2">快递</option>
+ <option value="1">送货上门</option>
+ <option value="2">自提</option>
</select>
</div>
</div>
@@ -58,6 +58,20 @@
<option value="2">未成功</option>
</select>
</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="startTime" id="febs-form-group-date-start" lay-verify="date"
+ placeholder="yyyy-MM-dd" 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">
+ </div>
</div>
</div>
@@ -108,7 +122,7 @@
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
- layui.use([ 'jquery', 'form', 'table', 'febs', 'formSelects', 'upload'], function () {
+ layui.use([ 'jquery', 'form', 'table', 'febs', 'formSelects', 'upload','laydate'], function () {
var $ = layui.jquery,
febs = layui.febs,
form = layui.form,
@@ -121,7 +135,18 @@
$add = $view.find('#add'),
sortObject = {field: 'phone', type: null},
formSelects = layui.formSelects,
+ laydate = layui.laydate,
tableIns;
+
+ //日期范围
+ laydate.render({
+ elem: '#febs-form-group-date-start'
+ });
+
+ laydate.render({
+ elem: '#febs-form-group-date-end'
+ });
+
form.render();
@@ -146,20 +171,28 @@
var id = obj.config.id;
var checkStatus = table.checkStatus(id);
if(event === 'confirmOrder'){
+ let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
+ if(uniqueCodeValue == '' || uniqueCodeValue == null){
+ febs.alert.warn('请选择团长');
+ return;
+ }
var data = checkStatus.data;
let ids = "";
for(let i = 0;i < data.length;i++){
- ids = ids + data[i].id+","
+ if(data[i].status != 3){
+ febs.alert.warn('请选择待收货的订单');
+ return;
+ }else if(data[i].deliveryState != 2){
+ febs.alert.warn('请选择配送中的订单');
+ return;
+ }else{
+ ids = ids + data[i].id+",";
+ }
}
// layer.alert(layui.util.escape(JSON.stringify(data)));
console.log(ids);
if(ids == null || ids == ""){
febs.alert.warn('请选择确认到货的订单');
- return;
- }
- let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
- if(uniqueCodeValue == '' || uniqueCodeValue == null){
- febs.alert.warn('请选择团长');
return;
}
febs.get(ctx + 'admin/order/confirmOrder?takeUniqueCode='+uniqueCodeValue+'&orderIds='+ids, null, function () {
@@ -174,7 +207,31 @@
febs.alert.warn('请选择团长');
return;
}
- window.location.href = ctx + "admin/order/exportOrderListOne?orderType=1&status=2&deliveryType=1&takeUniqueCode="+uniqueCodeValue;
+ var data = checkStatus.data;
+ let ids = "";
+ for(let i = 0;i < data.length;i++){
+ if(data[i].status != 2){
+ febs.alert.warn('请选择待发货的订单');
+ return;
+ }else if(data[i].deliveryState != 1){
+ febs.alert.warn('请选择待配送的订单');
+ return;
+ }else{
+ ids = ids + data[i].id+",";
+ }
+ }
+ // layer.alert(layui.util.escape(JSON.stringify(data)));
+ console.log(ids);
+ if(ids == null || ids == ""){
+ febs.alert.warn('请选择待发货的订单');
+ return;
+ }
+ window.location.href = ctx + "admin/order/exportOrderListOne?orderType=1&status=2&deliveryType=1&takeUniqueCode="+uniqueCodeValue+'&orderIds='+ids;
+ febs.get(ctx + 'admin/order/deliverOrder?takeUniqueCode='+uniqueCodeValue+'&orderIds='+ids, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+
+ });
}
if (event == 'exportDeliverTwo') {
@@ -270,15 +327,16 @@
{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: 120,align:'left'},
{field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
- // {field: 'carriage', title: '运费', minWidth: 120,align:'left'},
+ {field: 'leaderName', title: '团长', minWidth: 120,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
- {field: 'deliveryType', title: '配送方式',
+ {field: 'isHome', title: '配送方式',
templet: function (d) {
- if (d.deliveryType === 1) {
+ if (d.isHome === 2) {
return '<span style="color:dodgerblue;">自提</span>'
- } else if (d.deliveryType === 2) {
- return '<span style="color:forestgreen;">快递</span>'
+ } else if (d.isHome === 1) {
+ return '<span style="color:forestgreen;">送货上门</span>'
}else{
return ''
}
@@ -328,12 +386,20 @@
// 获取查询参数
function getQueryParams() {
+ let startTimestr = $searchForm.find('input[name="startTime"]').val().trim();
+ let endTimeStr = $searchForm.find('input[name="endTime"]').val().trim();
+ if(startTimestr != '' && endTimeStr != '' && startTimestr >= endTimeStr){
+ febs.alert.warn('开始时间需要小于结束时间');
+ return{};
+ }
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(),
orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
payResult: $searchForm.find("select[name='payResult']").val(),
status: $searchForm.find("select[name='status']").val(),
- deliveryType: $searchForm.find("select[name='deliveryType']").val(),
+ isHome: $searchForm.find("select[name='isHome']").val(),
uniqueCode: $searchForm.find("select[name='uniqueCode']").val(),
};
}
--
Gitblit v1.9.1