优化 交费明细，一次性费用时不展示 周期列数据

WebService/src/main/resources/components/feePackage/parkingSpace-fee/parkingSpaceFee.html

@@ -37,7 +37,7 @@
                         <thead>
                         <tr>
                             <th>缴费ID</th>
-                            <th data-hide="phone">周期</th>
+                            <th data-hide="phone" v-if="feeDetailInfo.amount != '-1.00'">周期</th>
                             <th data-hide="phone">应收金额</th>
                             <th data-hide="phone">实收金额</th>
                             <th data-hide="phone">打折率</th>
@@ -50,7 +50,7 @@
                             <td>
                                 {{feeDetail.detailId}}
                             </td>
-                            <td>
+                            <td v-if="feeDetailInfo.amount != '-1.00'">
                                 {{feeDetail.cycles}} 月
                             </td>
                             <td>

WebService/src/main/resources/components/feePackage/parkingSpace-fee/parkingSpaceFee.js

@@ -11,6 +11,7 @@
                 total:0,
                 records:1,
                 feeId:'',
+                amount:"-1.00",
                 startTime:'',
                 endTime:''
             }
@@ -21,6 +22,7 @@
         _initEvent:function(){
             vc.on('propertyFee','listFeeDetail',function(_param){
                   vc.component.feeDetailInfo.feeId = _param.feeId;
+                  vc.component.feeDetailInfo.amount = _param.amount;
                   vc.component.listFeeDetail(DEFAULT_PAGE,DEFAULT_ROW);
             });
 

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

@@ -79,9 +79,7 @@
                              function(json,res){
                                var _fee =JSON.parse(json);
                                vc.copyObject(_fee,vc.component.mainParkingSpaceFeeInfo);
-                               vc.emit('propertyFee','listFeeDetail',{
-                                    feeId:_fee.feeId
-                               });
+                               vc.emit('propertyFee','listFeeDetail',vc.component.mainParkingSpaceFeeInfo);
                              },function(errInfo,error){
                                 console.log('请求失败处理');
                              }

WebService/src/main/resources/components/noticePackage/addNoticeView/addNoticeView.js

@@ -34,7 +34,7 @@
  {
                             limit:"maxin",
                             param:"4,100",
-                            errInfo:"小区名称必须在4至100字符之间"
+                            errInfo:"小区名称必须在2至100字符之间"
                         },
                     ],
 'addNoticeViewInfo.noticeTypeCd':[

WebService/src/main/resources/components/noticePackage/editNoticeView/editNoticeView.js

@@ -40,7 +40,7 @@
                         },
  {
                             limit:"maxin",
-                            param:"4,100",
+                            param:"2,100",
                             errInfo:"小区名称必须在4至100字符之间"
                         },
                     ],

WebService/src/main/resources/components/ownerPackage/member-select-owner/memberSelectOwner.html

@@ -5,18 +5,20 @@
                 <h5>业主信息</h5>
                 <div class="ibox-tools" style="top:10px;">
                     <button type="button" class="btn btn-primary btn-sm" v-on:click="openSearchOwnerModel()">
-                        <i class="glyphicon glyphicon-search"></i> 选择业主</button>
+                        <i class="glyphicon glyphicon-search"></i> 选择业主
+                    </button>
                     <button type="button" class="btn btn-primary btn-sm"
                             v-if="ownerInfo.ownerId != null && ownerInfo.ownerId != ''"
                             style="margin-left:10px" v-on:click="openAddMemberModel()">
-                        <i class="glyphicon glyphicon-plus" ></i> 添加成员</button>
+                        <i class="glyphicon glyphicon-plus"></i> 添加成员
+                    </button>
                 </div>
             </div>
             <div class="ibox-content">
                 <div class="row">
                     <div class="col-sm-3">
                         <div class="form-group">
-                            <label class="col-form-label" >业主ID：</label>
+                            <label class="col-form-label">业主ID：</label>
                             <label class="">{{ownerInfo.ownerId}}</label>
                         </div>
                     </div>
@@ -28,13 +30,13 @@
                     </div>
                     <div class="col-sm-3">
                         <div class="form-group">
-                            <label class="col-form-label" >性别：</label>
-                            <label class="">{{ownerInfo.sex == 0 ? '男' : '女'}}</label>
+                            <label class="col-form-label">性别：</label>
+                            <label class="">{{ownerInfo.sexName}}</label>
                         </div>
                     </div>
                     <div class="col-sm-3">
                         <div class="form-group">
-                            <label class="col-form-label" >年龄：</label>
+                            <label class="col-form-label">年龄：</label>
                             <label class="">{{ownerInfo.age}}</label>
                         </div>
                     </div>
@@ -44,7 +46,7 @@
                 <div class="row">
                     <div class="col-sm-3">
                         <div class="form-group">
-                            <label class="col-form-label" >联系方式：</label>
+                            <label class="col-form-label">联系方式：</label>
                             <label class="">{{ownerInfo.link}}</label>
                         </div>
                     </div>
@@ -56,7 +58,7 @@
                     </div>
                     <div class="col-sm-6">
                         <div class="form-group">
-                            <label class="col-form-label" >备注：</label>
+                            <label class="col-form-label">备注：</label>
                             <label class="">{{ownerInfo.remark}}</label>
                         </div>
                     </div>

WebService/src/main/resources/components/ownerPackage/member-select-owner/memberSelectOwner.js

@@ -13,6 +13,7 @@
                 userName:"",
                 remark:"",
                 link:"",
+                sexName:''
             }
         },
         _initMethod:function(){
@@ -20,7 +21,8 @@
         },
         _initEvent:function(){
             vc.on('memberSelectOwner','chooseOwner',function(_owner){
-                vc.component.ownerInfo = _owner;
+                vc.copyObject(_owner,vc.component.ownerInfo);
+                vc.component.ownerInfo.sexName = (vc.component.ownerInfo.sex == 0 ? '男' : '女');
             });
 
         },