Commit caf0f166 by 杨树贤

加入地区筛选

parent 6eb5bdd2
...@@ -93,7 +93,9 @@ class SupplierFilter ...@@ -93,7 +93,9 @@ class SupplierFilter
if ((isset($map['status']) && $map['status'] === "0") || !empty($map['status'])) { if ((isset($map['status']) && $map['status'] === "0") || !empty($map['status'])) {
$query->whereIn('status', explode(',', $map['status'])); $query->whereIn('status', explode(',', $map['status']));
} }
if ((isset($map['region']) && $map['region'] === "0") || !empty($map['region'])) {
$query->whereIn('region', explode(',', $map['region']));
}
if (!empty($map['is_type'])) { if (!empty($map['is_type'])) {
$query->where('is_type', $map['is_type']); $query->where('is_type', $map['is_type']);
} }
......
...@@ -107,6 +107,15 @@ class SupplierController extends Controller ...@@ -107,6 +107,15 @@ class SupplierController extends Controller
} }
$this->data['supplierTypeData'] = $supplierTypeData; $this->data['supplierTypeData'] = $supplierTypeData;
$regionData = [];
foreach (config('fixed.Region') as $key => $value) {
$regionData[] = [
'name' => $value,
'value' => $key,
];
}
$this->data['regionData'] = $regionData;
//获取创建人部门树 //获取创建人部门树
$this->data['createUserDepartmentList'] = (new DepartmentService())->getCreateUserDepartmentListForXmSelect(); $this->data['createUserDepartmentList'] = (new DepartmentService())->getCreateUserDepartmentListForXmSelect();
......
...@@ -236,6 +236,10 @@ ...@@ -236,6 +236,10 @@
{!! $statusPresenter->render('sign_com_id', '签约公司', 0, \App\Http\Services\CrmService::getSignCompanyListMap()) !!} {!! $statusPresenter->render('sign_com_id', '签约公司', 0, \App\Http\Services\CrmService::getSignCompanyListMap()) !!}
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
@inject('multiSelectorPresenter','App\Presenters\MultiSelectorPresenter')
{!! $multiSelectorPresenter->render('region','区域','',$regionData) !!}
</div>
<div class="layui-inline">
<label class="layui-form-label">创建部门</label> <label class="layui-form-label">创建部门</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<div id="create_user_department" style="width: 150px"></div> <div id="create_user_department" style="width: 150px"></div>
......
...@@ -262,6 +262,11 @@ ...@@ -262,6 +262,11 @@
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<?php $multiSelectorPresenter = app('App\Presenters\MultiSelectorPresenter'); ?>
<?php echo $multiSelectorPresenter->render('region','区域','',$regionData); ?>
</div>
<div class="layui-inline">
<label class="layui-form-label">创建部门</label> <label class="layui-form-label">创建部门</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<div id="create_user_department" style="width: 150px"></div> <div id="create_user_department" style="width: 150px"></div>
......
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