hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sth

Browse Source
This commit is contained in:
xman 2025-04-28 16:37:32 +08:00
parent a5ae44b6a4
commit 3fb6925a8f
5 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/admin/controller/Ajax.php
View File

@ -294,17 +294,17 @@ class Ajax extends Backend
$province = $this->request->get('province');
$city = $this->request->get('city');
}
$where = ['pid' => 0, 'level' => 1];
$where = ['level' => 1];
$provincelist = null;
if ($province !== null) {
$where['pid'] = $province;
$where['code'] = ['like',$province."%"];
$where['level'] = 2;
if ($city !== null) {
$where['pid'] = $city;
$where['code'] = ['like',$city."%"];
$where['level'] = 3;
}
}
$provincelist = Db::name('area')->where($where)->field('id as value,name')->select();
$provincelist = Db::name('areas')->where($where)->field('id as value,name')->select();
$this->success('', '', $provincelist);
}

8
application/admin/controller/statistics/Worker.php
View File

@ -37,6 +37,9 @@ class Worker extends Backend
*/
private OrderDispatch $DispatchModel;
protected $relationSearch = true;
public function _initialize()
{
parent::_initialize();
@ -124,12 +127,7 @@ class Worker extends Backend
$filter['end_time'] = trim($arr[1]);
}
/*unset($filter['daterange']); // 移除 status
$newFilter = json_encode($filter, JSON_UNESCAPED_UNICODE);
// 重新赋值到 $_GET，影响 $this->request->get("filter") 后面调用
$_GET['filter'] = $newFilter;*/
}
//派单表

2
application/admin/model/Worker.php
View File

@ -47,7 +47,7 @@ class Worker extends BaseModel
public function area()
{
return $this->belongsTo('Area', 'area_id', 'area_code');
return $this->belongsTo('area', 'area_id', 'area_code')->setEagerlyType(0);
}
public function admin()

15
application/admin/view/statistics/worker/index.html
View File

@ -344,3 +344,18 @@
<script src="https://api.map.baidu.com/api?type=webgl&v=1.0&ak={$mapkey}&callback=initMap"></script>
<!--
<script id="sourcetpl" type="text/html">
<div class="row">
<div class="col-xs-12">
<div class="form-inline" data-toggle="cxselect" data-selects="province,city,area">
<select style="width: 100px;" class="province form-control" name="province_id" data-url="ajax/area" ></select>
<input type="hidden" class="operate" data-name="province_id" value="=" />
<select style="width: 100px;" class="city form-control" name="city_id" data-url="ajax/area" data-query-name="province"></select>
<input type="hidden" class="operate" data-name="city_id" value="=" />
&lt;!&ndash; <select class="area form-control" name="area_id" data-url="ajax/area" data-query-name="city"></select>
<input type="hidden" class="operate" data-name="area_id" value="=" />&ndash;&gt;
</div>
</div>
</div>
</script>-->

9
public/assets/js/backend/statistics/worker.js
View File

@ -54,6 +54,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'echarts', 'echarts-t
//{field: 'admin_user', title: __('派单员'),operate: "LIKE",visible:false},
//{field: 'city_name', title: __('城市'),operate: "LIKE",visible:false},
//{field: 'city_name', title: __('城市'),operate: "LIKE",visible:false},
/*{field: 'area', title: __('城市'), searchList: function (column) {
return Template('sourcetpl', {});
}
},
*/
{field: 'area.merge_name', title: __('地区'),operate: 'LIKE',visible:false},
{field: 'daterange', title: __('时间筛选'), addclass:'datetimerange',
autocomplete:false,
operate: "RANGE",
@ -63,6 +71,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'echarts', 'echarts-t
visible:false,
defaultValue: Config.default_daterange
},
{field: 'operate', title: __('Operate'), table: table2, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
buttons: [
{