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

派单

Browse Source
This commit is contained in:
todaywindy 2025-07-03 11:34:42 +08:00
parent 3b22cbe600
commit ddffc0d33c
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,7 +303,7 @@ class Worker extends Backend
->select(); ->select();
$select_ids = array_column($select_ids, 'item_id'); $select_ids = array_column($select_ids, 'item_id');
foreach ($this->tree as $index => $item) { foreach ($this->tree as $index => $item) {
if (in_array($item['parent'], $select_ids)) { if (in_array($item['parent'], $select_ids)||in_array($item['id'],$select_ids)) {
$this->tree[$index]['state']['selected'] = true; $this->tree[$index]['state']['selected'] = true;
} }
} }
@ -319,6 +319,7 @@ class Worker extends Backend
{ {
$area_id = request()->get('area_id'); $area_id = request()->get('area_id');
$item_id = request()->get('item_id'); $item_id = request()->get('item_id');
$keyword = request()->get('keyword');
list($where, $sort, $order, $offset, $limit) = $this->buildparams(); list($where, $sort, $order, $offset, $limit) = $this->buildparams();
$build = model('worker') $build = model('worker')
@ -343,12 +344,17 @@ class Worker extends Backend
// dd($code); // dd($code);
$build->where('area_id', 'like', $code . '%'); $build->where('area_id', 'like', $code . '%');
} }
if ($item_id) { if ($item_id) {
$ids = $this->getParentIdsFromArray($item_id,$this->items); $ids = $this->getParentIdsFromArray($item_id,$this->items);
$ids [] = $item_id; $ids [] = $item_id;
$worker_ids = WorkerItem::whereIn('item_id',$ids)->column('worker_id'); $worker_ids = WorkerItem::whereIn('item_id',$ids)->column('worker_id');
$build->whereIn('id',$worker_ids); $build->whereIn('id',$worker_ids);
} }
if ($keyword) {
$build->where('name', 'like', '%'.$keyword . '%')
->whereOr('tel','like','%'.$keyword . '%');
}
$list = $build $list = $build
->paginate($limit); ->paginate($limit);
$result = array("total" => $list->total(), "rows" => $list->items()); $result = array("total" => $list->total(), "rows" => $list->items());

1
application/common/command/CheckOrderDispatchGotCommand.php
View File

@ -44,6 +44,7 @@ class CheckOrderDispatchGotCommand extends Command
$Model->where('status', OrderDispatch::STATUS_TOGET) $Model->where('status', OrderDispatch::STATUS_TOGET)
->where('type', 2) ->where('type', 2)
->where('worker_id','!=',1059)
->where('create_time', '<=', $now) ->where('create_time', '<=', $now)
->chunk(100, function ($list) use ($OrderLogic) { ->chunk(100, function ($list) use ($OrderLogic) {
foreach ($list as $item) { foreach ($list as $item) {

1
public/assets/js/backend/orders/dispatch.js
View File

@ -352,7 +352,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'layer', 'cascader'],
Form.api.submit($("#add-form"), function (data) { Form.api.submit($("#add-form"), function (data) {
var index = parent.Layer.getFrameIndex(window.name); var index = parent.Layer.getFrameIndex(window.name);
parent.Layer.close(index); // 关闭当前弹窗 parent.Layer.close(index); // 关闭当前弹窗
parent.table.bootstrapTable('refresh'); // 刷新父页面表格
}); });
} else { } else {
Toastr.error('请完整填写表单'); Toastr.error('请完整填写表单');