tts
This commit is contained in:
parent
6d6c11d2ab
commit
11c9e4c179
|
|
@ -320,6 +320,7 @@ class Order extends Backend
|
||||||
$params['create_time'] = date('Y-m-d H:i:s');
|
$params['create_time'] = date('Y-m-d H:i:s');
|
||||||
$params['update_time'] = date('Y-m-d H:i:s');
|
$params['update_time'] = date('Y-m-d H:i:s');
|
||||||
$params['receive_type'] = $params['receive_type']?: 1;
|
$params['receive_type'] = $params['receive_type']?: 1;
|
||||||
|
$params['audit_time'] = date('Y-m-d H:i:s');
|
||||||
|
|
||||||
$result = $this->model->allowField(true)->save($params);
|
$result = $this->model->allowField(true)->save($params);
|
||||||
$auth = clone $this->auth;
|
$auth = clone $this->auth;
|
||||||
|
|
@ -877,6 +878,9 @@ class Order extends Backend
|
||||||
|
|
||||||
unset($filter['area_id']);
|
unset($filter['area_id']);
|
||||||
|
|
||||||
|
if(isset($filter['audit_time'])){
|
||||||
|
$filter['status'] = \app\admin\model\Order::STATUS_FINISHED;
|
||||||
|
}
|
||||||
|
|
||||||
$filter = $filter ? $filter : [];
|
$filter = $filter ? $filter : [];
|
||||||
$where = [];
|
$where = [];
|
||||||
|
|
@ -909,6 +913,11 @@ class Order extends Backend
|
||||||
}
|
}
|
||||||
$index = 0;
|
$index = 0;
|
||||||
$op = (array)json_decode($op, true);
|
$op = (array)json_decode($op, true);
|
||||||
|
|
||||||
|
if(isset($filter['audit_time'])){
|
||||||
|
$op['status'] = '=';
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($filter as $k => $v) {
|
foreach ($filter as $k => $v) {
|
||||||
if ($k == 'user.nickname' || $k == 'is_timeout') continue;
|
if ($k == 'user.nickname' || $k == 'is_timeout') continue;
|
||||||
if (!preg_match('/^[a-zA-Z0-9_\-\.]+$/', $k)) {
|
if (!preg_match('/^[a-zA-Z0-9_\-\.]+$/', $k)) {
|
||||||
|
|
|
||||||
|
|
@ -167,7 +167,8 @@ class Order extends Model
|
||||||
self::STATUS_CHECKING,
|
self::STATUS_CHECKING,
|
||||||
self::STATUS_CHECKONCE,
|
self::STATUS_CHECKONCE,
|
||||||
self::STATUS_AUDITING,
|
self::STATUS_AUDITING,
|
||||||
self::STATUS_FINISHED
|
self::STATUS_FINISHED,
|
||||||
|
self::STATUS_AFTERSALE
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
return $tabStatus[$tab] ?? [];
|
return $tabStatus[$tab] ?? [];
|
||||||
|
|
|
||||||
|
|
@ -229,7 +229,14 @@ ${data.receive_type == 1 ? '已收定金' : '已收全款'}
|
||||||
title: '完成时间',
|
title: '完成时间',
|
||||||
operate: 'RANGE',
|
operate: 'RANGE',
|
||||||
addclass: 'datetimerange',
|
addclass: 'datetimerange',
|
||||||
autocomplete: false
|
autocomplete: false,
|
||||||
|
formatter: function (value, row, index) {
|
||||||
|
if (row.status === 60){
|
||||||
|
return value;
|
||||||
|
}else{
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user