Skip to content

朱继来 / 后台订单管理

Go to a project
Commit a9a4f72a by 朱继来
Options

1. 去掉客服折叠效果; 

2. 调整新增商品采购员;
parent da26ef9d
Inline Side-by-side
Showing with 17 additions and 18 deletions
app/Http/Controllers/AddOrderController.php
...@@ -819,11 +819,7 @@ Class AddOrderController extends Controller ...@@ -819,11 +819,7 @@ Class AddOrderController extends Controller
$data['add_goods_number'] = $request->input('add_goods_number', 0); $data['add_goods_number'] = $request->input('add_goods_number', 0);
$data['add_goods_price'] = $request->input('add_goods_price', 0); $data['add_goods_price'] = $request->input('add_goods_price', 0);
$data['add_delivery_time'] = $request->input('add_delivery_time', ''); $data['add_delivery_time'] = $request->input('add_delivery_time', '');
$data['add_buyer_id'] = $request->input('add_buyer_id', 0);
$CmsModel = new CmsModel();
$add_buyer_id = $request->input('add_buyer_id', 0);
$data['add_buyer_id'] = $add_buyer_id ? $CmsModel->getSaleId($add_buyer_id) : 0;
$data['add_batch'] = $request->input('add_batch', ''); $data['add_batch'] = $request->input('add_batch', '');
$data['add_remarks'] = $request->input('add_remarks', ''); $data['add_remarks'] = $request->input('add_remarks', '');
} else { } else {
......
app/Http/Controllers/OrderController.php
...@@ -844,6 +844,9 @@ Class OrderController extends Controller ...@@ -844,6 +844,9 @@ Class OrderController extends Controller
} else { } else {
$this->selfOtherData($info, $id); $this->selfOtherData($info, $id);
} }
} else {
$perm = new PermController;
$info['buyers'] = $perm->getRoleUsers($request, '采购员');
} }
// 账期订单跳转到详情页 // 账期订单跳转到详情页
......
public/js/goods.js
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
var add_goods_number = $('input[name=add_goods_number]').val(); var add_goods_number = $('input[name=add_goods_number]').val();
var add_goods_price = $('input[name=add_goods_price]').val(); var add_goods_price = $('input[name=add_goods_price]').val();
var add_delivery_time = $('input[name=add_delivery_time]').val(); var add_delivery_time = $('input[name=add_delivery_time]').val();
var add_buyer_id = $('input[name=add_buyer_id]').val(); var add_buyer_id = $('select[name=add_buyer_id]').val();
var add_batch = $('input[name=add_batch]').val(); var add_batch = $('input[name=add_batch]').val();
var add_remarks = $('textarea[name=add_remarks]').val(); var add_remarks = $('textarea[name=add_remarks]').val();
var reg = /\d/; var reg = /\d/;
...@@ -177,6 +177,9 @@ ...@@ -177,6 +177,9 @@
layer.close(index) layer.close(index)
} }
}) })
$("#add_buyer_id").selectpicker();
$('.layui-layer-content').css('overflow', 'visible');
}) })
// 获取SKU信息 // 获取SKU信息
......
resources/views/detail/addGoodsNoSkuid.blade.php
...@@ -44,8 +44,15 @@ ...@@ -44,8 +44,15 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="inputEmail3" class="col-sm-4 control-label">采购员</label> <label for="inputEmail3" class="col-sm-4 control-label">采购员</label>
<div class="col-sm-8"> <div class="col-sm-8" style="width:310px;">
<input class="form-control" type="text" name="add_buyer_id" value="" placeholder="请输入采购员"> <select class="form-control" name="add_buyer_id" id="add_buyer_id" data-live-search="true" data-size="7">
<option value="">请选择采购员</option>
@if (isset($buyers))
@foreach ($buyers as $v)
<option value="{{ $v->userId }}">{{ $v->name }}</option>
@endforeach
@endif
</select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
......
resources/views/orderlist/content.blade.php
...@@ -8,12 +8,7 @@ ...@@ -8,12 +8,7 @@
<input type="hidden" name="page_type" id="page_type" value="1"> <input type="hidden" name="page_type" id="page_type" value="1">
<div class="tabs-box"> <div class="tabs-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"> <div class="row-fluid search-box">
@endif
<div class="span12"> <div class="span12">
<table style="width:100%"> <table style="width:100%">
<tr> <tr>
......
resources/views/selfOrder/content.blade.php
...@@ -8,12 +8,7 @@ ...@@ -8,12 +8,7 @@
<input type="hidden" name="page_type" id="page_type" value="2"> <input type="hidden" name="page_type" id="page_type" value="2">
<div class="tabs-box"> <div class="tabs-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"> <div class="row-fluid search-box">
@endif
<div class="span12"> <div class="span12">
<table style="width:100%"> <table style="width:100%">
<tr> <tr>
......
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