Browse Source

审核通过的订单可以反审

sunhao 5 years ago
parent
commit
7e660f43ba

+ 1 - 0
app/Http/Controllers/Admin/OrderController.php

@@ -1807,6 +1807,7 @@ class OrderController extends Controller
1807 1807
                 $result[] = $status_arr[0];
1808 1808
                 break;
1809 1809
             case '2':
1810
+                $result[] = $status_arr[0];
1810 1811
                 $result[] = $status_arr[3];
1811 1812
                 break;
1812 1813
             default:               

+ 12 - 2
resources/views/order/orderlist.blade.php

@@ -247,8 +247,12 @@
247 247
                             <td>
248 248
                                 @if($a['enable_status'])
249 249
                                     @foreach($a['enable_status'] as $item)
250
-                                        @if($item['status'] == 0)
250
+                                        @if($item['status'] == 0 && $a['status'] == 1)
251 251
                                             <a id="verify_refuse" style="text-decoration:none" onClick='refuse_reason("{{$a['id']}}")' href="javascript:;" title="审核驳回"><span class="btn btn-danger radius">审核驳回</span></a>
252
+                                        @elseif($item['status'] == 0 && $a['status'] == 2 )
253
+                                            @if( ($self_role == '超级管理员' || $self_role =='售后管理员') && !$a['orderCode'])
254
+                                            <a id="verify_refuse2" style="text-decoration:none" onClick='refuse_reason2("{{$a['id']}}")' href="javascript:;" title="反审"><span class="btn btn-danger radius">反审</span></a>
255
+                                            @endif
252 256
                                         @else
253 257
                                             <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>
254 258
                                         @endif
@@ -295,7 +299,7 @@
295 299
                 <div class="modal-content radius">
296 300
                     <div class="modal-body" style="height:150px">
297 301
                         <div id="fa2">
298
-                            <p style="font-size:14px">驳回原因:</p>
302
+                            <p style="font-size:14px">驳回/反审原因:</p>
299 303
                             <input id='order_id' type='hidden' name='status' value=''/>
300 304
                             <textarea style="height:75px;" cols="85"  id='refuse_reason'></textarea>
301 305
                         </div>
@@ -807,6 +811,12 @@
807 811
             $("#modal-demo1").modal("show");
808 812
         }
809 813
 
814
+        /*弹出层-填写原因*/
815
+        function refuse_reason2(id) {
816
+            $("#order_id").val(id);
817
+            $("#modal-demo1").modal("show");
818
+        }
819
+
810 820
         function verify_refuse(){
811 821
             var reason = $("#refuse_reason").val();
812 822
             var id = $("#order_id").val();