sunhao 5 years ago
parent
commit
564fa1ac91

+ 0 - 1
app/Http/Controllers/Admin/OrderController.php

@@ -503,7 +503,6 @@ class OrderController extends Controller
503 503
             return redirect('/admin/order/index')->with('info', $msg);
504 504
         }
505 505
         $res = RedisModel::expire( $redisKey, 60 );
506
-
507 506
         $skus = $request->input('skus');
508 507
         $warehouse = (int)$request->input('warehouse');
509 508
         if($warehouse == 3 && empty($skus)){

+ 93 - 17
resources/views/order/ordercreate.blade.php

@@ -61,7 +61,7 @@
61 61
                 <label class="form-label col-xs-4 col-sm-2">
62 62
                     <font color='red'>* </font>加粉时间:</label>
63 63
                 <div class="formControls col-xs-6 col-sm-6">
64
-                    <input id="stime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:22%;text-align:center;" name="fanTime" value="">                    
64
+                    <input id="stime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:22%;text-align:center;" name="fanTime" value="{{old('fanTime')}}">                    
65 65
                 </div>
66 66
             </div>
67 67
 
@@ -117,7 +117,7 @@
117 117
                 <label class="form-label col-xs-4 col-sm-2">
118 118
                     <font color='red'>* </font>预发货时间:</label>
119 119
                 <div class="formControls col-xs-6 col-sm-6">
120
-                    <input id="delivery" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:22%;text-align:center;" name="delivery_date" value=""> <font color='red'> *默认今天 </font>                  
120
+                    <input id="delivery" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" class="input-text Wdate" style="width:22%;text-align:center;" name="delivery_date" value="{{old('delivery_date')}}"> <font color='red'> *默认今天 </font>                  
121 121
                 </div>
122 122
             </div>
123 123
 
@@ -157,7 +157,7 @@
157 157
             <div class="row cl">
158 158
                 <label class="form-label col-xs-4 col-sm-2"><font color='red'>* </font>搜索选择商品:</label>
159 159
                 <div class="formControls col-xs-6 col-sm-6">
160
-                    <input type='text' class="input-text" autocomplete="off" name='goods_name' placeholder="输入关键词搜索商品,C仓必须选择" value=''/> 
160
+                    <input type='text' class="input-text" autocomplete="off" name='goods_name' placeholder="输入关键词搜索商品,C仓必须选择" value="{{old('goods_name')}}"/> 
161 161
                     <ul id="good_sku"></ul>
162 162
                 </div>               
163 163
             </div><br>
@@ -223,7 +223,7 @@
223 223
                 <label class="form-label col-xs-4 col-sm-2">
224 224
                     <font color='red'>* </font>下单时间:</label>
225 225
                 <div class="formControls col-xs-6 col-sm-6">
226
-                    <input id="createTime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" class="input-text Wdate" style="width:22%;text-align:center;" name="createTime" value=""> <font color='red'> *默认今天 </font>                  
226
+                    <input id="createTime" type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss' })" class="input-text Wdate" style="width:22%;text-align:center;" name="createTime" value="{{old('createTime')}}"> <font color='red'> *默认今天 </font>                  
227 227
                 </div>
228 228
             </div>
229 229
 
@@ -487,6 +487,9 @@
487 487
         }
488 488
 
489 489
         function to_verify(){
490
+            if(!form_verify()){
491
+                return false;
492
+            } 
490 493
             $("input[name=status]").val('1');
491 494
             var warehouse = $("#warehouse").val();
492 495
             if(warehouse == 3){
@@ -502,21 +505,24 @@
502 505
             return true;
503 506
         }
504 507
 
505
-	function to_submit(){            
506
-            $("input[name=status]").val('0');
507
-            //console.log('disabled1')
508
-            var warehouse = $("#warehouse").val();
509
-            if(warehouse == 3){
510
-                var if_good = $('.gnums');
511
-                if(!if_good.length){
512
-                    layer.msg('仓库C必须选择商品!',{icon:2,time:1000});
513
-                    return false;
514
-                }
508
+	function to_submit(){     
509
+        if(!form_verify()){
510
+            return false;
511
+        }       
512
+        $("input[name=status]").val('0');
513
+        //console.log('disabled1')
514
+        var warehouse = $("#warehouse").val();
515
+        if(warehouse == 3){
516
+            var if_good = $('.gnums');
517
+            if(!if_good.length){
518
+                layer.msg('仓库C必须选择商品!',{icon:2,time:1000});
519
+                return false;
515 520
             }
516
-            $(".btn").attr("disabled",true);
517
-            $("#order-form").submit();
518
-            return true;
519 521
         }
522
+        $(".btn").attr("disabled",true);
523
+        $("#order-form").submit();
524
+        return true;
525
+    }
520 526
 
521 527
     $('input[name=goods_name]').on('keyup focus', function(){
522 528
         var name = $('input[name=goods_name]').val();
@@ -556,6 +562,76 @@
556 562
         document.getElementById('good_sku').style.display='none'
557 563
      })
558 564
 
565
+     function form_verify(){
566
+        var customerName = $("input[name=customerName]").val();
567
+        if(!customerName){
568
+            layer.msg('买家姓名不能为空!',{icon:2,time:1000});
569
+            return false;
570
+        }
571
+        var receiverName = $("input[name=receiverName]").val();
572
+        if(!receiverName){
573
+            layer.msg('收件人姓名不能为空!',{icon:2,time:1000});
574
+            return false;
575
+        }
576
+        var receiverMobile = $("input[name=receiverMobile]").val();
577
+        if(!receiverMobile){
578
+            layer.msg('收件人手机号不能为空!',{icon:2,time:1000});
579
+            return false;
580
+        }
581
+        var preg = /^1[3456789]\d{9}$/;
582
+        if(!preg.test(receiverMobile)){
583
+            layer.msg('收件人手机号格式有误!',{icon:2,time:1000});
584
+            return false;
585
+        }
586
+        var fanTime = $("input[name=fanTime]").val();
587
+        if(!fanTime){
588
+            layer.msg('加粉时间不能为空!',{icon:2,time:1000});
589
+            return false;
590
+        }
591
+        var receiverState = $("input[name=receiverState]").val();
592
+        if(!receiverState){
593
+            layer.msg('省份不能为空!',{icon:2,time:1000});
594
+            return false;
595
+        }
596
+        var receiverCity = $("input[name=receiverCity]").val();
597
+        if(!receiverCity){
598
+            layer.msg('城市不能为空!',{icon:2,time:1000});
599
+            return false;
600
+        }
601
+        var receiverAddress = $("input[name=receiverAddress]").val();
602
+        if(!receiverAddress){
603
+            layer.msg('详细地址不能为空!',{icon:2,time:1000});
604
+            return false;
605
+        }
606
+        var delivery_date = $("input[name=delivery_date]").val();
607
+        if(!delivery_date){
608
+            layer.msg('预发货时间不能为空!',{icon:2,time:1000});
609
+            return false;
610
+        }
611
+        var createTime = $("input[name=createTime]").val();
612
+        if(!createTime){
613
+            layer.msg('下单时间不能为空!',{icon:2,time:1000});
614
+            return false;
615
+        }
616
+        var warehouse = $("#warehouse").val();
617
+        if(warehouse<1){
618
+            layer.msg('仓库必须选择!',{icon:2,time:1000});
619
+            return false;
620
+        }
621
+        var receivedAmount = $("input[name=receivedAmount]").val();
622
+        if(!receivedAmount){
623
+            layer.msg('付款金额不能为空!',{icon:2,time:1000});
624
+            return false;
625
+        }
626
+        if(isNaN(receivedAmount)){
627
+            layer.msg('付款金额必须为数字!',{icon:2,time:1000});
628
+            return false;
629
+        }
630
+
631
+        return true;
632
+
633
+     }
634
+
559 635
     </script>
560 636
     </body>
561 637
 @endsection