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

sth

Browse Source
This commit is contained in:
xman 2025-06-02 15:19:53 +08:00
parent beaa0a32a9
commit c1ac4bf315
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
application/admin/controller/orders/Dispatchlog.php
View File

@ -63,11 +63,12 @@ class Dispatchlog extends Backend
->select(); ->select();
$firstLog = end($logs); $firstLog = end($logs);
if(!empty($logs)){
foreach ($orderLogs as $item) { foreach ($orderLogs as $item) {
if($item->order_status == 20 && $item->create_time <= $firstLog->create_time){ if($item->order_status == 20 && $item->create_time <= $firstLog->create_time){
$item->progress_logs = $logs; $item->progress_logs = $logs;
break; break;
}
} }
} }
$this->view->assign('logs',json_encode($orderLogs)); $this->view->assign('logs',json_encode($orderLogs));

4
public/assets/js/backend/orders/dispatch2.js
View File

@ -174,8 +174,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
},*/ },*/
{ {
name: 'dispatchlog', name: 'dispatchlog',
text:"日志", text:"查看轨迹图",
title:"变更日记", title:"查看轨迹图",
icon: 'fa fa-list', icon: 'fa fa-list',
url: function(row){ url: function(row){
return 'orders/dispatchlog/index?dispatch_id='+row.id; return 'orders/dispatchlog/index?dispatch_id='+row.id;