Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 96689c96 by 朱继来
Options

Merge branch 'zjl_inner_account_20190221' into development

parents 859bda57 c499b635
Inline Side-by-side
Showing with 86 additions and 143 deletions
app/Http/routes.php
...@@ -63,7 +63,7 @@ Route::group(['middleware' => 'web'], function () { ...@@ -63,7 +63,7 @@ Route::group(['middleware' => 'web'], function () {
Route::get('/self_count', 'OrderCountController@selfCount'); Route::get('/self_count', 'OrderCountController@selfCount');
Route::get('/amount', 'OrderCountController@amount'); Route::get('/amount', 'OrderCountController@amount');
Route::get('/self_amount', 'OrderCountController@selfAmount'); Route::get('/self_amount', 'OrderCountController@selfAmount');
Route::post('/ajax/orderAmountInfoLoading', 'OrderCountController@orderAmountInfoLoading'); Route::post('/ajax/orderAmountInfoLoading', 'OrderCountController@orderAmountInfoLoading');
Route::match('post', '/ajaxDelayTime', 'OrderController@ajaxDelayTime'); Route::match('post', '/ajaxDelayTime', 'OrderController@ajaxDelayTime');
......
public/js/order.js
...@@ -324,72 +324,75 @@ ...@@ -324,72 +324,75 @@
location.href = listUrl; location.href = listUrl;
}) })
// 订单其他信息 // 非尽调账号时加载信息
var page_type = $('#page_type').val(); if (username != 'vpadmin@ichunt.com') {
orderOtherInfo(page_type); // 订单其他信息
var page_type = $('#page_type').val();
// 订单其他信息：已付款， 下单用户数， 付款用户数， 金额 orderOtherInfo(page_type);
function orderOtherInfo(pid) {
var order_contain = $('input[name=order_contain]').val(), // 订单其他信息：已付款， 下单用户数， 付款用户数， 金额
time_start = $('input[name="time_start"]').val(), function orderOtherInfo(pid) {
time_end = $('input[name="time_end"]').val(); var order_contain = $('input[name=order_contain]').val(),
time_start = $('input[name="time_start"]').val(),
if(time_start){ time_end = $('input[name="time_end"]').val();
time_start = Date.parse(time_start) / 1000;
} if(time_start){
time_start = Date.parse(time_start) / 1000;
}
if(time_end){ if(time_end){
time_end = Date.parse(time_end) / 1000 + (24*60*60-1); time_end = Date.parse(time_end) / 1000 + (24*60*60-1);
} }
var datax = { var datax = {
order_type : $('#order_type').data('default'), order_type : $('#order_type').data('default'),
order_contain : specialStr(order_contain), order_contain : specialStr(order_contain),
time_start : time_start, time_start : time_start,
time_end : time_end, time_end : time_end,
order_pay_type : $('#order_pay_type').val() ? $('#order_pay_type').val() : '', order_pay_type : $('#order_pay_type').val() ? $('#order_pay_type').val() : '',
order_status : $('#order_status').val() ? $('#order_status').val() : '', order_status : $('#order_status').val() ? $('#order_status').val() : '',
sale_type : $('#sale_type').val() ? $('#sale_type').val() : '', sale_type : $('#sale_type').val() ? $('#sale_type').val() : '',
shipping_name : $('#shipping_name').val() ? $('#shipping_name').val() : '', shipping_name : $('#shipping_name').val() ? $('#shipping_name').val() : '',
order_send : $('#order_send').val(), order_send : $('#order_send').val(),
order_source_pf : $('#order_source_pf').val() ? $('#order_source_pf').val() : '', order_source_pf : $('#order_source_pf').val() ? $('#order_source_pf').val() : '',
order_invoice_status : $('#order_invoice_status').val() ? $('#order_invoice_status').val() : '', order_invoice_status : $('#order_invoice_status').val() ? $('#order_invoice_status').val() : '',
order_source_adtag : $('input[name="order_source_adtag"]').val(), order_source_adtag : $('input[name="order_source_adtag"]').val(),
order_source_ptag : $('input[name="order_source_ptag"]').val(), order_source_ptag : $('input[name="order_source_ptag"]').val(),
erp_order_id : $('#erp_order_id').val() ? $('#erp_order_id').val() : '', erp_order_id : $('#erp_order_id').val() ? $('#erp_order_id').val() : '',
test_order : $('input[name=test_order]').is(':checked') ? 1 : 0, test_order : $('input[name=test_order]').is(':checked') ? 1 : 0,
is_new : $('#is_new').val() ? $('#is_new').val() : '', is_new : $('#is_new').val() ? $('#is_new').val() : '',
order_payment_mode : $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '', order_payment_mode : $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '',
is_new_order : $('#is_new_order').val() ? $('#is_new_order').val() : '', is_new_order : $('#is_new_order').val() ? $('#is_new_order').val() : '',
pid : pid, pid : pid,
}; };
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: '/ajax/orderOtherInfoLoading', url: '/ajax/orderOtherInfoLoading',
data: datax, data: datax,
dataType: "json", dataType: "json",
success: function(resp){ success: function(resp){
if (resp.err_code != 0) { if (resp.err_code != 0) {
layer.msg(resp.err_msg); layer.msg(resp.err_msg);
return false; return false;
} }
var data = resp.data; var data = resp.data;
var html = ''; var html = '';
if (pid != 3) { if (pid != 3) {
html += '<span class="paid_order_count">'+data.paid_order_count+'单已付款（包含预付款），</span><span class="user_count">下单用户数为'+data.user_count+'人，</span><span class="paid_user_count">付款用户数为'+data.paid_user_count+'人，</span>'; html += '<span class="paid_order_count">'+data.paid_order_count+'单已付款（包含预付款），</span><span class="user_count">下单用户数为'+data.user_count+'人，</span><span class="paid_user_count">付款用户数为'+data.paid_user_count+'人，</span>';
} }
html += '<span class="rmb_count">应付金额 ￥'+data.pay_count.rmb_count+'，</span><span class="usd_count">$'+data.pay_count.usd_count+'，</span><span class="rmb_pay">实收金额 ￥'+data.pay_count.rmb_pay+'，</span><span class="usd_pay">$'+data.pay_count.usd_pay+'，</span>'; html += '<span class="rmb_count">应付金额 ￥'+data.pay_count.rmb_count+'，</span><span class="usd_count">$'+data.pay_count.usd_count+'，</span><span class="rmb_pay">实收金额 ￥'+data.pay_count.rmb_pay+'，</span><span class="usd_pay">$'+data.pay_count.usd_pay+'，</span>';
if (pid != 3 && data.noreason_count) { if (pid != 3 && data.noreason_count) {
html += '<span class="error">共有'+data.noreason_count+'单已取消订单未填写取消原因</span>'; html += '<span class="error">共有'+data.noreason_count+'单已取消订单未填写取消原因</span>';
} }
$('.show-other-info').append(html); $('.show-other-info').append(html);
}, },
}) })
}
} }
// 填写取消原因 // 填写取消原因
......
resources/views/detail/content.blade.php
...@@ -562,7 +562,7 @@ ...@@ -562,7 +562,7 @@
</div> </div>
<!-- 非内部采购下单显示付款地址 --> <!-- 非内部采购下单显示付款地址 -->
@if (isset($order_temp_info) && $order_temp_info['order_type'] != 3) @if (isset($order_temp_info) && $order_temp_info['order_type'] != 3 && $order_info['status'] < 4)
<p>客户付款地址：{{ Config('website.pay_url').$order_info['order_id'] }}</p> <p>客户付款地址：{{ Config('website.pay_url').$order_info['order_id'] }}</p>
@endif @endif
</div> </div>
......
resources/views/erpOrder/content.blade.php
...@@ -303,7 +303,8 @@ ...@@ -303,7 +303,8 @@
<script> <script>
var order_status = "{{$condition['order_status']}}"; var order_status = "{{$condition['order_status']}}";
var order_source = "{{$condition['order_source_pf']}}"; var order_source = "{{$condition['order_source_pf']}}";
var order_send = "{{$condition['order_send']}}"; var order_send = "{{$condition['order_send']}}";
var username = "{{$username}}";
$(".order_status").selectpicker({ $(".order_status").selectpicker({
actionsBox:true, //在下拉选项添加选中所有和取消选中的按钮 actionsBox:true, //在下拉选项添加选中所有和取消选中的按钮
......
resources/views/orderlist/content.blade.php
...@@ -466,83 +466,21 @@ ...@@ -466,83 +466,21 @@
<?php echo $page; ?> <?php echo $page; ?>
</div> </div>
<div class="hide" id="sale-container">
<div class="sales">
<table class="table">
<tr>
<td>终端</td>
<td>
<table>
<tr>
<label><input type="radio" name="UserID" value="ZJF">郑家锋</label>
<label><input type="radio" name="UserID" value="LZY">李智勇</label>
<label><input type="radio" name="UserID" value="HXJ">黄小洁</label>
<label><input type="radio" name="UserID" value="PXB">潘小兵</label>
<label><input type="radio" name="UserID" value="LCW">赖朝武</label>
</tr>
</table>
<table>
<tr>
<label><input type="radio" name="UserID" value="XQ">肖琼</label>
<label><input type="radio" name="UserID" value="YYQ">杨永清</label>
<label><input type="radio" name="UserID" value="PW">彭伟</label>
<label><input type="radio" name="UserID" value="WHB">王海波</label>
<label><input type="radio" name="UserID" value="FAD">费安冬</label>
</tr>
</table>
<table>
<tr>
<label><input type="radio" name="UserID" value="HWQ">胡伟泉</label>
<label><input type="radio" name="UserID" value="CWB">陈文斌</label>
</tr>
</table>
</td>
</tr>
<tr>
<td>代购组</td>
<td>
<table>
<tr>
<label><input type="radio" name="UserID" value="ZXZ">朱小忠</label>
<label><input type="radio" name="UserID" value="HQM">韩琴妹</label>
<label><input type="radio" name="UserID" value="WXX">翁晓旋</label>
<label><input type="radio" name="UserID" value="LW">刘威</label>
</tr>
</table>
</td>
</tr>
<tr>
<td>电销组</td>
<td>
<table>
<tr>
<label><input type="radio" name="UserID" value="HCJ">何翠娟</label>
<label><input type="radio" name="UserID" value="WZH">吴志华</label>
<label><input type="radio" name="UserID" value="LDP">卢冬平</label>
<label><input type="radio" name="UserID" value="GW">高伟</label>
<label><input type="radio" name="UserID" value="HYQ">胡雁群</label>
</tr>
</table>
</td>
</tr>
</table>
</div>
</div>
</div> </div>
</div> </div>
<script> <script>
var test_order = "{{$condition['test_order']}}"; var test_order = "{{$condition['test_order']}}";
var order_status = "{{$condition['order_status']}}"; var order_status = "{{$condition['order_status']}}";
var order_payment_mode = "{{$condition['order_payment_mode']}}"; var order_payment_mode = "{{$condition['order_payment_mode']}}";
var order_source_pf = "{{$condition['order_source_pf']}}"; var order_source_pf = "{{$condition['order_source_pf']}}";
var shipping_name = "{{$condition['shipping_name']}}"; var shipping_name = "{{$condition['shipping_name']}}";
var order_send = "{{$condition['order_send']}}"; var order_send = "{{$condition['order_send']}}";
var order_pay_type = "{{$condition['order_pay_type']}}"; var order_pay_type = "{{$condition['order_pay_type']}}";
var is_new = "{{$condition['is_new']}}"; var is_new = "{{$condition['is_new']}}";
var erp_order_id = "{{$condition['erp_order_id']}}"; var erp_order_id = "{{$condition['erp_order_id']}}";
var is_new_order = "{{$condition['is_new_order']}}"; var is_new_order = "{{$condition['is_new_order']}}";
var username = "{{$username}}";
if (test_order) { if (test_order) {
$('input[name=test_order]').attr('checked', true); $('input[name=test_order]').attr('checked', true);
......
resources/views/selfOrder/content.blade.php
...@@ -350,15 +350,16 @@ ...@@ -350,15 +350,16 @@
</div> </div>
<script> <script>
var test_order = "{{$condition['test_order']}}"; var test_order = "{{$condition['test_order']}}";
var order_status = "{{$condition['order_status']}}"; var order_status = "{{$condition['order_status']}}";
var sale_type = "{{$condition['sale_type']}}"; var sale_type = "{{$condition['sale_type']}}";
var order_payment_mode = "{{$condition['order_payment_mode']}}"; var order_payment_mode = "{{$condition['order_payment_mode']}}";
var order_source_pf = "{{$condition['order_source_pf']}}"; var order_source_pf = "{{$condition['order_source_pf']}}";
var order_invoice_status = "{{$condition['order_invoice_status']}}"; var order_invoice_status = "{{$condition['order_invoice_status']}}";
var order_send = "{{$condition['order_send']}}"; var order_send = "{{$condition['order_send']}}";
var order_pay_type = "{{$condition['order_pay_type']}}"; var order_pay_type = "{{$condition['order_pay_type']}}";
var is_new = "{{$condition['is_new']}}"; var is_new = "{{$condition['is_new']}}";
var username = "{{$username}}";
if (test_order) { if (test_order) {
$('input[name=test_order]').attr('checked', true); $('input[name=test_order]').attr('checked', true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment