Skip to content

朱继来 / 后台订单管理

Go to a project
Commit bac54290 by 朱继来
Options

竞调账号添加公司搜索

parent 743b47ce
Inline Side-by-side
Showing with 15 additions and 3 deletions
app/Http/Controllers/OrderController.php
......@@ -442,6 +442,7 @@ Class OrderController extends Controller
$map['order_type_extend'] = $request->input('order_type_extend', '');
$map['status_extend'] = $request->input('status_extend', '');
$map['is_manager_audit'] = $request->input('is_manager_audit', '');
$map['order_remark'] = $request->input('order_remark', '');
$perm = new PermController;
......
public/js/list.js
......@@ -97,6 +97,7 @@
order_type_extend = $('#order_type_extend').val() ? $('#order_type_extend').val() : '',
status_extend = $('#status_extend').val() ? $('#status_extend').val() : '',
is_manager_audit = $('#is_manager_audit').val() ? $('#is_manager_audit').val() : '';
order_remark = $('#order_remark').val() ? $('#order_remark').val() : '';
if (url == '/export') {
if (type == 1) { // 联营
......@@ -238,6 +239,10 @@
listUrl += '&test_order=' + 1;
}
if (order_remark) {
listUrl += '&order_remark=' + order_remark;
}
if (url == '/export') {
listUrl += '&order_goods_type='+type;
}
......
resources/views/orderlist/content.blade.php
......@@ -78,9 +78,7 @@
@endif
</select>
</dd>
</dl>
</dl>
<dl>
<dt>付款类型：</dt>
......@@ -229,6 +227,14 @@
</select>
</dd>
</dl>
@if ($username == 'vpadmin@ichunt.com')
<dl>
<dt>公司名称：</dt>
<dd>
<input type="text" id="order_remark" name="order_remark" value="{{$condition['order_remark']}}" placeholder="请输入公司名称">
</dd>
</dl>
@endif
@if (in_array('check_test_order', $userPerms))
<dl>
......
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