~jiangyouyao/beauty-erp.git

			@@ -13,120 +13,113 @@
			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="2" name="orderStatus" id="orderStatus"/>
			<div class="form-group mr-20">
			<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 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>
			<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 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> 重置
			</button>
			<!--<button type="reset" class="btn btn-info " onclick="applyMoney()">
			<i class="fa fa-bank "></i> 申请提现
			</button>-->
			</div>
			</form>
			</div>

			<div class="row">
			@@ -137,18 +130,17 @@
			<th data-checkbox="true"></th>
			<th data-formatter="MGrid.indexfn" data-align="center" data-width="30px">序号</th>
			<th data-align="center" data-width="195px" data-field="id" data-formatter="buidOperate">操作</th>
			<th data-field="userName">客户姓名</th>
			<th data-field="userTel">客户电话</th>
			<th data-field="storeName">店铺名称</th>
			<th data-field="userName">客户</th>
			<th data-field="details" data-formatter="buildDetails">购买商品</th>
			<th data-field="deliveryInfo.receiveAddress" data-formatter="buildLogistics">收货信息</th>
			<th data-field="orderStatus" data-formatter="buildOrderStatus">订单状态</th>
			<th data-field="deliveryInfo.waybillNo" data-formatter="buildDelivery">物流信息</th>
			<th data-field="orderTime" data-formatter="MGrid.getTime">下单时间</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="orderNo">订单编号</th>
			<th data-field="applyStatus" data-formatter="applyStatusFormatter">是否已提现</th>
			<th data-field="shippingMethod" data-formatter="buildShippingMethod" >配送方式</th>
			<th data-field="storeName">店铺名称</th>
			</tr>
			</thead>
			</table>
			@@ -172,6 +164,26 @@

			});

			$(".btn-my").click(function () {
			var btnValue = $(this).val();
			$("#orderStatus").val(btnValue);
			myGrid.serchData();
			/* $("#state").val(""); */
			$(".btn-my").removeClass("active");
			$(this).addClass("active");
			});

			function importLogisticsInfo() {
			layer.open({
			type: 2,
			title: "导入快递单",
			area: [MUI.SIZE_L, '400px'],
			content : [ basePath+'/admin/redirect/shop/logisticsImport-form']
			});
			}



			function exportExcel() {
			var userName = $('input[name=userName]').val();
			if (typeof userName == 'undefined') {
			@@ -191,7 +203,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 +213,25 @@
			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;
			}

			// 发货信息
			function buildLogistics(value, row, index) {
			return (row.userName==null?"":row.userName)+" <br/>"+ (row.userTel==null?"":row.userTel) +" <br/>"+value ;
			}
			// 物流信息
			function buildDelivery(value, row, index) {
			return (row.deliveryInfo.logisticsCompanyCode==null?"":"快递编码："+row.deliveryInfo.logisticsCompanyCode)
			+" <br/>"+ (row.deliveryInfo.logisticsCompany==null?"":"快递名称："+row.deliveryInfo.logisticsCompany)
			+" <br/>"+(value==null?"":"快递单号："+value) ;
			}


			@@ -227,6 +258,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] = "";

			@@ -237,11 +278,16 @@
			+ '操作 <span class="caret"></span>' + '</button>'
			+ '<ul class="dropdown-menu" role="menu">'
			+ btns[0].replace('VALUE', value)
			if (row.deliveryInfo.waybillNo != null && typeof row.deliveryInfo.waybillNo != 'undefined' && row.deliveryInfo.waybillNo != '') {
			html += btns[3].replace('orderId',row.id).replace('waybillNo',row.deliveryInfo.waybillNo);
			}
			if (row.orderStatus == 2) {
			html += btns[1].replace('VALUE', value)
			html += btns[1].replace('VALUE', value);
			html += btns[4].replace('orderId',row.id);
			}
			if (row.orderStatus == 3) {
			html += btns[2].replace('VALUE', value)
			html += btns[2].replace('VALUE', value);
			html += btns[4].replace('orderId',row.id);
			}
			html += '</ul>' + '</div>';
			return html;
			@@ -258,6 +304,40 @@
			content: [basePath + '/admin/shopOrder/editForm?id=' + id]
			})
			)
			}

			/**
			* 查看物流信息
			* @param id
			*/
			function showLogisticsInfo(orderId,waybillNo){
			if(waybillNo == '' \|\| waybillNo == null){
			layer.msg("订单还未发货，暂无物流信息", {
			icon : 2,
			time : 2000
			});
			return false;
			}
			layer.open({
			type : 2,
			title : "查看物流信息",
			area : [ MUI.SIZE_L, '500px' ],
			maxmin : true,
			content : [ basePath+'/admin/redirect/shop/shopLogisticsInfo-list?orderId=' + orderId]
			});
			}
			/**
			* 编辑物流信息
			* @param id
			*/
			function editDeliveryInfo(orderId){
			layer.open({
			type : 2,
			title : "编辑物流信息",
			area : [ MUI.SIZE_L, '500px' ],
			maxmin : true,
			content : [ basePath + '/admin/shopDeliveryInfo/editDeliveryInfoForm?orderId=' + orderId]
			});
			}

			//修改订单为发货
			@@ -334,6 +414,8 @@
			btns[0] = '<li><a href="javascript:void(0)" onClick="openEdit(\'VALUE\')" title="编辑">编辑</a></li>'
			btns[1] = '<li><a href="javascript:void(0)" onClick="openSendPackage(\'VALUE\')" title="开始发货">开始发货</a></li>'
			btns[2] = '<li><a href="javascript:void(0)" onClick="openSendPackageOver(\'VALUE\')" title="配送完成">配送完成</a></li>'
			btns[3] = '<li><a href="javascript:void(0)" onclick="showLogisticsInfo(\'orderId\',\'waybillNo\')" title="查看物流">查看物流</a></li>'
			btns[4] = '<li><a href="javascript:void(0)" onclick="editDeliveryInfo(\'orderId\')" title="编辑快递">编辑快递</a></li>'

			</script>