Accept Merge Request #205: (feature/hant -> develop)
Merge Request: 完成时间 Created By: @todayswind Accepted By: @todayswind URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/205?initial=true
This commit is contained in:
commit
1858dcecca
|
|
@ -166,6 +166,7 @@ class Order extends Backend
|
|||
'plan_time',
|
||||
'coupon_id',
|
||||
'create_time',
|
||||
'audit_time',
|
||||
'total',
|
||||
'online_amount',
|
||||
'aftersale_id'
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@ class Dispatch extends Backend
|
|||
if(!empty($existDispatch)){
|
||||
$this->error('该订单已经派单,不可重复操作');
|
||||
}
|
||||
sleep(2);
|
||||
|
||||
$insert = [
|
||||
'admin_id' => $this->auth->id,
|
||||
|
|
|
|||
|
|
@ -227,10 +227,17 @@ ${data.receive_type == 1 ? '已收定金' : '已收全款'}
|
|||
events: Table.api.events.image,
|
||||
formatter: Table.api.formatter.images
|
||||
},
|
||||
// {
|
||||
// field: 'update_time',
|
||||
// title: __('Update_time'),
|
||||
// operate: false,
|
||||
// addclass: 'datetimerange',
|
||||
// autocomplete: false
|
||||
// },
|
||||
{
|
||||
field: 'update_time',
|
||||
title: __('Update_time'),
|
||||
operate: false,
|
||||
field: 'audit_time',
|
||||
title: '完成时间',
|
||||
operate: 'RANGE',
|
||||
addclass: 'datetimerange',
|
||||
autocomplete: false
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user