From d60a123a4642f66c2d5db4936d30c2a9fdeb558d Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Mon, 20 Jun 2022 17:49:42 +0800
Subject: [PATCH] owners_620_5

---
 admin/controllers/receiver/Owners.php | 7 ++++++-
 admin/views/receiver/owners/lists.php | 8 +++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/admin/controllers/receiver/Owners.php b/admin/controllers/receiver/Owners.php
index 57b231ed..3bd708d2 100644
--- a/admin/controllers/receiver/Owners.php
+++ b/admin/controllers/receiver/Owners.php
@@ -117,6 +117,7 @@ class Owners extends HD_Controller
                     'car_num' => $val['car_num'],
                     'order_time' => $val['order_time'] != '0000-00-00 00:00:00' ? $val['order_time'] : '',
                     'ck_time' => $val['ck_time'] != '0000-00-00 00:00:00' ? $val['ck_time'] : '',
+                    'u_time' => $val['u_time'],
                 );
             }
         }
@@ -147,6 +148,7 @@ class Owners extends HD_Controller
         $info['order_time'] = $row['order_time'] != '0000-00-00 00:00:00' ? $row['order_time'] : '';
         $info['ck_time'] = $row['ck_time'] != '0000-00-00 00:00:00' ? $row['ck_time'] : '';
         $info['c_time'] = date('Y-m-d H:i:s', $row['c_time']);
+        $info['birth_day'] = $row['birth_day'] != '0000-00-00' ? $row['birth_day'] : '';
         $info['tag'] = $this->get_tag($row['id']);
         //操作日志
         $rows_log = $this->mdOwnersOplogs->select(['own_id' => $id], 'id desc', 0, 0);
@@ -379,8 +381,11 @@ class Owners extends HD_Controller
         $birth_year = date('Y', strtotime($birthday));
         $birth_month = date('m', strtotime($birthday));
         $birth_day = date('d', strtotime($birthday));
+        if (!$birthday || $birthday == '0000-00-00') {
+            return '';
+        }
         if (empty($birth_year) || empty($birth_month) || empty($birth_day)) {
-            return 0;
+            return '';
         }
         $current_year = date('Y', time());
         $current_month = date('m', time());
diff --git a/admin/views/receiver/owners/lists.php b/admin/views/receiver/owners/lists.php
index 2fd7fdba..790dc72d 100644
--- a/admin/views/receiver/owners/lists.php
+++ b/admin/views/receiver/owners/lists.php
@@ -95,8 +95,9 @@
                 <th width="8%"><span>车牌号</span></th>
                 <th width="5%"><span>性别</span></th>
                 <th width="5%"><span>年龄</span></th>
-                <th width="10%"><span>购车时间</span></th>
-                <th width="10%"><span>交付时间</span></th>
+                <th width="9%"><span>购车时间</span></th>
+                <th width="9%"><span>交付时间</span></th>
+                <th width="9%"><span>最后操作时间</span></th>
             </tr>
             </thead>
             <tbody>
@@ -111,9 +112,10 @@
                     <td>{{v.age}}</td>
                     <td>{{v.order_time}}</td>
                     <td>{{v.ck_time}}</td>
+                    <td>{{v.u_time}}</td>
                 </tr>
                 <tr>
-                    <td colspan="9">
+                    <td colspan="10">
                         <div class="row">
                             <div class="col-md-4 align-l">
                             </div>