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

Merge branch 'develop' into feature/xman

Browse Source
This commit is contained in:
xman 2025-03-04 09:49:58 +08:00
commit ecc1874e0c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controller/Order.php
View File

@ -53,7 +53,7 @@ class Order extends Backend
[$where, $sort, $order, $offset, $limit] = $this->buildparams(); [$where, $sort, $order, $offset, $limit] = $this->buildparams();
$list = $this->model $list = $this->model
->field(['id','order_no','customer','tel','status','area_id','address', ->field(['id','order_no','customer','tel','status','area_id','address',
'work_tel_id','worker_id','source','source_uid','service_title', 'source','source_uid','source','item_title','item_id',
'detail','remark','images','create_time','update_time']) 'detail','remark','images','create_time','update_time'])
->where($where) ->where($where)
->order($sort, $order) ->order($sort, $order)

6
public/assets/js/backend/order.js
View File

@ -56,10 +56,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
formatter: Table.api.formatter.content formatter: Table.api.formatter.content
}, },
{field: 'work_tel_id', title: __('Work_tel_id')}, {field: 'work_tel_id', title: __('Work_tel_id')},
{field: 'worker_id', title: __('Worker_id')}, // {field: 'worker_id', title: __('Worker_id')},
{field: 'source', title: __('Source')}, {field: 'source', title: __('Source')},
{field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'}, // {field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'},
{field: 'service_title', title: __('Service_title'), operate: 'LIKE'}, {field: 'item_title', title: __('Item_title'), operate: 'LIKE'},
{ {
field: 'detail', field: 'detail',
title: __('Detail'), title: __('Detail'),