Bläddra i källkod

费用配置查询错误处理

wuxw 7 år sedan
förälder
incheckning
8360f93a24

+ 4 - 1
WebService/src/main/resources/components/property-pay/propertyPay.js

@@ -8,6 +8,7 @@
                 receivedAmount:'0.00',
                 remark:'',
                 feeId:'',
+                feeTypeCd:'',
                 builtUpArea:'',
                 squarePrice:'',
                 additionalAmount:'',
@@ -34,6 +35,7 @@
 
                 $('#propertyPayModel').modal('show');
                 vc.component.propertyPayInfo.feeId = _params.feeId;
+                vc.component.propertyPayInfo.feeTypeCd = _params.feeTypeCd;
                 vc.component.propertyPayInfo.builtUpArea = _params.builtUpArea;
                 vc.component.propertyPayInfo.communityId = vc.getCurrentCommunity().communityId;
             });
@@ -142,7 +144,8 @@
                 var param = {
                     params:{
                         communityId:vc.getCurrentCommunity().communityId,
-                        configId:''
+                        configId:'',
+                        feeTypeCd: vc.component.propertyPayInfo.feeTypeCd
                     }
                 };
                 vc.http.get(

+ 2 - 0
WebService/src/main/resources/components/view-main-fee/viewMainFee.js

@@ -13,6 +13,7 @@
             mainFeeInfo:{
                 feeName:$props.feeName,
                 feeId:"",
+                feeTypeCd:'',
                 floorNum:"",
                 roomId:"",
                 roomNum:"",
@@ -50,6 +51,7 @@
             openPayModel:function(){
                 vc.emit($props.payName,'openPayModel',{
                     feeId:vc.component.mainFeeInfo.feeId,
+                    feeTypeCd:vc.component.mainFeeInfo.feeTypeCd,
                     builtUpArea:vc.component.mainFeeInfo.builtUpArea
                 });
             },

+ 1 - 1
WebService/src/main/resources/components/view-main-parkingSpace-fee/viewMainParkingSpaceFee.html

@@ -7,7 +7,7 @@
                     <button type="button" class="btn btn-primary btn-sm" v-on:click="openSearchParkingSpaceModel()">
                         <i class="glyphicon glyphicon-search"></i> 选择停车位</button>
                     <button type="button" class="btn btn-primary btn-sm"
-                            v-if="mainParkingSpaceFeeInfo.feeId != null && mainParkingSpaceFeeInfo.feeId != ''"
+                            v-if="mainParkingSpaceFeeInfo.feeId != null && mainParkingSpaceFeeInfo.feeId != '' &&  mainParkingSpaceFeeInfo.amount == '-1.00'"
                             style="margin-left:10px" v-on:click="openPayModel()">
                         <i class="glyphicon glyphicon-plus" ></i> 缴费</button>
                 </div>

+ 3 - 1
WebService/src/main/resources/components/view-main-parkingSpace-fee/viewMainParkingSpaceFee.js

@@ -12,6 +12,7 @@
             mainParkingSpaceFeeInfo:{
                 feeName:$props.feeName,
                 feeId:"",
+                feeTypeCd:"",
                 psId:"",
                 num:"",
                 typeCd:"",
@@ -47,7 +48,8 @@
             },
             openPayModel:function(){
                 vc.emit($props.payName,'openPayModel',{
-                    feeId:vc.component.mainParkingSpaceFeeInfo.feeId
+                    feeId:vc.component.mainParkingSpaceFeeInfo.feeId,
+                    feeTypeCd:vc.component.mainParkingSpaceFeeInfo.feeTypeCd
                 });
             },
             loadMainParkingSpaceFeeInfo:function(_parkingSPace){

+ 8 - 1
java110-bean/src/main/java/com/java110/vo/api/ApiMainFeeVo.java

@@ -13,7 +13,7 @@ import com.java110.vo.Vo;
 public class ApiMainFeeVo extends Vo {
 
     private String feeId;
-
+    private String feeTypeCd;
     private String startTime;
     private String endTime;
     private String amount;
@@ -52,4 +52,11 @@ public class ApiMainFeeVo extends Vo {
     }
 
 
+    public String getFeeTypeCd() {
+        return feeTypeCd;
+    }
+
+    public void setFeeTypeCd(String feeTypeCd) {
+        this.feeTypeCd = feeTypeCd;
+    }
 }