Merge branch 'master' of https://github.com/java110/MicroCommunity

ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java

@@ -5,6 +5,7 @@ import com.java110.core.component.AbstractComponentSMO;
 import com.java110.core.context.IPageData;
 import com.java110.entity.component.ComponentValidateResult;
 import com.java110.report.smo.fee.IListPayFeeSMO;
+import com.java110.utils.constant.FeeTypeConstant;
 import com.java110.utils.constant.PrivilegeCodeConstant;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.exception.SMOException;
@@ -50,10 +51,18 @@ public class ListPayFeeSMOImpl extends AbstractComponentSMO implements IListPayF
         int page = paramIn.getInteger("page");
         int row = paramIn.getInteger("row");
         paramIn.put("storeId", result.getStoreId());
-        paramIn.put("page",(page-1)*row);
-        paramIn.put("row",page*row);
-
-        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPayFee" + mapToUrlParam(paramIn);
+        paramIn.put("page", (page - 1) * row);
+        paramIn.put("row", page * row);
+
+        String apiUrl = "";
+        if (!paramIn.containsKey("feeTypeCd") || FeeTypeConstant.FEE_TYPE_PROPERTY.equals(paramIn.getString("feeTypeCd"))) {
+            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPropertyPayFee" + mapToUrlParam(paramIn);
+        } else if (FeeTypeConstant.FEE_TYPE_HIRE_PARKING_SPACE.equals(paramIn.getString("feeTypeCd"))) {
+            paramIn.put("feeTypeCd", "");
+            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
+        }else{
+            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
+        }
 
 
         ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",

ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.html

@@ -14,7 +14,7 @@
                     <div class="row">
                         <div class="col-sm-4">
                             <select class="custom-select" v-model="payFeeManageInfo.conditions.feeTypeCd">
-                                <option selected value="">请选择费用类型</option>
+                                <option value="888800010006">停车费</option>
                                 <option v-for="(item,index) in payFeeManageInfo.payFeeTypes" :key="index" v-bind:value="item.statusCd">{{item.name}}</option>
                             </select>
                         </div>

ReportComponent/src/main/resources/components/feePackage/fee-manage/payFeeManage.js

@@ -15,7 +15,7 @@
                 name: '',
                 conditions: {
                     communityId: vc.getCurrentCommunity().communityId,
-                    feeTypeCd: '',
+                    feeTypeCd: '888800010001',
                     startTime: '',
                     endTime: '',
                     userCode:''

WebService/src/main/resources/components/itemOutPackage/itemOut-manage/itemOutManage.html

@@ -42,7 +42,7 @@
         </div>
     </div>
     <div class="row">
-        <div class="col-lg-12">
+        <div class="col-md-9">
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>物品信息</h5>
@@ -73,7 +73,11 @@
                             <td>{{resourceStore.price}}</td>
                             <td width="65">
                                 <input type="text" class="form-control" :placeholder="resourceStore.stock" v-model="resourceStore.stock">
+<!--                                <button class="btn btn-default" type="button" @click="_resourceStoreLess(resourceStore.stock)">-</button>-->
+                            </td>
+                            <td>
                                 <button class="btn btn-default" type="button" @click="_resourceStoreLess(resourceStore.stock)">-</button>
+
                             </td>
                             <td>
                                 <h4>
@@ -96,6 +100,38 @@
                 </div>
             </div>
         </div>
+        <div class="col-md-3">
+
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>物品摘要</h5>
+                </div>
+                <div class="ibox-content">
+                            <span>
+                                总价
+                            </span>
+                    <h2 class="font-bold">
+                        390,00 元
+                    </h2>
+
+                    <hr/>
+                </div>
+            </div>
+
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>当前申请人</h5>
+                </div>
+                <div class="ibox-content text-center">
+
+
+                    <h3><i class="fa fa-adn"></i> 系统登陆人</h3>
+                    <h3><i class="fa fa-dashcube"></i> 登陆时间</h3>
+                </div>
+            </div>
+
+
+        </div>
     </div>