diff --git a/application/admin/controller/orders/Auditorder.php b/application/admin/controller/orders/Auditorder.php index 8c2412f..8f16bbd 100644 --- a/application/admin/controller/orders/Auditorder.php +++ b/application/admin/controller/orders/Auditorder.php @@ -55,7 +55,7 @@ class Auditorder extends Backend $list = $this->model ->scope('tab',Order::TAB_AUDIT) ->alias('order') - ->with(['admin']) + ->with(['auditadmin']) ->where($where) ->order($sort, $order) ->paginate($limit); diff --git a/application/admin/lang/zh-cn/orders/auditorder.php b/application/admin/lang/zh-cn/orders/auditorder.php index 4440ebd..f007435 100644 --- a/application/admin/lang/zh-cn/orders/auditorder.php +++ b/application/admin/lang/zh-cn/orders/auditorder.php @@ -17,8 +17,8 @@ return [ 'Set status to 40' => '设为待验收', 'Status 41' => '审核驳回', 'Set status to 41' => '设为审核驳回', - 'Status 50' => '待财务审核', - 'Set status to 50' => '设为待财务审核', + 'Status 50' => '待审核', + 'Set status to 50' => '设为待审核', 'Status 60' => '已完成', 'Set status to 60' => '设为已完成', 'Status -10' => '取消', diff --git a/application/admin/model/Order.php b/application/admin/model/Order.php index 7b22395..f560f0d 100644 --- a/application/admin/model/Order.php +++ b/application/admin/model/Order.php @@ -109,4 +109,8 @@ class Order extends Model public function phone(){ return $this->belongsTo(Phones::class,'work_tel_id',); } + + public function auditadmin(){ + return $this->belongsTo(Admin::class,'audit_admin_id',); + } } diff --git a/public/assets/js/backend/orders/auditorder.js b/public/assets/js/backend/orders/auditorder.js index da710cb..6c6ac20 100644 --- a/public/assets/js/backend/orders/auditorder.js +++ b/public/assets/js/backend/orders/auditorder.js @@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin index_url: 'orders/auditorder/index' + location.search, add_url: 'orders/auditorder/add', edit_url: 'orders/auditorder/edit', - del_url: 'orders/auditorder/del', + // del_url: 'orders/auditorder/del', multi_url: 'orders/auditorder/multi', import_url: 'orders/auditorder/import', 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: 'lng', title: __('Lng'), 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', title: __('Source')}, {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: 'cost', title: __('Cost'), operate:'BETWEEN'}, {field: 'performance', title: __('Performance'), operate:'BETWEEN'}, - {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_reason_id', title: __('Cancel_reason_id')}, + //{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_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: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'delete_time', title: __('Delete_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'admin.id', title: __('Admin.id')}, - {field: 'admin.username', title: __('Admin.username'), operate: 'LIKE'}, - {field: 'admin.nickname', title: __('Admin.nickname'), operate: 'LIKE'}, - {field: 'admin.password', title: __('Admin.password'), operate: 'LIKE'}, - {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}, - {field: 'admin.email', title: __('Admin.email'), operate: 'LIKE'}, - {field: 'admin.mobile', title: __('Admin.mobile'), operate: 'LIKE'}, - {field: 'admin.loginfailure', title: __('Admin.loginfailure')}, - {field: 'admin.logintime', title: __('Admin.logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'admin.loginip', title: __('Admin.loginip'), operate: 'LIKE'}, - {field: 'admin.createtime', title: __('Admin.createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'admin.updatetime', title: __('Admin.updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, - {field: 'admin.token', title: __('Admin.token'), operate: 'LIKE'}, - {field: 'admin.status', title: __('Admin.status'), operate: 'LIKE', formatter: Table.api.formatter.status}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + {field: 'auditadmin.username', title: __('Admin.username'), operate: 'LIKE'}, + {field: 'auditadmin.nickname', title: __('Admin.nickname'), operate: 'LIKE'}, + + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, + formatter: Table.api.formatter.operate, + + buttons: [ + { + name: 'edit', + text:"审核", + title:"审核", + icon: 'fa fa-pencil', + //title: __('Edit'), + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-success btn-editone', + visible:function(row){ + if(row.status == 50){ + return true; + } + return false; + } + } + ], + + } ] ] });