Browse Source

订单状态

sunhao 5 years ago
parent
commit
24320e180b

+ 63 - 4
app/Http/Controllers/Admin/CustReportController.php

@@ -11,6 +11,7 @@ use App\Http\Controllers\Controller;
11 11
 use App\Logs;
12 12
 use App\CustTotal;
13 13
 use App\CustDetail;
14
+use App\Oplog;
14 15
 use Illuminate\Http\Request;
15 16
 use Illuminate\Support\Facades\DB;
16 17
 
@@ -108,7 +109,17 @@ class custReportController extends Controller
108 109
         $custreport['dtime'] = $request->input('dtime'); 
109 110
         $custreport['team_id'] = $team_id; 
110 111
                 
111
-        $res = DB::table('cust_day_total')->insert($custreport);            
112
+        $res = DB::table('cust_day_total')->insertGetId($custreport); 
113
+        if($res){
114
+            #记录操作日志
115
+            $self_id = session('admin_id');
116
+            $self_name = session('real_name');
117
+            $context = "运营上报投放数据";
118
+            $type = 0; 
119
+            $tables = 'cust_day_total';
120
+            $data_id = $res;
121
+            Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
122
+        }           
112 123
         return redirect('/admin/custreport/totalindex')->with('info', '添加成功'); 
113 124
        
114 125
     }
@@ -161,7 +172,17 @@ class custReportController extends Controller
161 172
         $custreport['dtime'] = $request->input('dtime'); 
162 173
         $custreport['team_id'] = $team_id; 
163 174
 
164
-        $res = DB::table('cust_day_total')->where('id', $id)->update($custreport);        
175
+        $res = DB::table('cust_day_total')->where('id', $id)->update($custreport);
176
+        if($res){
177
+            #记录操作日志
178
+            $self_id = session('admin_id');
179
+            $self_name = session('real_name');            
180
+            $context = "修改运营上报数据";
181
+            $type = 0; 
182
+            $tables = 'cust_day_total';
183
+            $data_id = $id;
184
+            Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
185
+        }        
165 186
         return redirect('/admin/custreport/totalindex')->with('info', '更新成功');         
166 187
     }
167 188
 
@@ -175,6 +196,14 @@ class custReportController extends Controller
175 196
         $custreport = CustTotal::find($id);
176 197
         $custreport->is_del = 1;
177 198
         if ($custreport ->save()){
199
+            #记录操作日志
200
+            $self_id = session('admin_id');
201
+            $self_name = session('real_name');            
202
+            $context = "删除运营上报数据";
203
+            $type = 0; 
204
+            $tables = 'cust_day_total';
205
+            $data_id = $id;
206
+            Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
178 207
             return redirect('/admin/custreport/totalindex')->with('info', '删除成功');
179 208
         }
180 209
     }
@@ -393,7 +422,17 @@ class custReportController extends Controller
393 422
             $custreport['admin_name'] = session('real_name'); 
394 423
         }  
395 424
         $custreport['reporter_id'] = session('admin_id');
396
-        $res = DB::table('cust_day_detail')->insert($custreport);            
425
+        $res = DB::table('cust_day_detail')->insertGetId($custreport);   
426
+        if($res){
427
+            #记录操作日志
428
+            $self_id = session('admin_id');
429
+            $self_name = session('real_name');
430
+            $context = "销售上报加粉数据";
431
+            $type = 0; 
432
+            $tables = 'cust_day_detail';
433
+            $data_id = $res;
434
+            Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
435
+        }           
397 436
         return redirect('/admin/custreport/detailindex')->with('info', '添加成功'); 
398 437
        
399 438
     }
@@ -460,7 +499,17 @@ class custReportController extends Controller
460 499
             $custreport['admin_name'] = $admin_info->realname;
461 500
         } 
462 501
 
463
-        $res = DB::table('cust_day_detail')->where('id', $id)->update($custreport);        
502
+        $res = DB::table('cust_day_detail')->where('id', $id)->update($custreport);    
503
+        if($res){
504
+            #记录操作日志
505
+            $self_id = session('admin_id');
506
+            $self_name = session('real_name');            
507
+            $context = "修改销售上报数据";
508
+            $type = 0; 
509
+            $tables = 'cust_day_detail';
510
+            $data_id = $id;
511
+            Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
512
+        }      
464 513
         return redirect('/admin/custreport/detailindex')->with('info', '更新成功');         
465 514
     }
466 515
 
@@ -474,6 +523,16 @@ class custReportController extends Controller
474 523
         $custreport = CustDetail::find($id);
475 524
         $custreport->is_del = 1;
476 525
         if ($custreport ->save()){
526
+            
527
+            #记录操作日志
528
+            $self_id = session('admin_id');
529
+            $self_name = session('real_name');            
530
+            $context = "删除销售上报数据";
531
+            $type = 0; 
532
+            $tables = 'cust_day_detail';
533
+            $data_id = $id;
534
+            Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
535
+            
477 536
             return redirect('/admin/custreport/detailindex')->with('info', '删除成功');
478 537
         }
479 538
     }

+ 84 - 9
app/Http/Controllers/Admin/OrderController.php

@@ -10,6 +10,7 @@ namespace App\Http\Controllers\Admin;
10 10
 use App\Http\Controllers\Controller;
11 11
 use App\Logs;
12 12
 use App\Order;
13
+use App\Oplog;
13 14
 use Illuminate\Http\Request;
14 15
 use Illuminate\Support\Facades\DB;
15 16
 
@@ -55,8 +56,12 @@ class OrderController extends Controller
55 56
         $etime = $request->input('etime');
56 57
         $receiverName = trim($request->input('receiverName'));
57 58
         $receiverMobile = trim($request->input('receiverMobile'));
59
+        $status = $request->input('status');
60
+        if($status === null){
61
+            $status = -1;
62
+        }
58 63
 
59
-        $count = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids){
64
+        $count = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids, $status){
60 65
             if($admin_id) $query->where('admin_id', $admin_id);
61 66
             if($stime) $query->where('createTime', '>=', $stime);
62 67
             if($etime) $query->where('createTime', '<=', $etime);
@@ -64,6 +69,7 @@ class OrderController extends Controller
64 69
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
65 70
             if($self_role == '管理员') $query->where('status','>',0);
66 71
             if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
72
+            if(($status>=0)) $query->where('status', $status);
67 73
         })->where('is_del',0)->count();
68 74
         if ($count > 1) {
69 75
             // 总页数
@@ -73,7 +79,7 @@ class OrderController extends Controller
73 79
             $pages = 1;
74 80
         }
75 81
 
76
-        $result = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids){
82
+        $result = Order::where(function($query) use($admin_id, $stime, $etime, $receiverName, $receiverMobile, $self_role, $sale_ids, $status){
77 83
             if($admin_id) $query->where('admin_id', $admin_id);
78 84
             if($stime) $query->where('createTime', '>=', $stime);
79 85
             if($etime) $query->where('createTime', '<=', $etime);
@@ -81,6 +87,7 @@ class OrderController extends Controller
81 87
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
82 88
             if($self_role == '管理员') $query->where('status','>',0);
83 89
             if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
90
+            if(($status>=0)) $query->where('status', $status);
84 91
         })->where('is_del',0)->orderBy('id', 'desc')->offset($offset)->limit($pageSize)->get();
85 92
         $result = json_decode(json_encode($result),true);
86 93
         
@@ -133,6 +140,7 @@ class OrderController extends Controller
133 140
             'self_role'         =>$self_role,
134 141
             'receiverName'         =>$receiverName,
135 142
             'receiverMobile'       =>$receiverMobile,
143
+            'status'            =>$status,
136 144
             ]);
137 145
     }
138 146
 
@@ -257,7 +265,7 @@ class OrderController extends Controller
257 265
         $order = array();
258 266
         $order['eshopCode'] = '99|34881'; //默认
259 267
         $order['outerCode'] = Order::createOuterCode();//随机生成
260
-        //$order['status'] = '已审核待发货';
268
+        $order['status'] = (int)$request->input('status');
261 269
         $order['customerName'] = $request->input('customerName'); //买家名称
262 270
         $order['shippingType'] = '卖家包邮';
263 271
         $order['expressCompanyCode'] = '10084';
@@ -365,7 +373,22 @@ class OrderController extends Controller
365 373
                 $order['admin_name'] = session('real_name');
366 374
                 $order['team_id'] = session('team_id');
367 375
             }
368
-            DB::table('order')->insert($order);
376
+            $res = DB::table('order')->insertGetId($order);
377
+            if($res){
378
+                #记录操作日志
379
+                $self_id = session('admin_id');
380
+                $self_name = session('real_name');
381
+                if($order['status'] == 0){
382
+                    $status_text = '仅录入';
383
+                }else{
384
+                    $status_text = '录入并提审';
385
+                }
386
+                $context = "录入订单:".$status_text;
387
+                $type = 0; //订单录入
388
+                $tables = 'order';
389
+                $data_id = $res;
390
+                Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
391
+            }
369 392
             
370 393
             return redirect('/admin/order/index')->with('info', '添加成功'); 
371 394
         }
@@ -458,6 +481,7 @@ class OrderController extends Controller
458 481
         if(!empty($request->input('createTime'))) $order['createTime'] = $request->input('createTime'); // 订单创建时间
459 482
         $order['order_status'] = (int)$request->input('order_status');
460 483
         $order['payment_type'] = (int)$request->input('payment_type'); //支付方式
484
+        $order['status'] = (int)$request->input('status');
461 485
 
462 486
         $admin_id = (int)$request->input('admin_id');
463 487
         if($admin_id>0){
@@ -468,7 +492,17 @@ class OrderController extends Controller
468 492
         }
469 493
 
470 494
         $id = (int)$request->input('id');
471
-        $res = DB::table('order')->where('id', $id)->update($order);        
495
+        $res = DB::table('order')->where('id', $id)->update($order); 
496
+        if($res){
497
+            #记录操作日志
498
+            $self_id = session('admin_id');
499
+            $self_name = session('real_name');            
500
+            $context = "修改订单";
501
+            $type = 0; 
502
+            $tables = 'order';
503
+            $data_id = $id;
504
+            Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
505
+        }       
472 506
         return redirect('/admin/order/index?'.$str_query)->with('info', '更新成功');         
473 507
     }
474 508
 
@@ -482,6 +516,14 @@ class OrderController extends Controller
482 516
         $order = Order::find($id);
483 517
         $order->is_del = 1;
484 518
         if ($order ->save()){
519
+            #记录操作日志
520
+            $self_id = session('admin_id');
521
+            $self_name = session('real_name');            
522
+            $context = "删除订单";
523
+            $type = 0; 
524
+            $tables = 'order';
525
+            $data_id = $id;
526
+            Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
485 527
             return redirect('/admin/order/index')->with('info', '删除成功');
486 528
         }
487 529
     }
@@ -497,8 +539,31 @@ class OrderController extends Controller
497 539
 
498 540
     public function setverify($id, Request $request){
499 541
         $order = Order::find($id);
542
+        $old_status = $order->status;
500 543
         $order->status = (int)$request->input('status');
501
-        $order ->save();  
544
+        if($order->status == 0){
545
+            $refuse_reason = trim($request->input('refuse_reason'));
546
+            if(!empty($refuse_reason)){
547
+                $order->refuse_reason = $refuse_reason;
548
+            }
549
+        }
550
+        $res = $order ->save(); 
551
+        if($res){
552
+            #记录操作日志
553
+            $status_arr = array(
554
+                0 => '已录入(驳回)',
555
+                1 => '待审核',
556
+                2 => '已审核',
557
+                3 => '已发货',
558
+            );
559
+            $self_id = session('admin_id');
560
+            $self_name = session('real_name');
561
+            $context = "订单状态变更:【".$status_arr[$old_status]."】变更为【". $status_arr[$order->status]."】({$old_status}->{$order->status})";
562
+            $type = 1; //状态变更
563
+            $tables = 'order';
564
+            $data_id = $id;
565
+            Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
566
+        } 
502 567
 
503 568
         $stime = $request->input('stime');
504 569
         $etime = $request->input('etime');
@@ -638,8 +703,9 @@ class OrderController extends Controller
638 703
         $etime = $request->input('etime');
639 704
         $receiverName = $request->input('receiverName');
640 705
         $receiverMobile = $request->input('receiverMobile');
706
+        $status = (int)$request->input('status');
641 707
 
642
-        $result = Order::where(function($query) use($admin_id, $stime, $etime, $warehouse, $receiverMobile, $receiverName, $self_role, $sale_ids){
708
+        $result = Order::where(function($query) use($admin_id, $stime, $etime, $warehouse, $receiverMobile, $receiverName, $self_role, $sale_ids, $status){
643 709
             if($admin_id) $query->where('admin_id',  $admin_id);
644 710
             if($warehouse) $query->where('warehouse',  $warehouse);
645 711
             if($stime) $query->where('createTime', '>=', $stime);
@@ -648,6 +714,7 @@ class OrderController extends Controller
648 714
             if($receiverMobile) $query->where('receiverMobile', $receiverMobile);
649 715
             if($self_role == '管理员') $query->where('status','>',0);
650 716
             if(!empty($sale_ids)) $query->whereIn('admin_id', $sale_ids);
717
+            if($status>=0) $query->where('status',  $status);
651 718
         })->where('is_del',0)->orderBy('id', 'desc')->get();
652 719
         $result = json_decode(json_encode($result),true);
653 720
 
@@ -880,6 +947,15 @@ class OrderController extends Controller
880 947
             $desc = '订单导入成功';
881 948
         }
882 949
 
950
+        #记录操作日志
951
+        $self_id = session('admin_id');
952
+        $self_name = session('real_name');            
953
+        $context = "仓管excel导入订单成本等信息 ".$desc;
954
+        $type = 0; 
955
+        $tables = 'order';
956
+        $data_id = $okStr;
957
+        Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
958
+
883 959
         return redirect('admin/order/warehouse')->with('info',$desc);
884 960
         
885 961
 
@@ -952,7 +1028,6 @@ class OrderController extends Controller
952 1028
             1 => ['status'=>1, 'name'=>'提交审核'],
953 1029
             2 => ['status'=>2, 'name'=>'审核通过'],
954 1030
             3 => ['status'=>3, 'name'=>'设为发货'],
955
-            10 => ['status'=>0, 'name'=>'审核驳回'],
956 1031
         ];
957 1032
         $status = (int)$status;
958 1033
         $result = array();
@@ -962,7 +1037,7 @@ class OrderController extends Controller
962 1037
                 break;
963 1038
             case '1':
964 1039
                 $result[] = $status_arr[2];
965
-                $result[] = $status_arr[10];
1040
+                $result[] = $status_arr[0];
966 1041
                 break;
967 1042
             case '2':
968 1043
                 $result[] = $status_arr[3];

+ 31 - 0
app/Oplog.php

@@ -0,0 +1,31 @@
1
+<?php
2
+/**
3
+ * Created by PhpStorm.
4
+ * User: Administrator
5
+ * Date: 2019/9/18
6
+ * Time: 15:07
7
+ */
8
+
9
+namespace App;
10
+use Illuminate\Database\Eloquent\Model;
11
+
12
+class Oplog extends Model
13
+{
14
+    public $timestamps = false;
15
+    protected $table = "Oplog";
16
+ 
17
+ 	/**
18
+ 	 * 记录操作
19
+ 	 * @param type 1订单状态变更 0其他
20
+ 	 */
21
+ 	public  static function addLog($admin_id, $admin_name, $context = '', $type=0, $tables = null, $data_id = null){
22
+ 		$params = array();
23
+ 		$params['type'] = $type;
24
+ 		$params['admin_id'] = $admin_id;
25
+ 		$params['admin_name'] = $admin_name;
26
+ 		$params['context'] = $context;
27
+ 		$params['tables'] = $tables;
28
+ 		$params['data_id'] = $data_id;
29
+ 		return Oplog::insert($params);
30
+ 	}
31
+}

+ 10 - 2
resources/views/order/ordercreate.blade.php

@@ -9,8 +9,9 @@
9 9
         </div>
10 10
     @endif
11 11
     <div class="page-container">
12
-        <form action="/admin/order/store" method="post" class="form form-horizontal" enctype="multipart/form-data">
12
+        <form id='order-form' action="/admin/order/store" method="post" class="form form-horizontal" enctype="multipart/form-data">
13 13
             <input type="hidden" name="_token" value="{{ csrf_token() }}" />
14
+            <input type="hidden" name="status" value="0" />
14 15
             
15 16
             <div class="row cl">
16 17
                 <label class="form-label col-xs-4 col-sm-2">
@@ -260,7 +261,8 @@
260 261
         
261 262
             <div class="row cl">
262 263
                 <div class="col-9 col-offset-2">
263
-                    <button class="btn btn-primary radius" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">&nbsp;&nbsp;提交&nbsp;&nbsp;</button>&nbsp;
264
+                    <button class="btn btn-primary radius" type="submit" value="&nbsp;&nbsp;保存&nbsp;&nbsp;">&nbsp;&nbsp;保存&nbsp;&nbsp;</button>&nbsp;
265
+                    <button class="btn btn-primary radius" type="" onclick="return to_verify()" value="&nbsp;&nbsp;保存并提审&nbsp;&nbsp;">&nbsp;&nbsp;保存并提审&nbsp;&nbsp;</button>&nbsp;
264 266
                     <button class="btn btn-default" type="reset" onclick="return_index();">&nbsp;&nbsp;返回&nbsp;&nbsp;</button>&nbsp;
265 267
                 </div>
266 268
             </div>
@@ -388,6 +390,12 @@
388 390
             }
389 391
         }
390 392
 
393
+        function to_verify(){
394
+            $("input[name=status]").val('1');
395
+            $("#order-form").submit();
396
+            return true;
397
+        }
398
+
391 399
 
392 400
     </script>
393 401
     </body>

+ 61 - 9
resources/views/order/orderlist.blade.php

@@ -24,11 +24,19 @@
24 24
                 <input id="receiverName" type="text"  class="input-text" style="width:8%;text-align:center" name="receiverName" value="{{$receiverName?$receiverName:''}}">
25 25
                 <input class="input-text" style="width:6%;text-align:center" type="text" value="收货人手机号"/>
26 26
                 <input id="receiverMobile" type="text"  class="input-text" style="width:8%;text-align:center" name="receiverMobile" value="{{$receiverMobile?$receiverMobile:''}}">
27
-               
27
+               <input class="input-text" style="width:6%;text-align:center" type="text" value="订单状态"/>
28
+                <select style="width:8%;text-align:center" id='status' name="status">
29
+                    <option value="-1" @if($status=='-1') selected @endif>-- 请选择--</option>
30
+                    @if($self_role !='管理员' )<option value="0" @if($status==0) selected @endif>已录入</option> @endif
31
+                    <option value="1" @if($status==1) selected @endif>待审核</option>
32
+                    <option value="2" @if($status==2) selected @endif>已审核</option>
33
+                    <option value="3" @if($status==3) selected @endif>已发货</option>
34
+
35
+                </select> 
28 36
                 <div style="float:right">
29 37
                     <a class="btn btn-primary radius" onclick="user_search()" href="javascript:;">搜索</a>
30 38
                     <a class="btn btn-primary radius" onclick="order_export()" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 导出订单</a>
31
-                    <a class="btn btn-primary radius" onclick="order_verify_more()" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 批量审核</a>
39
+                    <!--a class="btn btn-primary radius" onclick="order_verify_more()" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 批量审核</a-->
32 40
                 </div>
33 41
             </div>
34 42
         </div>
@@ -37,7 +45,7 @@
37 45
             <table class="table table-border table-bordered table-bg table-hover table-sort">
38 46
                 <thead>
39 47
                 <tr class="text-c">
40
-                    <th width="4%"><input type="checkbox" id="selected-all">订单编号</th>
48
+                    <th width="4%"><!--input type="checkbox" id="selected-all"-->订单编号</th>
41 49
                     <th width="4%">买家名称</th>
42 50
                     <th width="4%">收货人</th>
43 51
                     <th width="4%">收货人手机号</th>
@@ -55,6 +63,7 @@
55 63
                     <th width="4%">应该退补差价</th>                  
56 64
                     <th width="4%">所属销售</th> 
57 65
                     <th width="4%">订单状态</th>                  
66
+                    @if($self_role =='销售' )<th width="5%">驳回原因</th>@endif                  
58 67
                     <th width="3%">是否退款</th>                  
59 68
                     <th width="6%">买家备注</th>                  
60 69
                     <th width="6%">卖家备注</th>                  
@@ -65,7 +74,7 @@
65 74
                 @if($result)
66 75
                     @foreach($result as $a)
67 76
                         <tr class="text-c" style=" text-align:center;">                           
68
-                            <td><input type="checkbox" name="id[]" value="{{$a['id']}}"> {{$a['id']}}</td>                            
77
+                            <td><!--input type="checkbox" name="id[]" value="{{$a['id']}}"--> {{$a['id']}}</td>                            
69 78
                             <td>{{$a['customerName']}}</td>                            
70 79
                             <td>{{$a['receiverName']}}</td>                            
71 80
                             <td>{{$a['receiverMobile']}}</td>                                                                                    
@@ -98,6 +107,7 @@
98 107
                             <td>{{$a['refund_price']}}</td>
99 108
                             <td>{{$a['admin_name']}}</td>
100 109
                             <td id="order_verify{{$a['id']}}">{{$a['status_name']}}</td>
110
+                            @if($self_role =='销售' ) <td>@if($a['status'] == 0)<font color='red'> {{$a['refuse_reason']}} </font> @endif</td> @endif
101 111
                             <td id="refund{{$a['id']}}">@if($a['order_status']==2) <span class="btn btn-danger radius">退款</span> @else 正常<br><span class="btn btn-primary radius" onclick="order_refund({{$a['id']}})">设为退款</span> @endif</td> 
102 112
                             <td class ="change_logistics_id"> 
103 113
                                 <p id="buyerMemo_1{{$a['id']}}">{{$a['buyerMemo']}}</p> 
@@ -114,8 +124,8 @@
114 124
                             <td>
115 125
                                 @if($a['enable_status'])
116 126
                                     @foreach($a['enable_status'] as $item)
117
-                                        @if($item['status' == 0])
118
-                                            <a id="verify" style="text-decoration:none" onClick='order_verify("{{$a['id']}}", "{{$item['status']}}", "{{$item['name']}}")' href="javascript:;" title="{{$item['name']}}"><span class="btn btn-primary radius">{{$item['name']}}</span></a>
127
+                                        @if($item['status'] == 0)
128
+                                            <a id="verify_refuse" style="text-decoration:none" onClick='refuse_reason("{{$a['id']}}")' href="javascript:;" title="审核驳回"><span class="btn btn-danger radius">审核驳回</span></a>
119 129
                                         @else
120 130
                                             <a id="verify" style="text-decoration:none" onClick='order_verify("{{$a['id']}}", "{{$item['status']}}", "{{$item['name']}}")' href="javascript:;" title="{{$item['name']}}"><span class="btn btn-primary radius">{{$item['name']}}</span></a>
121 131
                                         @endif
@@ -136,6 +146,25 @@
136 146
                 </tbody>
137 147
             </table>
138 148
         </div>
149
+        <!--弹出层 推入分组-->
150
+        <div id="modal-demo1" class="modal fade" tabnonautomatic_index="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
151
+            <div class="modal-dialog">
152
+                <div class="modal-content radius">
153
+                    <div class="modal-body" style="height:150px">
154
+                        <div id="fa2">
155
+                            <p style="font-size:14px">驳回原因:</p>
156
+                            <input id='order_id' type='hidden' name='status' value=''/>
157
+                            <textarea style="height:75px;" cols="85"  id='refuse_reason'></textarea>
158
+                        </div>
159
+         
160
+                        <div style="float:right">
161
+                            <button class="btn btn-primary radius" onclick='verify_refuse()' value="&nbsp;&nbsp;确定&nbsp;&nbsp;">&nbsp;&nbsp;确定&nbsp;&nbsp;</button>&nbsp;
162
+                            <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
163
+                        </div>
164
+                    </div>
165
+                </div>
166
+            </div>
167
+        </div>
139 168
         <div id="page" class="page_div"></div>
140 169
     </div>
141 170
     
@@ -188,8 +217,9 @@
188 217
             var etime = $('#etime').val();
189 218
             var receiverName = $('#receiverName').val();
190 219
             var receiverMobile = $('#receiverMobile').val();
220
+            var status = $('#status').val();
191 221
             //var page = {{$page}};
192
-            location.href = 'index?admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
222
+            location.href = 'index?admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile+'&status='+status;
193 223
         }
194 224
         //导出
195 225
         function order_export(){
@@ -198,7 +228,8 @@
198 228
             var etime = $('#etime').val();
199 229
             var receiverName = $('#receiverName').val();
200 230
             var receiverMobile = $('#receiverMobile').val();
201
-            location.href = '/admin/order/order_export?admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
231
+            var status = $('#status').val();
232
+            location.href = '/admin/order/order_export?admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile+'&status='+status;
202 233
         }
203 234
 
204 235
         function change_logistics_click(id, logistics_id){
@@ -326,6 +357,26 @@
326 357
             location.href = '/admin/order/setverifymore?'+ids+'&page='+page+'&admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
327 358
         }
328 359
 
360
+        /*弹出层-填写原因*/
361
+        function refuse_reason(id) {
362
+            $("#order_id").val(id);
363
+            $("#modal-demo1").modal("show");
364
+        }
365
+
366
+        function verify_refuse(){
367
+            var reason = $("#refuse_reason").val();
368
+            var id = $("#order_id").val();
369
+            var status = 0;
370
+            var admin_id = $('#admin_id').val();
371
+            var stime = $('#stime').val();
372
+            var etime = $('#etime').val();
373
+            var receiverName = $('#receiverName').val();
374
+            var receiverMobile = $('#receiverMobile').val();
375
+            var page = {{$page}};
376
+            var str_query = 'page='+page+'&admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
377
+            location.href = '/admin/order/setverify/'+id+'?status='+status+'&refuse_reason='+reason+'&'+str_query; 
378
+        }
379
+
329 380
          $(".change_logistics_id").mouseover(
330 381
             function(){
331 382
                 $(this).children("span").show();
@@ -350,7 +401,8 @@
350 401
                 var etime = $('#etime').val();
351 402
                 var receiverName = $('#receiverName').val();
352 403
                 var receiverMobile = $('#receiverMobile').val();
353
-                location.href = 'index?page='+num+'&admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile;
404
+                var status = $('#status').val();
405
+                location.href = 'index?page='+num+'&admin_id='+admin_id+'&stime='+stime+'&etime='+etime+'&receiverName='+receiverName+'&receiverMobile='+receiverMobile+'&status='+status;
354 406
             }
355 407
         })
356 408