From 4fb456b6d95a6f0d450f3bf64a358baa327d91bd Mon Sep 17 00:00:00 2001
From: zengchaoxin <zengchaoxin@gmail.com>
Date: Mon, 14 Oct 2019 15:10:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=9D=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/controllers/GiftController.php |  5 ++-
 frontend/views/car/info-track.php       |  2 +-
 frontend/views/insurer/info.php         | 44 +++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/frontend/controllers/GiftController.php b/frontend/controllers/GiftController.php
index 24f9d55..394feac 100644
--- a/frontend/controllers/GiftController.php
+++ b/frontend/controllers/GiftController.php
@@ -800,6 +800,7 @@ class GiftController extends \yii\web\Controller
         $code = $request->get('code');
         $car_id = $request->get('car_id',0);
         $car_no = $request->get('car_no');
+        $order_id = $request->get('order_id');
         $username = $request->get('username');
         $s_begin_date = $request->get('s_begin_date');
         $s_end_date = $request->get('s_end_date');
@@ -825,10 +826,12 @@ class GiftController extends \yii\web\Controller
         if($car_id > 0) {
             $query->andWhere('order_t.car_id='.$car_id);
         }
+        if($order_id > 0) {
+            $query->andWhere('order_t.id='.$order_id);
+        }
         if($car_no != '') {
             $query->andWhere('gift_ticket_t_use.car_no like "'.$car_no.'"');
         }
-
         if($username != ''){
             $user = UserT::find()->where('username="'.$username.'"')->andWhere('is_delete=0')->one();
             $query->andWhere('gift_ticket_t_use.op_id='.$user->id);
diff --git a/frontend/views/car/info-track.php b/frontend/views/car/info-track.php
index 780ee24..8c395db 100644
--- a/frontend/views/car/info-track.php
+++ b/frontend/views/car/info-track.php
@@ -116,7 +116,7 @@ use \common\libs\MyLib;
     </div>
     <div class="ibox float-e-margins">
         <div class="ibox-title">
-            <h5>礼品信息</h5>
+            <h5>礼券信息</h5>
             <div class="ibox-tools">
                 <a class="btn btn-primary btn-xs edit-btn" data-id="0" href="javascript:void(0);" onclick="$('#giftTable').bootstrapTable('refresh');">
                     <i class="fa fa-refresh"></i> 刷新
diff --git a/frontend/views/insurer/info.php b/frontend/views/insurer/info.php
index 972036d..aeca0d8 100644
--- a/frontend/views/insurer/info.php
+++ b/frontend/views/insurer/info.php
@@ -188,6 +188,35 @@ use common\models\PriceT;
                 </table>
             </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="$('#giftTable').bootstrapTable('refresh');">
+                        <i class="fa fa-refresh"></i> 刷新
+                    </a>
+                </div>
+            </div>
+            <div class="ibox-content">
+                <table id="giftTable">
+                    <thead>
+                    <tr>
+                        <th width="50" data-field="id">ID</th>
+                        <th data-field="code">礼券编号</th>
+                        <th data-field="name">礼品</th>
+                        <th data-field="car_no">车牌号</th>
+                        <th data-field="car_frame_no">车架号</th>
+                        <th data-field="input_date">发放日期</th>
+                        <th data-field="end_date">有效期日期</th>
+                        <th data-field="submit_user">提单人</th>
+                        <th data-field="use_date">使用日期1</th>
+                        <th data-field="status">状态</th>
+                        <th data-field="username">操作员</th>
+                    </tr>
+                    </thead>
+                </table>
+            </div>
+        </div>
         <div class="ibox float-e-margins">
             <div class="ibox-title">
                 <h5>其他信息</h5>
@@ -257,6 +286,20 @@ use common\models\PriceT;
             return false;
         }
     }
+    function searchGifts() {
+        $('#giftTable').bootstrapTable('destroy');
+        $('#giftTable').bootstrapTable({
+            url: "/gift/ticket-use-json",
+            pagination: true,
+            sidePagination: 'server',
+            queryParams: function(params) {
+                o['order_id'] = '<?=$order_info->id?>';
+                o['limit'] = params['limit'];
+                o['offset'] = params['offset'];
+            }
+        });
+        return false;
+    }
     //保存订单
     function saveOrder(status_id) {
         var params = $('#orderFrm').serialize();
@@ -287,6 +330,7 @@ use common\models\PriceT;
 
     $(function() {
         searchOps();
+        searchGifts();
         $('.btn-return').click(function(){
             var remark = $('#return_remark').val();
             if(remark === '') {