m

resources/views/order/ordercreate.blade.php

@@ -121,15 +121,6 @@
                     <input type="text" class="input-text" value="{{old('receiverAddress')}}" placeholder="" name="receiverAddress">
                 </div>
             </div>
-            @if($self_role !='分销销售' && $self_role != '分销管理员' )
-            <div class="row cl">
-                <label class="form-label col-xs-4 col-sm-2">
-                    <font color='red'>* </font>商品信息：</label>
-                <div class="formControls col-xs-6 col-sm-6">
-                    <textarea class="textarea" placeholder="填写商品详细信息，A或B仓必填" name="goods_note">{{old('goods_note')}}</textarea>
-                </div>
-            </div>
-            @endif
 
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
@@ -139,16 +130,6 @@
                 </div>
             </div>
 
-            @if($self_role !='分销销售' && $self_role != '分销管理员' )
-            <div class="row cl">
-                <label class="form-label col-xs-4 col-sm-2">
-                    物流单号：</label>
-                <div class="formControls col-xs-6 col-sm-6">
-                    <input type="text" class="input-text" value="{{old('logistics_id')}}" placeholder="" name="logistics_id">
-                </div>
-            </div>
-            @endif
-
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
                     <font color='red'>* </font>发货仓库：</label>

resources/views/order/orderedit.blade.php

@@ -119,26 +119,6 @@
                 </div>
             </div>
 
-            @if($self_role !='分销销售' && $self_role != '分销管理员' )
-            @if( $order['status']>1 && $self_role !='超级管理员')
-                <div class="row cl">
-                    <label class="form-label col-xs-4 col-sm-2">
-                        <font color='red'>* </font>商品信息：</label>
-                    <div class="formControls col-xs-6 col-sm-6">
-                        <textarea class="textarea" placeholder="填写商品详细信息，A或B仓必填" readonly="true" >{{$order['goods_note']}}</textarea>
-                        <input type="hidden" name="goods_note" value="{{$order['goods_note']}}" />
-                    </div>
-                </div>
-            @else
-            <div class="row cl">
-                <label class="form-label col-xs-4 col-sm-2">
-                    <font color='red'>* </font>商品信息：</label>
-                <div class="formControls col-xs-6 col-sm-6">
-                    <textarea class="textarea" placeholder="填写商品详细信息，A或B仓必填" name="goods_note">{{$order['goods_note']}}</textarea>
-                </div>
-            </div>
-            @endif
-            @endif
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
                     <font color='red'>* </font>预发货时间：</label>
@@ -147,16 +127,6 @@
                 </div>
             </div>
 
-            @if($self_role !='分销销售' && $self_role != '分销管理员' )
-            <div class="row cl">
-                <label class="form-label col-xs-4 col-sm-2">
-                    物流单号：</label>
-                <div class="formControls col-xs-6 col-sm-6">
-                    <input type="text" class="input-text" value="{{$order['logistics_id']}}" placeholder="" name="logistics_id">
-                </div>
-            </div>
-            @endif
-
             @if($self_role == '超级管理员' || $self_role == '售后管理员')
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">

resources/views/order/orderlist.blade.php

@@ -111,7 +111,7 @@
                     @foreach($result as $a)
                         <tr class="text-c" style=" text-align:center;">                           
                             <td><!--input type="checkbox" name="id[]" value="{{$a['id']}}"--> {{$a['id']}}</td>                            
-                            <td>{{$a['orderCode']}}</td>                            
+                            <td>{{$a['outerCode']}}</td>                            
                             <td>{{$a['customerName']}}</td>                            
                             <td>{{$a['receiverName']}}</td>                            
                             <td>{{$a['receiverMobile']}}</td>