sunhao %!s(int64=5) %!d(string=před) roky
rodič
revize
5a199a5fab
1 změnil soubory, kde provedl 8 přidání a 2 odebrání
  1. 8 2
      resources/views/order/orderlist.blade.php

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

@@ -127,7 +127,7 @@
127 127
                             </td> 
128 128
                             <td>{{$a['delivery_date']}}</td> 
129 129
 
130
-                            @if($self_role =='销售' || $self_role =='分销销售' || ($self_role =='管理员' || $self_role =='分销管理员' && $a['status']>0) ) 
130
+                            @if($a['warehouse']==3 || $self_role =='销售' || $self_role =='分销销售' || ($self_role =='管理员' || $self_role =='分销管理员' && $a['status']>0) ) 
131 131
                             <td>{{$a['logistics_id']}}</td>
132 132
                             @else                          
133 133
                             <td class ="change_logistics_id"> 
@@ -136,14 +136,18 @@
136 136
                                 <span class="sort_icon" hidden  onClick='change_logistics_click("{{$a['id']}}","{{$a['logistics_id']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
137 137
                             </td>
138 138
                             @endif
139
+                            @if($a['warehouse']==3)
140
+                                <td>{{$a['send_time']}}</td>
141
+                            @else
139 142
                             <td class ="change_logistics_id"> 
140 143
                                 <p id="send_time_1{{$a['id']}}">{{$a['send_time']}}</p> 
141 144
                                 <input id="send_time_2{{$a['id']}}" style="display: none"  name='send_time' onblur="change_send_time({{$a['id']}})" value="{{$a['send_time']}}"  onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class=" Wdate" />
142 145
                                 <span class="sort_icon" hidden  onClick='change_send_time_click("{{$a['id']}}","{{$a['send_time']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
143 146
                             </td>
147
+                            @endif
144 148
                             
145 149
                             @if($self_role !='销售' )
146
-                            @if($self_role =='管理员' || $self_role =='分销管理员' && $a['status']>0)
150
+                            @if($a['warehouse']==3 || $self_role =='管理员' || $self_role =='分销管理员' && $a['status']>0)
147 151
                                 <td>{{$a['cost']}}</td>
148 152
                                 <td>{{$a['freight_cost']}}</td>
149 153
                             @else
@@ -267,6 +271,8 @@
267 271
 
268 272
                                 @if($self_role !='超级管理员' && $self_role !='售后管理员' && $a['status']>1 || $a['status']==4)
269 273
 
274
+                                @elseif($self_role =='售后管理员' && $a['status']==3)
275
+
270 276
                                 @else
271 277
                                 <a style="text-decoration:none" onClick='order_edit("编辑","{{$a['id']}}")' href="javascript:;" title="编辑"><span class="btn btn-primary radius">编辑</span></a> 
272 278
                                 @endif