合并远程信息

wuxw

2019-07-11 b3f85b60ba9e39572e686009d36b5e5d7e81e910

 WebService/src/main/resources/components/property-fee/propertyFee.html

@@ -1,7 +1,8 @@
<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
<div id="component" >
    <vc:create name="viewMainFee"
               feeName="物业费"
               feeTypeCd="888800010001"
               payName="propertyPay"
    ></vc:create>
    <div class="row">
        <div class="col-lg-12">
@@ -12,19 +13,22 @@
                <div class="ibox-content">

                    <div class="row">
                        <div class="col-sm-4 m-b-xs">
                            <input size="16" type="text" placeholder="请选择开始时间"  value="" readonly class="start_time">
                        <div class="col-sm-3 input-group">
                            <input size="16" type="text" placeholder="请选择开始时间"   readonly class="form-control form-control-sm start_time">
                        </div>
                        <div class="col-sm-3 m-b-xs">
                            <input size="16" type="text" placeholder="请选择结束时间"  value="" readonly class="end_time">
                        <div class="col-sm-2">

                        </div>
                        <div class="col-sm-3 input-group">
                            <input size="16" type="text" placeholder="请选择结束时间"  readonly class="form-control form-control-sm end_time">
                        </div>

                        <div class="col-sm-3">
                        <div class="col-sm-2">

                        </div>

                        <div class="col-sm-2">
                            <button type="button" class="btn btn-primary btn-sm" v-on:click="queryRoomMethod()">
                            <button type="button" class="btn btn-primary btn-sm" v-on:click="queryFeeDetailMethod()">
                                <i class="glyphicon glyphicon-search"></i> 马上查询</button>
                        </div>

@@ -33,54 +37,37 @@
                    <table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
                        <thead>
                        <tr>
                            <th>房屋ID</th>
                            <th data-hide="phone">房屋编号</th>
                            <th data-hide="phone">单元</th>
                            <th data-hide="phone">楼层</th>
                            <th data-hide="phone">房间数</th>
                            <th data-hide="phone" >户型</th>
                            <th data-hide="phone">建筑面积</th>
                            <th data-hide="phone">单价</th>
                            <th data-hide="phone">房屋状态</th>
                            <th data-hide="phone">创建员工</th>
                            <th data-hide="phone">备注</th>

                            <th>缴费ID</th>
                            <th data-hide="phone">周期</th>
                            <th data-hide="phone">应收金额</th>
                            <th data-hide="phone">实收金额</th>
                            <th data-hide="phone">打折率</th>
                            <th data-hide="phone" >备注</th>
                            <th data-hide="phone">缴费时间</th>
                        </tr>
                        </thead>
                        <tbody>
                        <tr v-for="room in roomInfo.rooms">
                        <tr v-for="feeDetail in feeDetailInfo.feeDetails">
                            <td>
                                {{room.roomId}}
                                {{feeDetail.detailId}}
                            </td>
                            <td>
                                {{room.roomNum}}
                                {{feeDetail.cycles}} 月
                            </td>
                            <td>
                                {{room.unitNum}}
                                {{feeDetail.receivableAmount}} 元
                            </td>
                            <td>
                                {{room.layer}}
                                {{feeDetail.receivedAmount}} 元
                            </td>
                            <td>
                                {{room.section}}
                                {{feeDetail.primeRate}}
                            </td>
                            <td>
                                {{room.apartment}}
                                {{feeDetail.remark}}
                            </td>
                            <td>
                                {{room.builtUpArea}}
                            </td>
                            <td>
                                {{room.unitPrice}}
                            </td>
                            <td>
                                {{vc.component.showState(room.state)}}
                            </td>
                            <td>
                                {{room.userName}}
                            </td>
                            <td>
                                {{room.remark}}
                                {{feeDetail.createTime}}
                            </td>
                        </tr>
                        </tbody>