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-03-10 11:49:38 +08:00
parent 1729d3cf8b
commit eb7e22ca40
4 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controller/orders/Auditorder.php
View File

@ -55,7 +55,7 @@ class Auditorder extends Backend
$list = $this->model $list = $this->model
->scope('tab',Order::TAB_AUDIT) ->scope('tab',Order::TAB_AUDIT)
->alias('order') ->alias('order')
->with(['admin']) ->with(['auditadmin'])
->where($where) ->where($where)
->order($sort, $order) ->order($sort, $order)
->paginate($limit); ->paginate($limit);

4
application/admin/lang/zh-cn/orders/auditorder.php
View File

@ -17,8 +17,8 @@ return [
'Set status to 40' => '设为待验收', 'Set status to 40' => '设为待验收',
'Status 41' => '审核驳回', 'Status 41' => '审核驳回',
'Set status to 41' => '设为审核驳回', 'Set status to 41' => '设为审核驳回',
'Status 50' => '待财务审核', 'Status 50' => '待审核',
'Set status to 50' => '设为待财务审核', 'Set status to 50' => '设为待审核',
'Status 60' => '已完成', 'Status 60' => '已完成',
'Set status to 60' => '设为已完成', 'Set status to 60' => '设为已完成',
'Status -10' => '取消', 'Status -10' => '取消',

4
application/admin/model/Order.php
View File

@ -109,4 +109,8 @@ class Order extends Model
public function phone(){ public function phone(){
return $this->belongsTo(Phones::class,'work_tel_id',); return $this->belongsTo(Phones::class,'work_tel_id',);
} }
public function auditadmin(){
return $this->belongsTo(Admin::class,'audit_admin_id',);
}
} }

52
public/assets/js/backend/orders/auditorder.js
View File

@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
index_url: 'orders/auditorder/index' + location.search, index_url: 'orders/auditorder/index' + location.search,
add_url: 'orders/auditorder/add', add_url: 'orders/auditorder/add',
edit_url: 'orders/auditorder/edit', edit_url: 'orders/auditorder/edit',
del_url: 'orders/auditorder/del', // del_url: 'orders/auditorder/del',
multi_url: 'orders/auditorder/multi', multi_url: 'orders/auditorder/multi',
import_url: 'orders/auditorder/import', import_url: 'orders/auditorder/import',
table: 'order', table: 'order',
@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'lng', title: __('Lng'), operate:'BETWEEN'}, {field: 'lng', title: __('Lng'), operate:'BETWEEN'},
{field: 'lat', title: __('Lat'), operate:'BETWEEN'}, {field: 'lat', title: __('Lat'), operate:'BETWEEN'},
{field: 'work_tel_id', title: __('Work_tel_id')}, //{field: 'work_tel_id', title: __('Work_tel_id')},
{field: 'source_shop', title: __('Source_shop'), operate: 'LIKE'}, {field: 'source_shop', title: __('Source_shop'), operate: 'LIKE'},
{field: 'source', title: __('Source')}, {field: 'source', title: __('Source')},
{field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'}, {field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'},
@ -51,29 +51,37 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'total', title: __('Total'), operate:'BETWEEN'}, {field: 'total', title: __('Total'), operate:'BETWEEN'},
{field: 'cost', title: __('Cost'), operate:'BETWEEN'}, {field: 'cost', title: __('Cost'), operate:'BETWEEN'},
{field: 'performance', title: __('Performance'), operate:'BETWEEN'}, {field: 'performance', title: __('Performance'), operate:'BETWEEN'},
{field: 'cancel_reason_id', title: __('Cancel_reason_id')}, // {field: 'cancel_reason_id', title: __('Cancel_reason_id')},
{field: 'cancel_detail', title: __('Cancel_detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, //{field: 'cancel_detail', title: __('Cancel_detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'audit_remark', title: __('Audit_remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'audit_remark', title: __('Audit_remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'audit_admin_id', title: __('Audit_admin_id')}, // {field: 'audit_admin_id', title: __('Audit_admin_id')},
{field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'delete_time', title: __('Delete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'auditadmin.username', title: __('Admin.username'), operate: 'LIKE'},
{field: 'admin.id', title: __('Admin.id')}, {field: 'auditadmin.nickname', title: __('Admin.nickname'), operate: 'LIKE'},
{field: 'admin.username', title: __('Admin.username'), operate: 'LIKE'},
{field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate,
{field: 'admin.password', title: __('Admin.password'), operate: 'LIKE'}, formatter: Table.api.formatter.operate,
{field: 'admin.salt', title: __('Admin.salt'), operate: 'LIKE'},
{field: 'admin.avatar', title: __('Admin.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image}, buttons: [
{field: 'admin.email', title: __('Admin.email'), operate: 'LIKE'}, {
{field: 'admin.mobile', title: __('Admin.mobile'), operate: 'LIKE'}, name: 'edit',
{field: 'admin.loginfailure', title: __('Admin.loginfailure')}, text:"审核",
{field: 'admin.logintime', title: __('Admin.logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, title:"审核",
{field: 'admin.loginip', title: __('Admin.loginip'), operate: 'LIKE'}, icon: 'fa fa-pencil',
{field: 'admin.createtime', title: __('Admin.createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, //title: __('Edit'),
{field: 'admin.updatetime', title: __('Admin.updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, extend: 'data-toggle="tooltip" data-container="body"',
{field: 'admin.token', title: __('Admin.token'), operate: 'LIKE'}, classname: 'btn btn-xs btn-success btn-editone',
{field: 'admin.status', title: __('Admin.status'), operate: 'LIKE', formatter: Table.api.formatter.status}, visible:function(row){
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} if(row.status == 50){
return true;
}
return false;
}
}
],
}
] ]
] ]
}); });