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 7 additions and 64 deletions
public/js/order.js
...@@ -324,6 +324,8 @@ ...@@ -324,6 +324,8 @@
location.href = listUrl; location.href = listUrl;
}) })
// 非尽调账号时加载信息
if (username != 'vpadmin@ichunt.com') {
// 订单其他信息 // 订单其他信息
var page_type = $('#page_type').val(); var page_type = $('#page_type').val();
orderOtherInfo(page_type); orderOtherInfo(page_type);
...@@ -391,6 +393,7 @@ ...@@ -391,6 +393,7 @@
}, },
}) })
} }
}
// 填写取消原因 // 填写取消原因
this.cancelorder(); this.cancelorder();
......
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
...@@ -304,6 +304,7 @@ ...@@ -304,6 +304,7 @@
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,69 +466,6 @@ ...@@ -466,69 +466,6 @@
<?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>
...@@ -543,6 +480,7 @@ ...@@ -543,6 +480,7 @@
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
...@@ -359,6 +359,7 @@ ...@@ -359,6 +359,7 @@
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