Merge branch 'zjl_commit_20200526'

app/Http/Controllers/OrderController.php

@@ -895,8 +895,11 @@ Class OrderController extends Controller
                 $url = Config('website.api_domain').'order/tempSaveOrder';    
             } else {
                 $auditor_role     = $request->input('auditor_role', 1); // 当前操作人角色
+                $order_goods_type = $request->input('order_goods_type', 1);
 
+                if ($order_goods_type == 1) {
                     $resData['status'] = $auditor_role == 3 ? 1 : 2; // 角色为‘查看自己’时，状态为待审核，否则为待付款
+                }
 
                 $url = Config('website.api_domain').'order/changeOrder';
             }

public/js/refund.js

@@ -387,7 +387,7 @@
                 $('.return_num').keyup(function() {
                     var removal_number = parseInt($(this).parents('tr').find('.removal_number').val()); // 出库数量
                     var single_pre_price = parseFloat($(this).parents('tr').find('.single_pre_price').val()); // 均摊单价
-                    var pay_amount = $('.pay_amount').val();
+                    var pay_amount = parseFloat($('.pay_amount').val());
                     var val = $(this).val(); // 退货数量
 
                     if (val > removal_number) {

resources/views/changeOrder/content.blade.php

@@ -486,7 +486,7 @@
 @include('changeOrder.addGoodsNoSkuid')
 
 <script>
-    var is_manager       = "{{ in_array($role, [1, 2]) ? true : false }}"; 
+    var is_manager       = "{{ in_array($role, [1, 2, 5]) ? true : false }}"; 
 
     var isNewClient      = "{{isset($isNewClient) ? $isNewClient : 0}}"; 
     // var order_amount  = "{{$order_info['order_amount']}}"; 

resources/views/orderlist/content.blade.php

@@ -330,8 +330,6 @@
                             <td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td>
                             <td>
                                 <div class="btn-group btn-group-xs" style="width: 260px;">
-	                                    <a class="btn btn-primary" href="{{URL('details', ['order_id'=>$v['order_id']])}}" target="_blank">详情</a>
-
                                         @if (in_array('check_order', $userPerms) && $v['sale_id'])
                                             @if ($v['status'] == 1) 
                                                 <a class="btn btn-success" href="{{URL('change', ['order_id'=>$v['order_id']])}}" target="_blank">人工审单</a>
@@ -341,7 +339,7 @@
                                         @endif
 
                                         <!-- 主管审核 -->
-                                        @if ($order_extend->is_manager_audit && in_array($role, [1, 2]) && $v['status'] == 1)
+                                        @if (isset($order_extend->is_manager_audit) && in_array($role, [1, 2]) && $v['status'] == 1)
                                             <a class="btn btn-danger manager-audit" data-id="{{$v['order_id']}}">主管审核</a>
                                         @endif
 
@@ -349,6 +347,8 @@
                                             <a class="btn btn-primary send_mail" data-id="{{ $v['order_id'] }}">发送邮件</a>        
                                         @endif
 
+	                                    <a class="btn btn-primary" href="{{URL('details', ['order_id'=>$v['order_id']])}}" target="_blank">详情</a>     
+                                        
                                         <!-- 管理员和经理或有推送权限显示 -->
                                         @if ((in_array($role, [1, 2]) || in_array('send_salesman', $userPerms)))
                                             <a class="btn btn-info" href="{{URL('sendSales', ['order_id'=>$v['order_id']])}}" target="_blank">推送</a>

resources/views/orderlist/js.blade.php

@@ -15,5 +15,5 @@
 <script src="/js/order_track.js"></script>
 <script src="/js/order_cancel.js"></script>
 <script src="/js/order_send_email.js"></script>
-
+<script src="/js/refund.js?v=<?= time() ?>"></script>