diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php
index bf197f3..ad68d05 100644
--- a/application/admin/controller/orders/Dispatch2.php
+++ b/application/admin/controller/orders/Dispatch2.php
@@ -16,6 +16,7 @@ use think\exception\DbException;
use think\exception\PDOException;
use think\exception\ValidateException;
use think\Hook;
+use think\Loader;
/**
* 派单列管理
@@ -92,9 +93,9 @@ class Dispatch2 extends Backend
if($row->btn_record){
if($row->btn_record != 2){
- return true;
+ $row->btn_record = true;
}else{
- return false;
+ $row->btn_record = false;
}
/*if($row->follow == 0 ){
@@ -132,6 +133,7 @@ class Dispatch2 extends Backend
}
}
+
$result = array("total" => $list->total(), "rows" => $list->items());
return json($result);
@@ -495,4 +497,221 @@ class Dispatch2 extends Backend
$this->success(__('取消成功'));
}
+
+
+ /**
+ * 生成查询所需要的条件,排序方式
+ * @param mixed $searchfields 快速查询的字段
+ * @param boolean $relationSearch 是否关联查询
+ * @return array
+ */
+ protected function buildparams($searchfields = null, $relationSearch = null)
+ {
+ $searchfields = is_null($searchfields) ? $this->searchFields : $searchfields;
+ $relationSearch = is_null($relationSearch) ? $this->relationSearch : $relationSearch;
+ $search = $this->request->get("search", '');
+ $filter = $this->request->get("filter", '');
+ $op = $this->request->get("op", '', 'trim');
+ $sort = $this->request->get("sort", !empty($this->model) && $this->model->getPk() ? $this->model->getPk() : 'id');
+ $order = $this->request->get("order", "DESC");
+ $offset = max(0, $this->request->get("offset/d", 0));
+ $limit = max(0, $this->request->get("limit/d", 0));
+ $limit = $limit ?: 999999;
+ //新增自动计算页码
+ $page = $limit ? intval($offset / $limit) + 1 : 1;
+ if ($this->request->has("page")) {
+ $page = max(0, $this->request->get("page/d", 1));
+ }
+ $this->request->get([config('paginate.var_page') => $page]);
+ $filter = (array)json_decode($filter, true);
+
+ $province_id = $filter['province_id']??null;
+ $city_id = $filter['city_id']??null;
+ $area_id = $filter['city_id']??null;
+ unset($filter['city_id']);
+ unset($filter['province_id']);
+ unset($filter['area_id']);
+
+ if(!empty($area_id)){
+ $filter['orderb.area_id'] = $area_id;
+ }else{
+ if(!empty($city_id)){
+ $filter['orderb.area_id'] = $city_id;
+ }else{
+ if(!empty($province_id)){
+ $filter['orderb.area_id'] = $province_id;
+ }
+ }
+ }
+
+ $op = (array)json_decode($op, true);
+ $op['orderb.area_id'] = 'like%';
+ $filter = $filter ? $filter : [];
+ $where = [];
+ $alias = [];
+ $bind = [];
+ $name = '';
+ $aliasName = '';
+ if (!empty($this->model) && $relationSearch) {
+ $name = $this->model->getTable();
+ $alias[$name] = Loader::parseName(basename(str_replace('\\', '/', get_class($this->model))));
+ $aliasName = $alias[$name] . '.';
+ }
+ $sortArr = explode(',', $sort);
+ foreach ($sortArr as $index => & $item) {
+ $item = stripos($item, ".") === false ? $aliasName . trim($item) : $item;
+ }
+ unset($item);
+ $sort = implode(',', $sortArr);
+ $adminIds = $this->getDataLimitAdminIds();
+ if (is_array($adminIds)) {
+ $where[] = [$aliasName . $this->dataLimitField, 'in', $adminIds];
+ }
+ if ($search) {
+ $searcharr = is_array($searchfields) ? $searchfields : explode(',', $searchfields);
+ foreach ($searcharr as $k => &$v) {
+ $v = stripos($v, ".") === false ? $aliasName . $v : $v;
+ }
+ unset($v);
+ $where[] = [implode("|", $searcharr), "LIKE", "%{$search}%"];
+ }
+ $index = 0;
+ foreach ($filter as $k => $v) {
+ if (!preg_match('/^[a-zA-Z0-9_\-\.]+$/', $k)) {
+ continue;
+ }
+ $sym = $op[$k] ?? '=';
+ if (stripos($k, ".") === false) {
+ $k = $aliasName . $k;
+ }
+ $v = !is_array($v) ? trim($v) : $v;
+ $sym = strtoupper($op[$k] ?? $sym);
+ //null和空字符串特殊处理
+ if (!is_array($v)) {
+ if (in_array(strtoupper($v), ['NULL', 'NOT NULL'])) {
+ $sym = strtoupper($v);
+ }
+ if (in_array($v, ['""', "''"])) {
+ $v = '';
+ $sym = '=';
+ }
+ }
+
+ switch ($sym) {
+ case '=':
+ case '<>':
+ $where[] = [$k, $sym, (string)$v];
+ break;
+ case 'LIKE':
+ case 'NOT LIKE':
+ case 'LIKE %...%':
+ case 'NOT LIKE %...%':
+ $where[] = [$k, trim(str_replace('%...%', '', $sym)), "%{$v}%"];
+ break;
+
+ // ✅ 新增：右匹配（like%）
+ case 'LIKE%':
+ $where[] = [$k, 'LIKE', "{$v}%"];
+ break;
+
+ // ✅ 新增：左匹配（%like）
+ case '%LIKE':
+ $where[] = [$k, 'LIKE', "%{$v}"];
+ break;
+ case '>':
+ case '>=':
+ case '<':
+ case '<=':
+ $where[] = [$k, $sym, intval($v)];
+ break;
+ case 'FINDIN':
+ case 'FINDINSET':
+ case 'FIND_IN_SET':
+ $v = is_array($v) ? $v : explode(',', str_replace(' ', ',', $v));
+ $findArr = array_values($v);
+ foreach ($findArr as $idx => $item) {
+ $bindName = "item_" . $index . "_" . $idx;
+ $bind[$bindName] = $item;
+ $where[] = "FIND_IN_SET(:{$bindName}, `" . str_replace('.', '`.`', $k) . "`)";
+ }
+ break;
+ case 'IN':
+ case 'IN(...)':
+ case 'NOT IN':
+ case 'NOT IN(...)':
+ $where[] = [$k, str_replace('(...)', '', $sym), is_array($v) ? $v : explode(',', $v)];
+ break;
+ case 'BETWEEN':
+ case 'NOT BETWEEN':
+ $arr = array_slice(explode(',', $v), 0, 2);
+ if (stripos($v, ',') === false || !array_filter($arr, function ($v) {
+ return $v != '' && $v !== false && $v !== null;
+ })) {
+ continue 2;
+ }
+ //当出现一边为空时改变操作符
+ if ($arr[0] === '') {
+ $sym = $sym == 'BETWEEN' ? '<=' : '>';
+ $arr = $arr[1];
+ } elseif ($arr[1] === '') {
+ $sym = $sym == 'BETWEEN' ? '>=' : '<';
+ $arr = $arr[0];
+ }
+ $where[] = [$k, $sym, $arr];
+ break;
+ case 'RANGE':
+ case 'NOT RANGE':
+ $v = str_replace(' - ', ',', $v);
+ $arr = array_slice(explode(',', $v), 0, 2);
+ if (stripos($v, ',') === false || !array_filter($arr)) {
+ continue 2;
+ }
+ //当出现一边为空时改变操作符
+ if ($arr[0] === '') {
+ $sym = $sym == 'RANGE' ? '<=' : '>';
+ $arr = $arr[1];
+ } elseif ($arr[1] === '') {
+ $sym = $sym == 'RANGE' ? '>=' : '<';
+ $arr = $arr[0];
+ }
+ $tableArr = explode('.', $k);
+ if (count($tableArr) > 1 && $tableArr[0] != $name && !in_array($tableArr[0], $alias)
+ && !empty($this->model) && $this->relationSearch) {
+ //修复关联模型下时间无法搜索的BUG
+ $relation = Loader::parseName($tableArr[0], 1, false);
+ $alias[$this->model->$relation()->getTable()] = $tableArr[0];
+ }
+ $where[] = [$k, str_replace('RANGE', 'BETWEEN', $sym) . ' TIME', $arr];
+ break;
+ case 'NULL':
+ case 'IS NULL':
+ case 'NOT NULL':
+ case 'IS NOT NULL':
+ $where[] = [$k, strtolower(str_replace('IS ', '', $sym))];
+ break;
+ default:
+ break;
+ }
+ $index++;
+ }
+ if (!empty($this->model)) {
+ $this->model->alias($alias);
+ }
+ $model = $this->model;
+ $where = function ($query) use ($where, $alias, $bind, &$model) {
+ if (!empty($model)) {
+ $model->alias($alias);
+ $model->bind($bind);
+ }
+ foreach ($where as $k => $v) {
+ if (is_array($v)) {
+ call_user_func_array([$query, 'where'], $v);
+ } else {
+ $query->where($v);
+ }
+ }
+ };
+ return [$where, $sort, $order, $offset, $limit, $page, $alias, $bind];
+ }
+
}
diff --git a/application/admin/view/common/area_select.html b/application/admin/view/common/area_select.html
new file mode 100644
index 0000000..a5148c3
--- /dev/null
+++ b/application/admin/view/common/area_select.html
@@ -0,0 +1,14 @@
+
diff --git a/application/admin/view/orders/dispatch2/index.html b/application/admin/view/orders/dispatch2/index.html
index c6d1e05..fef88ac 100644
--- a/application/admin/view/orders/dispatch2/index.html
+++ b/application/admin/view/orders/dispatch2/index.html
@@ -54,3 +54,22 @@
+
+
+
+
+
+
diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php
index 67e9d79..43106a3 100755
--- a/application/common/controller/Backend.php
+++ b/application/common/controller/Backend.php
@@ -278,6 +278,26 @@ class Backend extends Controller
}
$this->request->get([config('paginate.var_page') => $page]);
$filter = (array)json_decode($filter, true);
+
+ $province_id = $filter['province_id']??null;
+ $city_id = $filter['city_id']??null;
+ $area_id = $filter['city_id']??null;
+ unset($filter['city_id']);
+ unset($filter['province_id']);
+ unset($filter['area_id']);
+
+ if(!empty($area_id)){
+ $filter['area_id'] = $area_id;
+ }else{
+ if(!empty($city_id)){
+ $filter['area_id'] = $city_id;
+ }else{
+ if(!empty($province_id)){
+ $filter['area_id'] = $province_id;
+ }
+ }
+ }
+
$op = (array)json_decode($op, true);
$filter = $filter ? $filter : [];
$where = [];
diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js
index 2c606bd..a58b496 100644
--- a/public/assets/js/backend/orders/dispatch2.js
+++ b/public/assets/js/backend/orders/dispatch2.js
@@ -94,8 +94,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
},
+ {field: 'got_time', title: __('接单时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
- {field: 'plan_time', title: __('Plan_time'), operate:false, addclass:'datetimerange', autocomplete:false,
+ {field: 'plan_time', title: __('Plan_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false,
formatter:function(value,row,index){
if(row.status == 25){
return' '+value+'';
@@ -153,6 +154,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
//{field: 'update_time', title: __('Update_time'), operate:false, addclass:'datetimerange', autocomplete:false},
{field: 'finish_time', title: __('Finish_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+ {field: 'area', title: __('地区'), searchList: function (column) {
+ return Template('categorytpl', {});
+ }, formatter: function (value, row, index) {
+ return '无';
+ }, visible: false
+ },
+
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
align:'left',