加入临时车

WebService/src/main/java/com/java110/web/components/fee/ConfigParkingSpaceTempFeeComponent.java

@@ -0,0 +1,40 @@
+package com.java110.web.components.fee;
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.IFeeServiceSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ClassName ViewPropertyFeeConfigComponent
+ * @Description 展示物业费信息
+ * @Author wuxw
+ * @Date 2019/6/1 14:33
+ * @Version 1.0
+ * add by wuxw 2019/6/1
+ **/
+@Component("configParkingSpaceTempFee")
+public class ConfigParkingSpaceTempFeeComponent {
+
+    @Autowired
+    private IFeeServiceSMO feeServiceSMOImpl;
+
+    /**
+     * 修改费用
+     * @param pd 页面上数据封装
+     * @return ResponseEntity 对象
+     */
+    public ResponseEntity<String> change(IPageData pd) {
+        return feeServiceSMOImpl.saveOrUpdateParkingSpaceFeeConfig(pd);
+    }
+
+
+    public IFeeServiceSMO getFeeServiceSMOImpl() {
+        return feeServiceSMOImpl;
+    }
+
+    public void setFeeServiceSMOImpl(IFeeServiceSMO feeServiceSMOImpl) {
+        this.feeServiceSMOImpl = feeServiceSMOImpl;
+    }
+}

WebService/src/main/resources/components/feePackage/config-parking-space-temp-fee/configParkingSpaceTempFee.html

@@ -0,0 +1,27 @@
+ <div id = "configPropertyFeeModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b ">编辑临时停车费</h3>
+                <div class="ibox-content">
+                    <div>
+                        <div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">每小时单价</label>
+                                <div class="col-sm-10"><input v-model="changeFeeTempConfigInfo.squarePrice" type="text" placeholder="必填，请填写临时车每小时单价,如10.00" class="form-control"></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">首两个小时</label>
+                                <div class="col-sm-10"><input v-model="changeFeeTempConfigInfo.additionalAmount" type="text" placeholder="必填，请填写前两个小时费用，如200.00" class="form-control"></div>
+                            </div>
+                            <div class="ibox-content">
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveTempParkingSpaceConfigFee()" ><i class="fa fa-check"></i>&nbsp;保存</button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

WebService/src/main/resources/components/feePackage/config-parking-space-temp-fee/configParkingSpaceTempFee.js

@@ -0,0 +1,89 @@
+(function(vc,vm){
+
+    vc.extends({
+        data:{
+            changeFeeTempConfigInfo:{
+                configId:"",
+                squarePrice:"",
+                additionalAmount:""
+            }
+        },
+         _initMethod:function(){
+
+         },
+         _initEvent:function(){
+             vc.on('changeFeeTempConfigInfo','openConfigPropertyFeeModel',function(_params){
+                vc.copyObject(_params, vc.component.changeFeeTempConfigInfo);
+                $('#changeFeeTempConfigInfoModel').modal('show');
+            });
+        },
+        methods:{
+            /**
+                根据楼ID加载房屋
+            **/
+
+            changeFeeConfigValidate:function(){
+                        return vc.validate.validate({
+                            changeFeeTempConfigInfo:vc.component.changeFeeTempConfigInfo
+                        },{
+                            'changeFeeTempConfigInfo.squarePrice':[
+                                {
+                                    limit:"required",
+                                    param:"",
+                                    errInfo:"每小时单价不能为空"
+                                },
+                                {
+                                    limit:"money",
+                                    param:"",
+                                    errInfo:"必须是金额，如300.00"
+                                }
+                            ],
+                            'changeFeeTempConfigInfo.additionalAmount':[
+                                {
+                                    limit:"required",
+                                    param:"",
+                                    errInfo:"前两小时费用不能为空"
+                                },
+                                {
+                                    limit:"money",
+                                    param:"",
+                                    errInfo:"必须是金额，如300.00"
+                                },
+                            ],
+
+
+                        });
+             },
+            saveTempParkingSpaceConfigFee:function(){
+                if(!vc.component.changeFeeConfigValidate()){
+                    vc.toast(vc.validate.errInfo);
+                    return ;
+                }
+                vc.component.changeFeeTempConfigInfo.communityId = vc.getCurrentCommunity().communityId;
+                vc.http.post(
+                    'configParkingSpaceTempFee',
+                    'change',
+                    JSON.stringify(vc.component.changeFeeTempConfigInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#changeFeeTempConfigInfoModel').modal('hide');
+                            vc.emit('viewParkingSpaceFeeConfig','loadParkingSpaceConfigFee',vc.component.changeFeeConfigInfo);
+                            return ;
+                        }
+                        vc.message(json);
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+
+                        vc.message(errInfo);
+                     });
+            }
+        }
+    });
+
+})(window.vc,window.vc.component);

WebService/src/main/resources/components/feePackage/view-parkingSpace-fee-config/viewParkingSpaceFeeConfig.html

@@ -115,5 +115,75 @@
             </div>
         </div>
     </div>
+    <!------- 临时停车费 --------->
+    <div class="col-lg-12">
+        <div class="ibox ">
+            <div class="ibox-title">
+                <h5>{{feeConfigDownTempInfo.feeName}}信息</h5>
+                <div class="ibox-tools" style="top:10px;">
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="openConfigParkingSpaceTempFeeModel(feeConfigDownTempInfo)">
+                        <i class="glyphicon glyphicon-plus"></i> 编辑</button>
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >地下临时配置ID：</label>
+                            <label class="">{{feeConfigDownTempInfo.configId}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">每小时单价：</label>
+                            <label class="">{{feeConfigDownTempInfo.squarePrice}} 元</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >首两个小时：</label>
+                            <label class="">{{feeConfigDownTempInfo.additionalAmount}} 元</label>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-lg-12">
+        <div class="ibox ">
+            <div class="ibox-title">
+                <h5>{{feeConfigUpTempInfo.feeName}}信息</h5>
+                <div class="ibox-tools" style="top:10px;">
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="openConfigParkingSpaceTempFeeModel(feeConfigUpTempInfo)">
+                        <i class="glyphicon glyphicon-plus"></i> 编辑</button>
+                </div>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >地上临时配置ID：</label>
+                            <label class="">{{feeConfigUpTempInfo.configId}}</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label">每小时单价：</label>
+                            <label class="">{{feeConfigUpTempInfo.squarePrice}} 元</label>
+                        </div>
+                    </div>
+                    <div class="col-sm-4">
+                        <div class="form-group">
+                            <label class="col-form-label" >首两个小时：</label>
+                            <label class="">{{feeConfigUpTempInfo.additionalAmount}} 元</label>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
     <vc:create name="configParkingSpaceFee"></vc:create>
+    <vc:create name="configParkingSpaceTempFee"></vc:create>
 </div>

WebService/src/main/resources/components/feePackage/view-parkingSpace-fee-config/viewParkingSpaceFeeConfig.js

@@ -28,13 +28,29 @@
                 additionalAmount:"",
                 feeName:"出售地下停车费",
                 feeTypeCd:'888800010003'
-            }
+            },
+             feeConfigDownTempInfo:{
+                 configId:"",
+                 additionalAmount:"",
+                 squarePrice:"",
+                 feeName:"临时地下停车费",
+                 feeTypeCd:'888800010007'
+             },
+           feeConfigUpTempInfo:{
+               configId:"",
+               squarePrice:"",
+               additionalAmount:"",
+               feeName:"临时地上停车费",
+               feeTypeCd:'888800010008'
+           }
         },
         _initMethod:function(){
                 vc.component.loadParkingSpaceConfigFee(vc.component.feeConfigUpHireInfo);
                 vc.component.loadParkingSpaceConfigFee(vc.component.feeConfigDownHireInfo);
                 vc.component.loadParkingSpaceConfigFee(vc.component.feeConfigUpSellInfo);
                 vc.component.loadParkingSpaceConfigFee(vc.component.feeConfigDownSellInfo);
+                vc.component.loadParkingSpaceConfigFee(vc.component.feeConfigDownTempInfo);
+                vc.component.loadParkingSpaceConfigFee(vc.component.feeConfigUpTempInfo);
         },
         _initEvent:function(){
             vc.on('viewParkingSpaceFeeConfig','loadParkingSpaceConfigFee',function(_param){
@@ -46,8 +62,10 @@
 
             openConfigParkingSpaceFeeModel:function(_feeInfo){
                 vc.emit('configParkingSpaceFee','openConfigParkingSpaceFeeModel',_feeInfo);
-
             },
+            openConfigParkingSpaceTempFeeModel:function(_feeInfo){
+                vc.emit('changeFeeTempConfigInfo','openConfigPropertyFeeModel',_feeInfo);
+            }
             loadParkingSpaceConfigFee:function(_feeInfo){
                 var param = {
                     params:{
@@ -70,6 +88,10 @@
                                    vc.copyObject(JSON.parse(json), vc.component.feeConfigDownHireInfo);
                             }else if(_feeInfo.feeTypeCd == vc.component.feeConfigUpSellInfo.feeTypeCd){
                                    vc.copyObject(JSON.parse(json), vc.component.feeConfigUpSellInfo);
+                           }else if(_feeInfo.feeTypeCd == vc.component.feeConfigDownTempInfo.feeTypeCd){
+                                   vc.copyObject(JSON.parse(json), vc.component.feeConfigDownTempInfo);
+                            }else if(_feeInfo.feeTypeCd == vc.component.feeConfigUpTempInfo.feeTypeCd){
+                                   vc.copyObject(JSON.parse(json), vc.component.feeConfigUpTempInfo);
                             }else{
                                    vc.copyObject(JSON.parse(json), vc.component.feeConfigDownSellInfo);
                             }

java110-utils/src/main/java/com/java110/utils/constant/FeeTypeConstant.java

@@ -51,6 +51,18 @@ public class FeeTypeConstant {
     public static final String FEE_TYPE_HIRE_PARKING_SPACE = "888800010006";
 
 
+    /**
+     * 停车费 地下 临时车费用
+     */
+    public static final String FEE_TYPE_TEMP_DOWN_PARKING_SPACE = "888800010007";
+
+
+    /**
+     * 停车费 地上 临时车费用
+     */
+    public static final String FEE_TYPE_TEMP_UP_PARKING_SPACE = "888800010008";
+
+