应收实收

app/Http/Controllers/Admin/OrderController.php

@@ -560,6 +560,8 @@ class OrderController extends Controller
         $order['sellerMemo'] = trim($request->input('sellerMemo', '')); // 卖家备注
         $order['createTime'] = !empty($request->input('createTime')) ? $request->input('createTime') : date('Y-m-d H:i:s'); // 订单创建时间
         $order['modifyTime'] = date('Y-m-d H:i:s'); // 订单修改时间
+        $order['should_amount'] = $request->input('should_amount');
+        if(!$order['should_amount']) $order['should_amount'] = null;
 
         //商品信息
         $skus = $request->input('skus');
@@ -806,6 +808,8 @@ class OrderController extends Controller
         $order['order_status'] = (int)$request->input('order_status');
         $order['payment_type'] = (int)$request->input('payment_type'); //支付方式
         //$order['status'] = (int)$request->input('status');
+        $order['should_amount'] = $request->input('should_amount');
+        if(!$order['should_amount']) $order['should_amount'] = null;
 
         $admin_id = (int)$request->input('admin_id');
         if($admin_id>0){

resources/views/order/ordercreate.blade.php

@@ -169,11 +169,20 @@
                     
                 </div>
                
-            </div><br>
+            </div><br>       
+
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    应收金额：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <span id='should_amount_show'>{{old('should_amount')}}</span>
+                    <input id='should_amount' type="hidden" class="input-text" value="{{old('should_amount')}}" placeholder="" name="should_amount">
+                </div>
+            </div>
 
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
-                    <font color='red'>* </font>付款金额：</label>
+                    <font color='red'>* </font>实收金额：</label>
                 <div class="formControls col-xs-6 col-sm-6">
                     <input id='receivedAmount' type="text" class="input-text" value="{{old('receivedAmount')}}" placeholder="" name="receivedAmount">
                 </div>
@@ -413,9 +422,11 @@
             });
 
             if(total>0){
-                $("#receivedAmount").val(total);
+                $("#should_amount").val(total);
+                $("#should_amount_show").html(total);
             }else{
-                $("#receivedAmount").val('');
+                $("#should_amount").val('');
+                $("#should_amount_show").html('');
             }
             return false;
         }
@@ -665,11 +676,11 @@
         }
         var receivedAmount = $("input[name=receivedAmount]").val();
         if(!receivedAmount){
-            layer.msg('付款金额不能为空!',{icon:2,time:1500});
+            layer.msg('实付金额不能为空!',{icon:2,time:1500});
             return false;
         }
         if(isNaN(receivedAmount)){
-            layer.msg('付款金额必须为数字!',{icon:2,time:1500});
+            layer.msg('实付金额必须为数字!',{icon:2,time:1500});
             return false;
         }
         //验证称重>0.5

resources/views/order/orderedit.blade.php

@@ -183,19 +183,29 @@
                 
             </div><br>
 
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                   应收金额：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <span id='should_amount_show'>{{$order['should_amount']}}</span>
+                    <input id='should_amount' type="hidden" class="input-text" value="{{$order['should_amount']}}" placeholder="" name="should_amount">
+                </div>
+            </div>
+
             @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>
+                        <font color='red'>* </font>实付金额：</label>
                     <div class="formControls col-xs-6 col-sm-6">
                         <input type="text"  class="input-text" value="{{$order['receivedAmount']}}" placeholder="" readonly />
                         <input type="hidden" id='receivedAmount' class="input-text" value="{{$order['receivedAmount']}}" name="receivedAmount"/>
                     </div>
                 </div>
             @else
+
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
-                    <font color='red'>* </font>付款金额：</label>
+                    <font color='red'>* </font>实付金额：</label>
                 <div class="formControls col-xs-6 col-sm-6">
                     <input type="text" id='receivedAmount' class="input-text" value="{{$order['receivedAmount']}}" placeholder="" name="receivedAmount">
                 </div>
@@ -416,9 +426,11 @@
             });
 
             if(total>0){
-                $("#receivedAmount").val(total);
+                $("#should_amount").val(total);
+                $("#should_amount_show").html(total);
             }else{
-                $("#receivedAmount").val('');
+                $("#should_amount").val('');
+                $("#should_amount_show").html('');
             }
             return false;
         }