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

Accept Merge Request #205: (feature/hant -> develop)

Browse Source 
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:
todayswind 2025-07-02 13:53:20 +08:00 committed by Coding
commit 1858dcecca
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,6 +166,7 @@ class Order extends Backend
'plan_time', 'plan_time',
'coupon_id', 'coupon_id',
'create_time', 'create_time',
'audit_time',
'total', 'total',
'online_amount', 'online_amount',
'aftersale_id' 'aftersale_id'

1
application/admin/controller/orders/Dispatch.php
View File

@ -149,6 +149,7 @@ class Dispatch extends Backend
if(!empty($existDispatch)){ if(!empty($existDispatch)){
$this->error('该订单已经派单，不可重复操作'); $this->error('该订单已经派单，不可重复操作');
} }
sleep(2);
$insert = [ $insert = [
'admin_id' => $this->auth->id, 'admin_id' => $this->auth->id,

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

@ -227,10 +227,17 @@ ${data.receive_type == 1 ? '已收定金' : '已收全款'}
events: Table.api.events.image, events: Table.api.events.image,
formatter: Table.api.formatter.images formatter: Table.api.formatter.images
}, },
// {
// field: 'update_time',
// title: __('Update_time'),
// operate: false,
// addclass: 'datetimerange',
// autocomplete: false
// },
{ {
field: 'update_time', field: 'audit_time',
title: __('Update_time'), title: '完成时间',
operate: false, operate: 'RANGE',
addclass: 'datetimerange', addclass: 'datetimerange',
autocomplete: false autocomplete: false
}, },