From 73dc8edec505cefb017349b12ad215b240c20f60 Mon Sep 17 00:00:00 2001
From: zengchaoxin <zengchaoxin@gmail.com>
Date: Mon, 14 Oct 2019 15:20:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E8=BD=A6=E8=BE=86=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8E=86=E5=8F=B2=E4=BF=9D?=
 =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/controllers/CarController.php |  4 +--
 frontend/views/car/info-track.php      |  2 +-
 frontend/views/car/info.php            | 44 +++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/frontend/controllers/CarController.php b/frontend/controllers/CarController.php
index b5564d1..ade6612 100644
--- a/frontend/controllers/CarController.php
+++ b/frontend/controllers/CarController.php
@@ -5081,8 +5081,8 @@ class CarController extends BaseController
         $data['rows'] = [];
         foreach($items as $item) {
             $row = $item->toArray();
-            $row['username'] = $row->user ? $row->user->getShowName():'';
-            $row['status'] = $row->status->name;
+            $row['username'] = $item->user->getShowName();
+            $row['status'] = $item->status->name;
             $data['rows'][] = $row;
         }
 
diff --git a/frontend/views/car/info-track.php b/frontend/views/car/info-track.php
index 8c395db..dc15952 100644
--- a/frontend/views/car/info-track.php
+++ b/frontend/views/car/info-track.php
@@ -181,7 +181,7 @@ use \common\libs\MyLib;
         return opStr.join(' ');
     }
     function viewOrder(id) {
-        window.open('/car/order-view?id=' + id);
+        window.open('/insurer/info?id=' + id);
     }
     function searchGifts() {
         $('#giftTable').bootstrapTable('destroy');
diff --git a/frontend/views/car/info.php b/frontend/views/car/info.php
index 0c7ae0b..c054c81 100644
--- a/frontend/views/car/info.php
+++ b/frontend/views/car/info.php
@@ -164,6 +164,33 @@ use \common\libs\MyLib;
                 </form>
             </div>
         </div>
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>历史保单信息</h5>
+                <div class="ibox-tools">
+                    <a class="btn btn-primary btn-xs edit-btn" data-id="0" href="javascript:void(0);" onclick="$('#orderTable').bootstrapTable('refresh');">
+                        <i class="fa fa-refresh"></i> 刷新
+                    </a>
+                </div>
+            </div>
+            <div class="ibox-content">
+                <table id="orderTable">
+                    <thead>
+                    <tr>
+                        <th data-field="id">ID</th>
+                        <th data-field="id_man">被保险人</th>
+                        <th data-field="insurer1_begin_date">商业起保日期</th>
+                        <th data-field="insurer2_begin_date">交强起保日期</th>
+                        <th data-field="print_date">出单日期</th>
+                        <th data-field="total_all">共计签单</th>
+                        <th data-field="username">业务员</th>
+                        <th data-field="status">状态</th>
+                        <th data-formatter="orderFormatter">操作</th>
+                    </tr>
+                    </thead>
+                </table>
+            </div>
+        </div>
         <div class="ibox float-e-margins">
             <div class="ibox-title">
                 <h5>预约记录</h5>
@@ -203,7 +230,21 @@ use \common\libs\MyLib;
     <script src="/assets/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
     <script>
         var o = {};
-        function insurerDlg() {
+        function searchOrders() {
+            $('#orderTable').bootstrapTable('destroy');
+            $('#orderTable').bootstrapTable({
+                url: "/car/order-history-json",
+                pagination: true,
+                sidePagination: 'server',
+                multipleSelectRow: true,
+                queryParams: function(params) {
+                    o['car_id'] = '<?=$car_info->id?>';
+                    o['limit'] = params['limit'];
+                    o['offset'] = params['offset'];
+                    return o;
+                }
+            });
+        }        function insurerDlg() {
             title = '投保';
             layer_show(title, '/car/order-add?car_id=<?=$car_info->id?>');
         }
@@ -241,6 +282,7 @@ use \common\libs\MyLib;
 
         $(function() {
             search();
+            searchOrders();
             wsInit();
         });
     </script>