Skip to content

朱继来 / 后台订单管理

Go to a project
Commit ae7f58db by 朱继来
Options

1. 调整列表; 

2. 调整联营批量导入;
parent 505a6480
Inline Side-by-side
Showing with 74 additions and 55 deletions
app/Http/Controllers/AddOrderController.php
......@@ -711,10 +711,10 @@ Class AddOrderController extends Controller
array_shift($excel); // 删除第一行
// 推送到API
$data['data'] = $excel;
$data['operator_id'] = $request->user->userId;
$data['type'] = 3; // 后台批量添加标记
$data['uid'] = $request->input('user_id');
$data['data'] = $excel;
$data['operator_id'] = $request->user->userId;
$data['type'] = 3; // 后台批量添加标记
$data['uid'] = $request->input('user_id');
$data['delivery_place'] = $request->input('delivery_place');
if ($type == 1) { // 联营
......
config/params.php
......@@ -57,6 +57,9 @@
3 => 'goods_price',
4 => 'delivery_time',
5 => 'supplier_name',
6 => 'buyer_id',
7 => 'remarks',
8 => 'batch',
],
'self_map' => [
......
resources/views/addOrder/content.blade.php
......@@ -247,7 +247,7 @@
<div class="batch-btn">
<a class="btn btn-success goods_import" data-type="1">批量导入物料</a>
<a class="btn btn-info" href="http://img.ichunt.com/doc/excel/template/%E8%81%94%E8%90%A5%E8%AE%A2%E5%8D%95%E6%89%B9%E9%87%8F%E6%B7%BB%E5%8A%A0%E6%A8%A1%E6%9D%BF.csv">联营物料模板下载</a>
<a class="btn btn-info" href="http://img.ichunt.com/doc/excel/template/%E8%81%94%E8%90%A5%E8%AE%A2%E5%8D%95%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.csv">联营物料模板下载</a>
</div>
</div>
</div>
......
resources/views/orderlist/content.blade.php
......@@ -8,7 +8,12 @@
<input type="hidden" name="page_type" id="page_type" value="1">
<div class="tabs-box">
<div class="row-fluid search-box">
@if (in_array($role, [7, 15, 17, 19]))
<a href="#list_search" class="btn btn-primary" data-toggle="collapse">高级筛选</a>
<div id="list_search" class="row-fluid search-box collapse">
@else
<div class="row-fluid search-box">
@endif
<div class="span12">
<table style="width:100%">
<tr>
......@@ -87,29 +92,6 @@
</dd>
</dl>
<dl>
<dt>推送业务员：</dt>
<dd>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7" multiple>
<!-- <option value="">全部</option> -->
<option value="0">无推送</option>
<optgroup label="在职">
@foreach ($sale_list as $v)
@if ($v->status != 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
<optgroup label="离职">
@foreach ($sale_list as $v)
@if ($v->status == 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
</select>
</dd>
</dl>
<dl>
<dt>支付方式：</dt>
<dd>
<select id="order_payment_mode" name="order_payment_mode" class="form-control order_payment_mode selectpicker" title="全部" multiple>
......@@ -151,7 +133,31 @@
</dd>
</dl>
@endif
@if (!in_array($role, [7, 15, 17, 19]))
<dl>
<dt>推送业务员：</dt>
<dd>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7" multiple>
<!-- <option value="">全部</option> -->
<option value="0">无推送</option>
<optgroup label="在职">
@foreach ($sale_list as $v)
@if ($v->status != 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
<optgroup label="离职">
@foreach ($sale_list as $v)
@if ($v->status == 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
</select>
</dd>
</dl>
<dl>
<dt>adtag来源：</dt>
<dd>
......@@ -186,6 +192,8 @@
</select>
</dd>
</dl>
@endif
<dl>
<dt>新订单：</dt>
<dd>
......
resources/views/selfOrder/content.blade.php
......@@ -8,7 +8,12 @@
<input type="hidden" name="page_type" id="page_type" value="2">
<div class="tabs-box">
<div class="row-fluid search-box">
@if (in_array($role, [7, 15, 17, 19]))
<a href="#list_search" class="btn btn-primary" data-toggle="collapse">高级筛选</a>
<div id="list_search" class="row-fluid search-box collapse">
@else
<div class="row-fluid search-box">
@endif
<div class="span12">
<table style="width:100%">
<tr>
......@@ -86,29 +91,6 @@
</dd>
</dl>
<dl>
<dt>客服：</dt>
<dd>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7" multiple>
<!-- <option value="">全部</option> -->
<option value="0">无推送</option>
<optgroup label="在职">
@foreach ($sale_list as $v)
@if ($v->status != 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
<optgroup label="离职">
@foreach ($sale_list as $v)
@if ($v->status == 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
</select>
</dd>
</dl>
<dl>
<dt>支付方式：</dt>
<dd>
<select id="order_payment_mode" name="order_payment_mode" class="form-control order_payment_mode selectpicker" title="全部" multiple>
......@@ -149,7 +131,31 @@
</select>
</dd>
</dl>
@if (!in_array($role, [7, 15, 17, 19]))
<dl>
<dt>客服：</dt>
<dd>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7" multiple>
<!-- <option value="">全部</option> -->
<option value="0">无推送</option>
<optgroup label="在职">
@foreach ($sale_list as $v)
@if ($v->status != 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
<optgroup label="离职">
@foreach ($sale_list as $v)
@if ($v->status == 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
</select>
</dd>
</dl>
<dl>
<dt>adtag来源：</dt>
<dd>
......@@ -174,6 +180,8 @@
</select>
</dd>
</dl>
@endif
<!-- <dl>
<dt>新订单：</dt>
<dd style="width: 115px;">
......
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