自营审单添加账期付款类型

app/Http/Controllers/OrderController.php

@@ -763,7 +763,7 @@ Class OrderController extends Controller
                 "change_extend_fee" => $request->input('change_extend_fee', ''),
                 "kefu_remark"       => $request->input('kefu_remark', ''),
             ];
-
+// dd(curlApi($url, $resData, "POST"));
             $temp = json_decode(curlApi($url, $resData, "POST"), true);
 
             return array('errcode'=>$temp['err_code'],'errmsg'=>$temp['err_msg']);

app/Model/OrderModel.php

@@ -175,8 +175,9 @@ class OrderModel extends Model
                     }
                 })
                 ->where(function ($query) use ($map) {
-                    // 线上订单
-                    if (isset($map['online_order'])) {
+                    if ($map['order_goods_type'] == 2) { // 自营获取线上、京东、象牙宝订单
+                        $query->whereIn('o.order_type', [1, 3, 4]); 
+                    } else if (isset($map['online_order'])) { // 线上订单
                         $query->where('o.order_type', '=', $map['online_order']);
                     } 
                 })

public/js/order.js

@@ -104,12 +104,12 @@
                             }
                         } else { // 自营
                             if (test_order.length) {
-                                if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type && !test_order.is(':checked')) {
+                                if (!order_contain && !time_start && !time_end && !order_pay_type && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type && !test_order.is(':checked')) {
                                     layer.msg('请选择筛选条件，再导出！');
                                     return false;
                                 }
                             } else {
-                                if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status  && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type) {
+                                if (!order_contain && !time_start && !time_end && !order_pay_type && !order_payment_mode && !order_status && !sale_type && !order_invoice_status  && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type) {
                                     layer.msg('请选择筛选条件，再导出！');
                                     return false;
                                 }
@@ -1252,13 +1252,16 @@
                 // }
                 
                 // 判断付款类型
-                if (order_pay_type == 1) {
+                if (order_pay_type == 1 || order_pay_type == 4) { // 全款和货到猎芯付款
                     $('.order_all_pay').attr('checked', true);
                     $('.order_advance_pay').parent('label').show();
-                } else if (order_pay_type == 2) {
+                } else if (order_pay_type == 2) { // 预付款
                     $('.order_advance_pay').attr('checked', true);
                     $('.order_advance_pay').parent('label').show();
                     $('.show-advance-pay').show(); // 定金模块
+                } else if (order_pay_type == 3) { // 账期
+                    $('.order_account_period').attr('checked', true);
+                    $('.show-pay-time').hide();
                 }
 
                 // 选择付款类型

resources/views/detail/changeOrder.blade.php

@@ -68,6 +68,16 @@
             </table>
             
             <hr/>
+            @else 
+            <table class="table table-bordered table-hover check-table">
+                <tr>
+                    <td class="check-table-title" width="20%">付款类型：</td>
+                    <td class="check-select">
+                        <label><input class="order_all_pay" type="radio" name="order_pay_type" value="1">全额付款</label>    
+                        <label><input class="order_account_period" type="radio" name="order_pay_type" value="3">账期</label>
+                    </td>
+                </tr>
+            </table>
             @endif
 
             <!-- 调价 -->

resources/views/selfOrder/content.blade.php

@@ -48,7 +48,16 @@
                                         </select>
                                     </dd>
                                 </dl>
-                                
+                                <dl>
+                                    <dt>付款类型：</dt>
+                                    <dd>
+                                        <select id="order_pay_type" name="order_pay_type" class="form-control order_pay_type selectpicker" title="全部">
+                                            <option value="">全部</option>
+                                            <option value="1">全款</option>
+                                            <option value="3">账期</option>
+                                        </select>
+                                    </dd>
+                                </dl>
                                 <dl>
                                     <dt>销售类型：</dt>
                                     <dd>
@@ -207,6 +216,7 @@
                     <th class="pl30">订单编号</th>
                     <th class="pl30">应付金额</th>
                     <th class="pl30">订单状态</th>               
+                    <th class="pl30">付款类型</th>               
                     <th class="pl30">销售类型</th>               
                     <th class="pl30">支付方式</th>                  
                     <th class="pl30">客服</th>                  
@@ -249,6 +259,8 @@
 									}
 								?>
                             </td>
+                            <td class="show-list"> {{ Config('params.order_pay_type')[$v['order_pay_type']] }} </td>
+
                             <td class="show-list">{{$v['sale_type'] == 1 ? '现卖' : '预售'}}</td>
 
                             <td class="show-list"><?php print_r(App\Http\Controllers\getPayName($v['order_id'])); ?></td>
@@ -425,7 +437,8 @@
     $('.order_source_pf').selectpicker('val', order_source_pf.split(',')).trigger("change");
     $('#order_invoice_status').selectpicker('val', order_invoice_status);
     $('#order_send').selectpicker('val', order_send);
-    $('.order_pay_type').selectpicker('val', order_pay_type.split(',')).trigger("change");
+    // $('.order_pay_type').selectpicker('val', order_pay_type.split(',')).trigger("change");
+    $('.order_pay_type').selectpicker('val', order_pay_type);
     $('.is_new').selectpicker('val', is_new.split(',')).trigger("change");
     $('.business_type').selectpicker('val', business_type.split(',')).trigger("change");