From ee0fc4d9b4412cc1c0365b8ac7dd43b78f98a038 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 13 Apr 2021 19:56:40 +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 | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 4dcba3f..7d02c7a 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
@@ -84,11 +84,11 @@
class="form-control datetimepicker" id="orderEndTime">
</div>
- <input type="hidden" value="" name="orderStatus" id="orderStatus"/>
+ <input type="hidden" value="2" 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="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 active" 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>
@@ -106,6 +106,11 @@
class="btn btn-info"
matrix:btn="order-exportExcel">
<i class="fa fa-search "></i> 导出EXCEL
+ </button>
+ <button onclick="importLogisticsInfo()" type="button"
+ class="btn btn-info"
+ matrix:btn="order-exportExcel">
+ <i class="fa fa-search "></i> 导入快递单
</button>
<button type="reset" class="btn btn-info ">
<i class="fa fa-refresh "></i> 重置
@@ -170,6 +175,15 @@
$(this).addClass("active");
});
+ function importLogisticsInfo() {
+ layer.open({
+ type: 2,
+ title: "导入快递单",
+ area: [MUI.SIZE_L, '400px'],
+ content : [ basePath+'/admin/redirect/shop/logisticsImport-form']
+ });
+ }
+
function exportExcel() {
--
Gitblit v1.9.1