From c5f009b990f649fdbcd004305d49736fd41f3a22 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 13 Apr 2021 19:22:19 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html | 234 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 126 insertions(+), 108 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html b/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html
index 29e3350..4dcba3f 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/shopOrder-list.html
@@ -13,120 +13,108 @@
th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
<script type="text/javascript"
th:src="@{/js/systools/MBase.js}"></script>
+ <style type="text/css">
+
+ .btn-my {
+ background-color: #f8ac59;
+ border-color: #f8ac59;
+ color: #fff
+ }
+
+ .btn-my:hover {
+ background-color: #FFD19F;
+ border-color: #FFD19F;
+ color: #fff
+ }
+
+ .btn-my:focus {
+ outline: 0 !important;
+ }
+
+ .btn-my.active {
+ background-color: rgb(185, 136, 85);
+ border-color: rgb(185, 136, 85);
+ color: #fff;
+ outline: 0;
+ }
+
+ </style>
+
+
</head>
<body class=" container-fluid">
<div class="pd-10">
<!-- 搜索框部分start -->
+ <!-- 搜索框部分start -->
<div class="row form-head">
- <div class="col-md-2 col-xs-12">
- <!-- 功能按钮部分 -->
- <div class="">
- <!--<button onclick="myGrid.delItems('id')" type="button"-->
- <!--class="btn btn-danger btn-sm">-->
- <!--<i class="fa fa-trash"></i>批量删除-->
- <!--</button>-->
- </div>
- </div>
- <div class="col-md-10 col-xs-12">
- <div class="row">
- <div class="col-md-11" style="text-align: right">
- <form class="form-inline" id="serchform">
- <div class="input-group">
- <div class="btn-group search-list " data-for="search-text">
- <button type="button"
- class="btn btn-default dropdown-toggle searchlist"
- data-toggle="dropdown">
- 用户姓名 <span class="caret "></span>
- </button>
- <ul class="dropdown-menu" role="menu">
- <li data-field="userName"><a>用户姓名</a></li>
- <li data-field="userTel"><a>用户电话 </a></li>
- <li data-field="orderNo"><a>订单号 </a></li>
- <li data-field="storeName"><a>门店名称 </a></li>
- </ul>
- </div>
- <div class="form-group mr-20 ml-20">
- <input autocomplete="off" id="search-text" name="userName" placeholder="输入查询关键词"
- type="text" class="form-control">
- </div>
- <div class="form-group">
- <button onclick="myGrid.serchData(1)" type="button"
- class="btn btn-info">
- <i class="fa fa-search "></i> 搜索
- </button>
- <button onclick="exportExcel()" type="button"
- class="btn btn-info"
- matrix:btn="order-exportExcel">
- <i class="fa fa-search "></i> 导出EXCEL
- </button>
- <button type="reset" class="btn btn-info ">
- <i class="fa fa-refresh "></i> 重置
- </button>
- <button type="reset" class="btn btn-info " onclick="applyMoney()">
- <i class="fa fa-bank "></i> 申请提现
- </button>
- </div>
- </div>
- <!-- 高级搜索 -->
- <div class="senior-content">
- <!-- <div><a class="serch-close closestyle">×</a></div> -->
- <div class="serch-headline">高级搜索</div>
- <div>
- <div style="margin-bottom: 20px!important;">
- <div class="col-sm-6" style="text-align: right!important;">
- <label class="col-sm-12 control-label">
- 开始日期：
- </label>
- </div>
- <div class="col-sm-6">
- <input autocomplete="off" name="orderBeginTime" readonly="readonly"
- type="text" class="form-control datetimepicker" style="width: 98%">
- </div>
- </div>
- <div style="margin-bottom: 20px!important;">
- <div class="col-sm-6" style="text-align: right!important;">
- <label class="col-sm-12 control-label">
- 结束日期：
- </label>
- </div>
- <div class="col-sm-6">
- <input autocomplete="off" name="orderEndTime" readonly="readonly"
- type="text" class="form-control datetimepicker" style="width: 98%">
- </div>
- </div>
+ <!-- ------------搜索服务单开始---------------- -->
+ <form class="form-inline" id="serchform">
- <div style="margin-bottom: 20px!important;">
- <div class="col-sm-6" style="text-align: right!important;">
- <label class="col-sm-12 control-label">
- 订单状态：
- </label>
- </div>
- <div class="col-sm-6">
- <select class="form-control autoFull select2" dataType="*"
- th:data-url="@{/admin/shopOrder/getOrderStatusSelectValue}"
- data-value="code"
- data-filed="name" name="orderStatus" style="width: 98%">
- <option value=''>请选择</option>
- </select>
- </div>
- </div>
- </div>
- <div class="button col-sm-12">
- <button type="button" class="btn btn-sm btn-info mr20" onclick="myGrid.serchData()">确认
- </button>
- <button type="button" class="btn btn-warning serch-close">取消</button>
- </div>
- </div>
- </form>
- </div>
- <div class="col-md-1 text-r layui-anim" data-anim="layui-anim-up">
- <a class="senior-serch">高级搜索</a>
+ <div class="form-group mr-20">
+ <div class="btn-group search-list " data-for="search-text">
+ <button type="button"
+ class="btn btn-default dropdown-toggle searchlist"
+ data-toggle="dropdown">
+ 用户姓名 <span class="caret "></span>
+ </button>
+ <ul class="dropdown-menu" role="menu">
+ <li data-field="userName"><a>用户姓名</a></li>
+ <li data-field="userTel"><a>用户电话 </a></li>
+ <li data-field="orderNo"><a>订单号 </a></li>
+ <li data-field="storeName"><a>门店名称 </a></li>
+ </ul>
</div>
</div>
- </div>
+ <div class="form-group mr-20">
+ <input autocomplete="off" id="search-text" name="userName" placeholder="输入查询关键词"
+ type="text" class="form-control">
+ </div>
+
+ <div class="form-group mr-20">
+ <label>开始日期：</label>
+ <input autocomplete="off" name="orderBeginTime" type="text"
+ class="form-control datetimepicker" id="orderBeginTime">
+ </div>
+ <div class="form-group mr-20">
+ <label>结束日期：</label>
+ <input autocomplete="off" name="orderEndTime" type="text"
+ class="form-control datetimepicker" id="orderEndTime">
+ </div>
+
+ <input type="hidden" value="" name="orderStatus" id="orderStatus"/>
+ <div class="form-group mr-20">
+ <button type="button" class="btn btn-my btn-sm active" id="btn0" value="">全部</button>
+ <button type="button" class="btn btn-my btn-sm" id="btn1" value="1">待付款</button>
+ <button type="button" class="btn btn-my btn-sm" id="btn2" value="2">待配送</button>
+ <button type="button" class="btn btn-my btn-sm" id="btn3" value="3">待收货</button>
+ <button type="button" class="btn btn-my btn-sm" id="btn4" value="4">待评价</button>
+ <button type="button" class="btn btn-my btn-sm" id="btn5" value="5">已评价</button>
+ <button type="button" class="btn btn-my btn-sm" id="btn6" value="6">申请退款</button>
+ <button type="button" class="btn btn-my btn-sm" id="btn7" value="7">退款成功</button>
+ <button type="button" class="btn btn-my btn-sm" id="btn8" value="8">退款拒绝</button>
+ <button type="button" class="btn btn-my btn-sm" id="btn9" value="9">已取消</button>
+ </div>
+ <div class="form-group mr-20">
+ <button onclick="myGrid.serchData(1)" type="button"
+ class="btn btn-info">
+ <i class="fa fa-search "></i> 搜索
+ </button>
+ <button onclick="exportExcel()" type="button"
+ class="btn btn-info"
+ matrix:btn="order-exportExcel">
+ <i class="fa fa-search "></i> 导出EXCEL
+ </button>
+ <button type="reset" class="btn btn-info ">
+ <i class="fa fa-refresh "></i> 重置
+ </button>
+ <!--<button type="reset" class="btn btn-info " onclick="applyMoney()">
+ <i class="fa fa-bank "></i> 申请提现
+ </button>-->
+ </div>
+ </form>
</div>
<div class="row">
@@ -142,13 +130,14 @@
<th data-field="storeName">店铺名称</th>
<th data-field="orderStatus" data-formatter="buildOrderStatus">订单状态</th>
<th data-field="orderTime" data-formatter="MGrid.getTime">下单时间</th>
- <th data-field="purchaseQuantity">购买件数</th>
+ <th data-field="details" data-formatter="buildDetails">购买商品</th>
+ <!--<th data-field="purchaseQuantity">购买件数</th>-->
<th data-field="orderMoney">订单金额</th>
<th data-field="discountAmount">优惠总金额</th>
- <th data-field="shippingMethod" >配送方式</th>
- <th data-field="orderType" data-formatter="orderTypeFormatter">订单类型</th>
+ <th data-field="shippingMethod" data-formatter="buildShippingMethod" >配送方式</th>
+ <!--<th data-field="orderType" data-formatter="orderTypeFormatter">订单类型</th>-->
<th data-field="orderNo">订单编号</th>
- <th data-field="applyStatus" data-formatter="applyStatusFormatter">是否已提现</th>
+ <!--<th data-field="applyStatus" data-formatter="applyStatusFormatter">是否已提现</th>-->
</tr>
</thead>
</table>
@@ -172,6 +161,17 @@
});
+ $(".btn-my").click(function () {
+ var btnValue = $(this).val();
+ $("#orderStatus").val(btnValue);
+ myGrid.serchData();
+ /* $("#state").val(""); */
+ $(".btn-my").removeClass("active");
+ $(this).addClass("active");
+ });
+
+
+
function exportExcel() {
var userName = $('input[name=userName]').val();
if (typeof userName == 'undefined') {
@@ -191,7 +191,7 @@
}
var orderBeginTime = $('input[name=orderBeginTime]').val();
var orderEndTime = $('input[name=orderEndTime]').val();
- var orderStatus = $('select[name=orderStatus]').val();
+ var orderStatus = $('input[name=orderStatus]').val();
var url = basePath + "/admin/shopOrder/exportOrderExcel";
url += "?userName=" + userName;
url += "&orderNo=" + orderNo;
@@ -201,6 +201,14 @@
url += "&userTel=" + userTel;
url += "&storeName=" + storeName;
window.open(url);
+ }
+
+ function buildDetails(value, row, index) {
+ var details = "";
+ for(var i= 0;i<value.length;i++){
+ details = details +value[i].shopProduct.title+ "("+value[i].shopSku.name+ ")*"+value[i].count+";";
+ }
+ return details;
}
@@ -227,6 +235,16 @@
return "";
}
+ function buildShippingMethod(value, row, index) {
+ if (value == 1) {
+ return "物流配送";
+ } else if (value == 2) {
+ return "<lable class='label label-warning' >门店自取</lable>";
+ }else {
+ return "-";
+ }
+ }
+
var btns = [];
btns[0] = "", btns[1] = "", btns[2] = "";
--
Gitblit v1.9.1