Browse Source

应收实收

sunhao 5 years ago
parent
commit
92f6b2730a

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

560
         $order['sellerMemo'] = trim($request->input('sellerMemo', '')); // 卖家备注
560
         $order['sellerMemo'] = trim($request->input('sellerMemo', '')); // 卖家备注
561
         $order['createTime'] = !empty($request->input('createTime')) ? $request->input('createTime') : date('Y-m-d H:i:s'); // 订单创建时间
561
         $order['createTime'] = !empty($request->input('createTime')) ? $request->input('createTime') : date('Y-m-d H:i:s'); // 订单创建时间
562
         $order['modifyTime'] = date('Y-m-d H:i:s'); // 订单修改时间
562
         $order['modifyTime'] = date('Y-m-d H:i:s'); // 订单修改时间
563
+        $order['should_amount'] = $request->input('should_amount');
564
+        if(!$order['should_amount']) $order['should_amount'] = null;
563
 
565
 
564
         //商品信息
566
         //商品信息
565
         $skus = $request->input('skus');
567
         $skus = $request->input('skus');
806
         $order['order_status'] = (int)$request->input('order_status');
808
         $order['order_status'] = (int)$request->input('order_status');
807
         $order['payment_type'] = (int)$request->input('payment_type'); //支付方式
809
         $order['payment_type'] = (int)$request->input('payment_type'); //支付方式
808
         //$order['status'] = (int)$request->input('status');
810
         //$order['status'] = (int)$request->input('status');
811
+        $order['should_amount'] = $request->input('should_amount');
812
+        if(!$order['should_amount']) $order['should_amount'] = null;
809
 
813
 
810
         $admin_id = (int)$request->input('admin_id');
814
         $admin_id = (int)$request->input('admin_id');
811
         if($admin_id>0){
815
         if($admin_id>0){

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

169
                     
169
                     
170
                 </div>
170
                 </div>
171
                
171
                
172
-            </div><br>
172
+            </div><br>       
173
+
174
+            <div class="row cl">
175
+                <label class="form-label col-xs-4 col-sm-2">
176
+                    应收金额:</label>
177
+                <div class="formControls col-xs-6 col-sm-6">
178
+                    <span id='should_amount_show'>{{old('should_amount')}}</span>
179
+                    <input id='should_amount' type="hidden" class="input-text" value="{{old('should_amount')}}" placeholder="" name="should_amount">
180
+                </div>
181
+            </div>
173
 
182
 
174
             <div class="row cl">
183
             <div class="row cl">
175
                 <label class="form-label col-xs-4 col-sm-2">
184
                 <label class="form-label col-xs-4 col-sm-2">
176
-                    <font color='red'>* </font>付款金额:</label>
185
+                    <font color='red'>* </font>实收金额:</label>
177
                 <div class="formControls col-xs-6 col-sm-6">
186
                 <div class="formControls col-xs-6 col-sm-6">
178
                     <input id='receivedAmount' type="text" class="input-text" value="{{old('receivedAmount')}}" placeholder="" name="receivedAmount">
187
                     <input id='receivedAmount' type="text" class="input-text" value="{{old('receivedAmount')}}" placeholder="" name="receivedAmount">
179
                 </div>
188
                 </div>
413
             });
422
             });
414
 
423
 
415
             if(total>0){
424
             if(total>0){
416
-                $("#receivedAmount").val(total);
425
+                $("#should_amount").val(total);
426
+                $("#should_amount_show").html(total);
417
             }else{
427
             }else{
418
-                $("#receivedAmount").val('');
428
+                $("#should_amount").val('');
429
+                $("#should_amount_show").html('');
419
             }
430
             }
420
             return false;
431
             return false;
421
         }
432
         }
665
         }
676
         }
666
         var receivedAmount = $("input[name=receivedAmount]").val();
677
         var receivedAmount = $("input[name=receivedAmount]").val();
667
         if(!receivedAmount){
678
         if(!receivedAmount){
668
-            layer.msg('付金额不能为空!',{icon:2,time:1500});
679
+            layer.msg('付金额不能为空!',{icon:2,time:1500});
669
             return false;
680
             return false;
670
         }
681
         }
671
         if(isNaN(receivedAmount)){
682
         if(isNaN(receivedAmount)){
672
-            layer.msg('付金额必须为数字!',{icon:2,time:1500});
683
+            layer.msg('付金额必须为数字!',{icon:2,time:1500});
673
             return false;
684
             return false;
674
         }
685
         }
675
         //验证称重>0.5
686
         //验证称重>0.5

+ 16 - 4
resources/views/order/orderedit.blade.php

183
                 
183
                 
184
             </div><br>
184
             </div><br>
185
 
185
 
186
+            <div class="row cl">
187
+                <label class="form-label col-xs-4 col-sm-2">
188
+                   应收金额:</label>
189
+                <div class="formControls col-xs-6 col-sm-6">
190
+                    <span id='should_amount_show'>{{$order['should_amount']}}</span>
191
+                    <input id='should_amount' type="hidden" class="input-text" value="{{$order['should_amount']}}" placeholder="" name="should_amount">
192
+                </div>
193
+            </div>
194
+
186
             @if( $order['status']>1 && $self_role !='超级管理员')
195
             @if( $order['status']>1 && $self_role !='超级管理员')
187
                 <div class="row cl">
196
                 <div class="row cl">
188
                     <label class="form-label col-xs-4 col-sm-2">
197
                     <label class="form-label col-xs-4 col-sm-2">
189
-                        <font color='red'>* </font>付款金额:</label>
198
+                        <font color='red'>* </font>付金额:</label>
190
                     <div class="formControls col-xs-6 col-sm-6">
199
                     <div class="formControls col-xs-6 col-sm-6">
191
                         <input type="text"  class="input-text" value="{{$order['receivedAmount']}}" placeholder="" readonly />
200
                         <input type="text"  class="input-text" value="{{$order['receivedAmount']}}" placeholder="" readonly />
192
                         <input type="hidden" id='receivedAmount' class="input-text" value="{{$order['receivedAmount']}}" name="receivedAmount"/>
201
                         <input type="hidden" id='receivedAmount' class="input-text" value="{{$order['receivedAmount']}}" name="receivedAmount"/>
193
                     </div>
202
                     </div>
194
                 </div>
203
                 </div>
195
             @else
204
             @else
205
+
196
             <div class="row cl">
206
             <div class="row cl">
197
                 <label class="form-label col-xs-4 col-sm-2">
207
                 <label class="form-label col-xs-4 col-sm-2">
198
-                    <font color='red'>* </font>付金额:</label>
208
+                    <font color='red'>* </font>付金额:</label>
199
                 <div class="formControls col-xs-6 col-sm-6">
209
                 <div class="formControls col-xs-6 col-sm-6">
200
                     <input type="text" id='receivedAmount' class="input-text" value="{{$order['receivedAmount']}}" placeholder="" name="receivedAmount">
210
                     <input type="text" id='receivedAmount' class="input-text" value="{{$order['receivedAmount']}}" placeholder="" name="receivedAmount">
201
                 </div>
211
                 </div>
416
             });
426
             });
417
 
427
 
418
             if(total>0){
428
             if(total>0){
419
-                $("#receivedAmount").val(total);
429
+                $("#should_amount").val(total);
430
+                $("#should_amount_show").html(total);
420
             }else{
431
             }else{
421
-                $("#receivedAmount").val('');
432
+                $("#should_amount").val('');
433
+                $("#should_amount_show").html('');
422
             }
434
             }
423
             return false;
435
             return false;
424
         }
436
         }