|
@@ -28,7 +28,7 @@
|
|
|
<body>
|
|
<body>
|
|
|
<nav class="breadcrumb">
|
|
<nav class="breadcrumb">
|
|
|
<i class="Hui-iconfont"></i> 首页 <span class="c-gray en">></span>
|
|
<i class="Hui-iconfont"></i> 首页 <span class="c-gray en">></span>
|
|
|
- 返利记录 <span class="c-gray en">></span> 返利记录列表 <a
|
|
|
|
|
|
|
+ 返利记录 <span class="c-gray en">></span> 收货记录列表 <a
|
|
|
class="btn btn-success radius r mr-20"
|
|
class="btn btn-success radius r mr-20"
|
|
|
style="line-height: 1.6em; margin-top: 3px"
|
|
style="line-height: 1.6em; margin-top: 3px"
|
|
|
href="javascript:location.replace(location.href);" title="刷新"><i
|
|
href="javascript:location.replace(location.href);" title="刷新"><i
|
|
@@ -41,17 +41,17 @@
|
|
|
</button>
|
|
</button>
|
|
|
<span class="select-box" style="width: 150px">
|
|
<span class="select-box" style="width: 150px">
|
|
|
<select id="rebackStatus" name="rebackStatus" class="select">
|
|
<select id="rebackStatus" name="rebackStatus" class="select">
|
|
|
- <option value="">返利状态</option>
|
|
|
|
|
- <option ${rebackStatus==1?'selected':'' } value="1">待返利</option>
|
|
|
|
|
- <option ${rebackStatus==2?'selected':'' } value="2">已返利，待打款</option>
|
|
|
|
|
- <option ${rebackStatus==3?'selected':'' } value="3">已返利，已打款</option>
|
|
|
|
|
|
|
+ <option value="">收货状态</option>
|
|
|
|
|
+ <option ${rebackStatus==1?'selected':'' } value="1">待收货</option>
|
|
|
|
|
+ <option ${rebackStatus==2?'selected':'' } value="2">已收货，待确认</option>
|
|
|
|
|
+ <option ${rebackStatus==3?'selected':'' } value="3">已收货，已确认</option>
|
|
|
<option ${rebackStatus==4?'selected':'' } value="4">已取消</option>
|
|
<option ${rebackStatus==4?'selected':'' } value="4">已取消</option>
|
|
|
</select>
|
|
</select>
|
|
|
</span>
|
|
</span>
|
|
|
<input name="salesOrderid" id="salesOrderid" value="${salesOrderid }" placeholder="订单编号" style="width: 150px" class="input-text" type="text">
|
|
<input name="salesOrderid" id="salesOrderid" value="${salesOrderid }" placeholder="订单编号" style="width: 150px" class="input-text" type="text">
|
|
|
创建时间： <input id="stateDates" value="<fmt:formatDate value="${stateDate}" pattern="yyyy-MM-dd"/>" name="stateDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'endDates\')||\'%y-%M-%d\'}'})" readonly>
|
|
创建时间： <input id="stateDates" value="<fmt:formatDate value="${stateDate}" pattern="yyyy-MM-dd"/>" name="stateDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'endDates\')||\'%y-%M-%d\'}'})" readonly>
|
|
|
- <input id="endDates" value="<fmt:formatDate value="${endDate}" pattern="yyyy-MM-dd"/>" name="endDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'stateDates\')||\'%y-%M-%d\'}'})" readonly>
|
|
- <input id="endDates" value="<fmt:formatDate value="${endDate}" pattern="yyyy-MM-dd"/>" name="endDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'stateDates\')||\'%y-%M-%d\'}'})" readonly>
|
|
|
- <button name="" id="submitBtn" class="btn btn-success" type="submit">
|
|
|
|
|
|
|
+ <button name="" id="submitBtn" class="btn btn-success" type="submit">
|
|
|
<i class="Hui-iconfont"></i> 搜索
|
|
<i class="Hui-iconfont"></i> 搜索
|
|
|
</button>
|
|
</button>
|
|
|
<input type="hidden" name="rebackChannelType" value="${rebackChannelType}">
|
|
<input type="hidden" name="rebackChannelType" value="${rebackChannelType}">
|
|
@@ -61,7 +61,7 @@
|
|
|
<table class="table table-border table-bordered table-bg">
|
|
<table class="table table-border table-bordered table-bg">
|
|
|
<thead>
|
|
<thead>
|
|
|
<tr>
|
|
<tr>
|
|
|
- <th scope="col" colspan="15">积分记录列表</th>
|
|
|
|
|
|
|
+ <th scope="col" colspan="15">收货记录列表</th>
|
|
|
</tr>
|
|
</tr>
|
|
|
<tr class="text-c">
|
|
<tr class="text-c">
|
|
|
<th width="50"></th>
|
|
<th width="50"></th>
|
|
@@ -74,8 +74,8 @@
|
|
|
<th width="100">是否自提</th>
|
|
<th width="100">是否自提</th>
|
|
|
<th width="100">购买人姓名</th>
|
|
<th width="100">购买人姓名</th>
|
|
|
<th width="100">购买人电话</th>
|
|
<th width="100">购买人电话</th>
|
|
|
- <th width="100">返利金额</th>
|
|
|
|
|
- <th width="100">返利状态</th>
|
|
|
|
|
|
|
+ <th width="100">成本统计</th>
|
|
|
|
|
+ <th width="100">收货状态</th>
|
|
|
<th width="100">返利日期</th>
|
|
<th width="100">返利日期</th>
|
|
|
<th width="120">创建日期</th>
|
|
<th width="120">创建日期</th>
|
|
|
<th width="100">操作</th>
|
|
<th width="100">操作</th>
|
|
@@ -105,19 +105,19 @@
|
|
|
<td>${infolist.salesAddressTel}</td>
|
|
<td>${infolist.salesAddressTel}</td>
|
|
|
|
|
|
|
|
<td>${infolist.rebackAmount/100}元</td>
|
|
<td>${infolist.rebackAmount/100}元</td>
|
|
|
- <td>${infolist.rebackStatus==1?'待返利':''}${infolist.rebackStatus==2?'已返利，待打款':''}${infolist.rebackStatus==3?'已返利，已打款':''}${infolist.rebackStatus==4?'已取消':''}</td>
|
|
|
|
|
|
|
+ <td>${infolist.rebackStatus==1?'待收货':''}${infolist.rebackStatus==2?'已收货，待确认':''}${infolist.rebackStatus==3?'已收货，已确认':''}${infolist.rebackStatus==4?'已取消':''}</td>
|
|
|
<td><fmt:formatDate value="${infolist.rebackTime}" pattern="yyyy-MM-dd"/></td>
|
|
<td><fmt:formatDate value="${infolist.rebackTime}" pattern="yyyy-MM-dd"/></td>
|
|
|
<td><fmt:formatDate value="${infolist.rebackCreateTime}" pattern="yyyy-MM-dd"/></td>
|
|
<td><fmt:formatDate value="${infolist.rebackCreateTime}" pattern="yyyy-MM-dd"/></td>
|
|
|
<td>
|
|
<td>
|
|
|
<c:if test="${infolist.rebackStatus == 2 }">
|
|
<c:if test="${infolist.rebackStatus == 2 }">
|
|
|
- <a onclick="update_status(${infolist.rebateId})">标记已打款</a>
|
|
|
|
|
|
|
+ <a onclick="update_status(${infolist.rebateId})">标记已收货</a>
|
|
|
</c:if>
|
|
</c:if>
|
|
|
</td>
|
|
</td>
|
|
|
</c:forEach>
|
|
</c:forEach>
|
|
|
</c:if>
|
|
</c:if>
|
|
|
<c:if test="${empty page.dataList}">
|
|
<c:if test="${empty page.dataList}">
|
|
|
- <tr align="center"><td colspan="15" style="text-align: center;">未查询到该类数据!</td></tr>
|
|
|
|
|
- </c:if>
|
|
|
|
|
|
|
+ <tr align="center"><td colspan="15" style="text-align: center;">未查询到该类数据!</td></tr>
|
|
|
|
|
+ </c:if>
|
|
|
</tbody>
|
|
</tbody>
|
|
|
</table>
|
|
</table>
|
|
|
<div align="right" class="mt-10 mb-10 mr-10">
|
|
<div align="right" class="mt-10 mb-10 mr-10">
|
|
@@ -128,7 +128,7 @@
|
|
|
<input type="hidden" value="${rebackChannelType }" id="channelType">
|
|
<input type="hidden" value="${rebackChannelType }" id="channelType">
|
|
|
<input type="hidden" value="" id="rebates">
|
|
<input type="hidden" value="" id="rebates">
|
|
|
<div class="layui-layer layui-anim layui-layer-iframe" id="layui-layer4" times="4" showtime="0" contype="string" style="display:none;z-index: 19891018; width: 550px; height: 360px; position: absolute; top: 100px; left: 379px;">
|
|
<div class="layui-layer layui-anim layui-layer-iframe" id="layui-layer4" times="4" showtime="0" contype="string" style="display:none;z-index: 19891018; width: 550px; height: 360px; position: absolute; top: 100px; left: 379px;">
|
|
|
- <div class="layui-layer-title" id="sendOrderNote" style="cursor: move;" move="ok">结算</div>
|
|
|
|
|
|
|
+ <div class="layui-layer-title" id="sendOrderNote" style="cursor: move;" move="ok">成本合计</div>
|
|
|
<br>
|
|
<br>
|
|
|
<div class="row cl">
|
|
<div class="row cl">
|
|
|
<label class="form-label col-2"> 渠道名称：</label>
|
|
<label class="form-label col-2"> 渠道名称：</label>
|
|
@@ -139,7 +139,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="row cl" style="margin-top: 10px;">
|
|
<div class="row cl" style="margin-top: 10px;">
|
|
|
- <label class="form-label col-2"> 本次金额：</label>
|
|
|
|
|
|
|
+ <label class="form-label col-2"> 成本合计：</label>
|
|
|
<div class="formControls col-3">
|
|
<div class="formControls col-3">
|
|
|
<span id="rebackAmount">
|
|
<span id="rebackAmount">
|
|
|
|
|
|
|
@@ -147,7 +147,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<br>
|
|
<br>
|
|
|
- <div class="row cl">
|
|
|
|
|
|
|
+ <div class="row cl" style="display: none">
|
|
|
<div class="formControls col-5">
|
|
<div class="formControls col-5">
|
|
|
<table class="table table-border table-bordered table-bg" style="width: 450px;margin-left: 10px;">
|
|
<table class="table table-border table-bordered table-bg" style="width: 450px;margin-left: 10px;">
|
|
|
<thead>
|
|
<thead>
|
|
@@ -169,9 +169,9 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<br>
|
|
<br>
|
|
|
- <span style="margin-left: 10px;">请在打款后，点击”确认已结算“按钮，系统将对应的返利记录标记为已打款。</span>
|
|
|
|
|
|
|
+ <span style="margin-left: 10px;">请在收货后，点击“确认已收货”按钮，系统将对应的收货记录标记为已收货</span>
|
|
|
<div class="col-9 col-offset-3" style="margin-top: 10px;">
|
|
<div class="col-9 col-offset-3" style="margin-top: 10px;">
|
|
|
- <input class="btn btn-danger" type="button" onclick="update_statuss()" value=" 确认已结算 ">
|
|
|
|
|
|
|
+ <input class="btn btn-danger" type="button" onclick="update_statuss()" value=" 成本合计 ">
|
|
|
</div>
|
|
</div>
|
|
|
<span class="layui-layer-setwin">
|
|
<span class="layui-layer-setwin">
|
|
|
<a class="layui-layer-ico layui-layer-close layui-layer-close1" onclick="exitWindowsDiv(this)" href="javascript:;"></a>
|
|
<a class="layui-layer-ico layui-layer-close layui-layer-close1" onclick="exitWindowsDiv(this)" href="javascript:;"></a>
|
|
@@ -199,7 +199,7 @@
|
|
|
var channelId = $("#channelId").val();
|
|
var channelId = $("#channelId").val();
|
|
|
var channelType = $("#channelType").val();
|
|
var channelType = $("#channelType").val();
|
|
|
if(rebates == "" || channelId == "" || channelType == ""){
|
|
if(rebates == "" || channelId == "" || channelType == ""){
|
|
|
- layer.msg("请至少选中一项返利记录",{icon: 5,time:2000});
|
|
|
|
|
|
|
+ layer.msg("请至少选中一项收货记录",{icon: 5,time:2000});
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
$.ajax({
|
|
$.ajax({
|
|
@@ -251,7 +251,7 @@
|
|
|
success: function(data){
|
|
success: function(data){
|
|
|
if(data.status){
|
|
if(data.status){
|
|
|
$("#layui-layer4").hide();
|
|
$("#layui-layer4").hide();
|
|
|
- layer.msg("状态已修改为已返利，已打款",{icon: 1,time:2000},function () {
|
|
|
|
|
|
|
+ layer.msg("状态已修改为已收货，已确认",{icon: 1,time:2000},function () {
|
|
|
location.replace(location.href);
|
|
location.replace(location.href);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
@@ -263,7 +263,7 @@
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
function update_status(id){
|
|
function update_status(id){
|
|
|
- layer.confirm('确认要修改返利状态吗？',function(index){
|
|
|
|
|
|
|
+ layer.confirm('确认要修改收货状态吗？',function(index){
|
|
|
$.ajax({
|
|
$.ajax({
|
|
|
url: '${pageContext.request.contextPath }/admin/channel/updateState',
|
|
url: '${pageContext.request.contextPath }/admin/channel/updateState',
|
|
|
type: "POST",
|
|
type: "POST",
|
|
@@ -274,7 +274,7 @@
|
|
|
},
|
|
},
|
|
|
success: function(data){
|
|
success: function(data){
|
|
|
if(data.status){
|
|
if(data.status){
|
|
|
- layer.msg("已修改为已返利，已打款",{icon: 1,time:2000},function () {
|
|
|
|
|
|
|
+ layer.msg("已修改为已收货，已确认",{icon: 1,time:2000},function () {
|
|
|
location.replace(location.href);
|
|
location.replace(location.href);
|
|
|
});
|
|
});
|
|
|
|
|
|
