bug

application/admin/controller/Orders.php

@@ -1588,13 +1588,13 @@ class Orders extends Auth {
                     ->join('user u', 'u.id = t.to_user_id')
                     ->where('t.todo_mode', 'in', [1, 2, 3, 4])
                     ->where('t.del', 0)
-                    ->field('u.real_name,t.create_time,t.confirm_time')
+                    ->field('u.real_name,u.mobile,t.create_time,t.confirm_time')
                     ->order('t.id asc')
                     ->select();
                 $users = [];
                 $confirmtime = '';
                 foreach ($todo as $kk => $vv) {
-                    $users[] = $vv['real_name'];
+                    $users[] = $vv['real_name'].($vv['mobile']?'['.$vv['mobile'].']':'');
                     if (!$confirmtime && $vv['confirm_time']) {
                         $confirmtime = $vv['confirm_time'];
                     }
@@ -1607,6 +1607,9 @@ class Orders extends Auth {
                 $v['is_todo'] = $todo?1:0;
                 $v['real_names'] = implode(',', $users);
                 $v['confirm_time'] = $confirmtime;
+
+
+
                 $last = strtotime($v['ywc_time']) - time();
                 $v['last_time'] = $last > 0 ? round($last / 60) : 0;
                 //是否有延时
@@ -1669,6 +1672,20 @@ class Orders extends Auth {
                 $v['xtime'] = date('H:i', strtotime($v['xq_time']));
                 $v['stime'] = $v['send_time'] ? date('H:i', strtotime($v['send_time'])) : "";
                 $v['ctime'] = $v['confirm_time'] ? date('H:i', strtotime($v['confirm_time'])) : "";
+                $v['starttime'] = '';
+                if($v['confirm_time']){ // 如果确认时间不为空
+                    $todoconvey = Db::name('todo_convey')
+                        ->alias('a')
+                        ->join('todo t','t.id = a.todo_id')
+                        ->where('t.order_id', $v['id'])
+                        ->field('a.*')
+                        ->order('a.id asc')
+                        ->find();
+                    if($todoconvey){
+                        $v['starttime'] = date('H:i', strtotime($todoconvey['start_time']));
+                    }
+                }
+
                 $v['priorityName'] = isset($this->model->priority[$v['priority']])?$this->model->priority[$v['priority']]:'';
                 if ($status == 3 && $v['delay'] == 1) { //延时任务
                     $newret[] = $v;

application/admin/view/orders/convey.html

@@ -269,6 +269,7 @@
                 {label:'需求',name:'xtime',index:'xtime',width:40,sortable: false},
                 {label:'派工',name:'stime',index:'stime',width:40,sortable: false},
                 {label:'接受',name:'ctime',index:'ctime',width:40,sortable: false},
+                {label:'开始',name:'starttime',index:'starttime',width:40,sortable: false},
                 {label:'优先级',name:'priorityName',index:'priorityName',width:60,editable: false,sortable: false,formatter: function (a, b, c) {
                         if(c.priority==3){
                             return "<span class='label' style='color: red'>"+a+"</span><img src='/admin/img/jj.png' style='width: 20px !important;height: 20px !important;' alt=''>";