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

审核

Browse Source
This commit is contained in:
xman 2025-04-18 17:25:28 +08:00
parent 9d055a1dfe
commit b5c9f6e29b
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ class Auditorder extends Backend
if($audit_status){
$params['status'] = Order::STATUS_FINISHED;
}else{
$params['status'] = Order::STATUS_CHECKING;
$params['status'] = Order::STATUS_CHECKONCE;
}
$params['audit_admin_id'] = $this->auth->id;

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

@ -109,7 +109,7 @@ class Configorder extends Backend
}
$params = $this->preExcludeFields($params);
if($row->status != Order::STATUS_CHECKING){
if(!in_array($row->status,[Order::STATUS_CHECKING,Order::STATUS_CHECKONCE])){
$this->error('订单不允许操作');
}
$result = false;

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

@ -49,7 +49,8 @@ class Order extends Model
const STATUS_DISPATCHING = 10; //待派单
const STATUS_DISPATCHED = 20; //已派单
//const STATUS_ING = 30; //进行中
const STATUS_CHECKING = 40; //待派单
const STATUS_CHECKING = 40; //待审核
const STATUS_CHECKONCE = 41; //审核未通过
const STATUS_AUDITING = 50; //审核中
const STATUS_FINISHED = 60; //已完成
const STATUS_CANCEL = -10; //取消
@ -61,7 +62,9 @@ class Order extends Model
{
return ['0' => __('Status 0'),'10' => __('Status 10'), '20' => __('Status 20'),
//'30' => __('Status 30'),
'40' => __('Status 40'), '50' => __('Status 50'), '60' => __('Status 60'), '-10' => __('Status -10')];
'40' => __('Status 40'),
'41' => __('Status 41'),
'50' => __('Status 50'), '60' => __('Status 60'), '-10' => __('Status -10')];
}
@ -146,7 +149,8 @@ class Order extends Model
self::STATUS_FINISHED
],
self::TAB_SETTING => [
self::STATUS_CHECKING
self::STATUS_CHECKING,
self::STATUS_CHECKONCE
],
];
return $tabStatus[$tab] ?? [];

6
public/assets/js/backend/orders/configorder.js
View File

@ -36,7 +36,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'dispatch.admin_user', title: __('Dispatch.admin_user'), operate: '='},
{field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"30":__('Status 30'),"40":__('Status 40'),"50":__('Status 50'),"60":__('Status 60'),"-10":__('Status -10')}, formatter: Table.api.formatter.status},
{field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"30":__('Status 30'),"40":__('Status 40'),"41":__('Status 41'),"50":__('Status 50'),"60":__('Status 60'),"-10":__('Status -10')}, formatter: Table.api.formatter.status},
{field: 'audit_remark', title: __('审核备注'), operate:false},
// {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},