加退补备注

app/Http/Controllers/Admin/OrderController.php

@@ -809,6 +809,7 @@ class OrderController extends Controller
         $cost = $request->input('cost');
         $freight_cost = $request->input('freight_cost');
         $send_note = trim($request->input('send_note'));
+        $refund_note = trim($request->input('refund_note'));
         $buyerMemo = $request->input('buyerMemo');
         $sellerMemo = $request->input('sellerMemo');
 
@@ -825,6 +826,7 @@ class OrderController extends Controller
         if(isset($buyerMemo)) $data['buyerMemo'] = $buyerMemo;
         if(isset($sellerMemo)) $data['sellerMemo'] = $sellerMemo;
         if(isset($send_note)) $data['send_note'] = $send_note;
+        if(isset($refund_note)) $data['refund_note'] = $refund_note;
         if($id>0 && !empty($data)){
             $res = Order::where('id', $id)->update($data);
         }

resources/views/order/orderlist.blade.php

@@ -60,13 +60,15 @@
                     <th width="4%">加粉时间</th>                   
                     <th width="2%">是否复购</th>                  
                     <th width="2%">是否退补单</th>                                                       
-                    <th width="4%">应该退补差价</th>                  
+                    <th width="4%">应该退补差价</th> 
+                    <th width="5%">退补备注</th>                 
                     <th width="4%">所属销售</th> 
                     <th width="4%">订单状态</th>                  
                     @if($self_role =='销售' )<th width="5%">驳回原因</th>@endif                  
                     <th width="3%">是否退款</th>                  
-                    <th width="6%">买家备注</th>                  
-                    <th width="6%">卖家备注</th>                  
+                    <th width="5%">买家备注</th>                  
+                    <th width="5%">卖家备注</th>                                                        
+                    <th width="5%">发货备注</th>                                                        
                     <th width="5%">操作</th>                 
                 </tr>
                 </thead>
@@ -105,6 +107,7 @@
                             <td>@if($a['is_fugou']==1) 是 @else 否 @endif</td>
                             <td>@if($a['is_refund']==1) 是 @else 否 @endif</td>
                             <td>{{$a['refund_price']}}</td>
+                            <td>{{$a['refund_note']}}</td>
                             <td>{{$a['admin_name']}}</td>
                             <td id="order_verify{{$a['id']}}">{{$a['status_name']}}</td>
                             @if($self_role =='销售' ) <td>@if($a['status'] == 0)<font color='red'> {{$a['refuse_reason']}} </font> @endif</td> @endif
@@ -120,7 +123,7 @@
                                 <input id="sellerMemo_2{{$a['id']}}" style="display: none" type='text' name='sellerMemo' value="{{$a['sellerMemo']}}" onblur="change_sellerMemo({{$a['id']}})" />
                                 <span class="sort_icon" hidden  onClick='change_sellerMemo_click("{{$a['id']}}","{{$a['cost']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
                             </td> 
-                                                                                                                                   
+                            <td>{{$a['send_note']}}</td>                                                                                                  
                             <td>
                                 @if($a['enable_status'])
                                     @foreach($a['enable_status'] as $item)

resources/views/order/warehouselist.blade.php

@@ -47,6 +47,7 @@
                     <th width="5%">货品成本</th>                  
                     <th width="5%">运费成本</th>                  
                     <th width="5%">发货备注</th>                  
+                    <th width="5%">退补备注</th>                  
                     <th width="6%">创建时间</th>                   
                    
                 </tr>
@@ -81,6 +82,11 @@
                                 <p id="send_note_1{{$a['id']}}">{{$a['send_note']}}</p> 
                                 <textarea id="send_note_2{{$a['id']}}" rows=4 style="display: none"  name='send_note' onblur="change_send_note({{$a['id']}})" >{{$a['send_note']}}</textarea>
                                 <span class="sort_icon" hidden  onClick='change_send_note_click("{{$a['id']}}","{{$a['send_note']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
+                            </td> 
+                            <td class ="change_logistics_id"> 
+                                <p id="refund_note_1{{$a['id']}}">{{$a['refund_note']}}</p> 
+                                <textarea id="refund_note_2{{$a['id']}}" rows=4 style="display: none"  name='refund_note' onblur="change_refund_note({{$a['id']}})" >{{$a['refund_note']}}</textarea>
+                                <span class="sort_icon" hidden  onClick='change_refund_note_click("{{$a['id']}}","{{$a['refund_note']}}")' style="cursor:pointer"><i class="Hui-iconfont">&#xe647;</i></span>
                             </td>                                                         
                             <td>{{$a['createTime']}}</td>                                                                                                          
                                                                                                                                                                  
@@ -257,6 +263,26 @@
             });
         }
 
+        function change_refund_note_click(id, refund_note){
+            $("#refund_note_1"+id).hide();
+            $("#refund_note_2"+id).show();
+            $("#refund_note_2"+id).focus();
+        }
+
+        function change_refund_note(id){
+            var refund_note = $("#refund_note_2"+id).val();
+            $.ajax({
+                url: '/admin/order/editLogisticsId?id='+id+'&refund_note='+refund_note,
+                type: 'get',
+                dateType: 'json',
+                success:function(msg){
+                    $("#refund_note_1"+id).html(refund_note);
+                    $("#refund_note_1"+id).show();
+                    $("#refund_note_2"+id).hide();
+                }
+            });
+        }
+
         //批量导入
         function importExcel(){
             $("#modal-demo1").modal("show");