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;
-
礼品信息
+
礼券信息
+
+ +
+ + + + + + + + + + + + + + + + +
ID礼券编号礼品车牌号车架号发放日期有效期日期提单人使用日期1状态操作员
+
+
其他信息
@@ -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'] = '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 === '') {