业主报修

WebService/src/main/resources/components/ownerPackage/list-owner/listOwner.js

@@ -35,7 +35,7 @@
             });
 
             vc.on('listOwner','chooseRoom',function(_room){
-                if(vc.component.listOwnerData._eventName == 'PayPropertyFee'){
+                if(vc.component.listOwnerInfo._eventName == 'PayPropertyFee'){
                       vc.jumpToPage("/flow/propertyFeeFlow?ownerId="+vc.component.listOwnerInfo._currentOwnerId+"&roomId="+_room.roomId);
                 }else{
                       vc.jumpToPage("/flow/ownerRepairFlow?ownerId="+vc.component.listOwnerInfo._currentOwnerId+"&roomId="+_room.roomId);
@@ -107,7 +107,7 @@
             },
             _openOwnerRepair:function(_owner){
                 //查看 业主是否有多套房屋，如果有多套房屋，则提示对话框选择，只有一套房屋则直接跳转至交费页面缴费
-                vc.component.listOwnerData._eventName="OwnerRepair";
+                vc.component.listOwnerInfo._eventName="OwnerRepair";
                 vc.component.listOwnerInfo._currentOwnerId = _owner.ownerId; // 暂存如果有多个房屋是回调回来时 ownerId 会丢掉
                 var param = {
                     params:{
@@ -136,7 +136,7 @@
             },
             _openPayPropertyFee:function(_owner){
                 //查看 业主是否有多套房屋，如果有多套房屋，则提示对话框选择，只有一套房屋则直接跳转至交费页面缴费
-                vc.component.listOwnerData._eventName="PayPropertyFee";
+                vc.component.listOwnerInfo._eventName="PayPropertyFee";
                 vc.component.listOwnerInfo._currentOwnerId = _owner.ownerId; // 暂存如果有多个房屋是回调回来时 ownerId 会丢掉
                 var param = {
                     params:{

WebService/src/main/resources/components/ownerRepairPackage/add-ownerRepair/addOwnerRepair.html

@@ -1,4 +1,5 @@
-<div id = "addOwnerRepairModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addOwnerRepairModel" 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">
@@ -20,48 +21,57 @@
                             </div>-->
 
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">报修类型</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="addOwnerRepairInfo.repairType">
-         <option selected  disabled value="">必填，请选择报修类型</option>
-         <option  value="10001">卧室报修</option>
-<option  value="10002">管道报修</option>
-<option  value="10003">客厅报修</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">报修人</label>
-         <div class="col-sm-10">
-           <input v-model="addOwnerRepairInfo.repairName"                   type="text" placeholder="必填，请填写报修人" 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="addOwnerRepairInfo.tel"                   type="text" placeholder="必填，请填写联系方式" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">房屋ID</label>
-         <div class="col-sm-10">
-           <input v-model="addOwnerRepairInfo.roomId"                   type="text" placeholder="必填，请填写房屋ID" 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="addOwnerRepairInfo.appointmentTime"                   type="text" placeholder="必填，请填写预约时间" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">报修内容</label>
-         <div class="col-sm-10">
-<textarea  placeholder="必填，请填写报修内容" class="form-control" v-model="addOwnerRepairInfo.context"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">报修类型</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addOwnerRepairInfo.repairType">
+                                        <option selected disabled value="">必填，请选择报修类型</option>
+                                        <option value="10001">卧室报修</option>
+                                        <option value="10002">管道报修</option>
+                                        <option value="10003">客厅报修</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">报修人</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addOwnerRepairInfo.repairName" type="text" placeholder="必填，请填写报修人"
+                                           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="addOwnerRepairInfo.tel" type="number" placeholder="必填，请填写联系方式"
+                                           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="addOwnerRepairInfo.roomId" readonly type="text" placeholder="必填，请填写房屋编号"
+                                           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="addOwnerRepairInfo.appointmentTime" type="text"
+                                           placeholder="必填，请填写预约时间" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">报修内容</label>
+                                <div class="col-sm-10">
+                                    <textarea placeholder="必填，请填写报修内容" class="form-control"
+                                              v-model="addOwnerRepairInfo.context"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveOwnerRepairInfo()" ><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>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="saveOwnerRepairInfo()"><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>

WebService/src/main/resources/components/ownerRepairPackage/edit-ownerRepair/editOwnerRepair.html

@@ -1,4 +1,5 @@
-<div id = "editOwnerRepairModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editOwnerRepairModel" 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">
@@ -7,48 +8,57 @@
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">报修类型</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editOwnerRepairInfo.repairType">
-         <option selected  disabled value="">必填，请选择报修类型</option>
-         <option  value="10001">卧室报修</option>
-<option  value="10002">管道报修</option>
-<option  value="10003">客厅报修</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">报修人</label>
-         <div class="col-sm-10">
-           <input v-model="editOwnerRepairInfo.repairName"                   type="text" placeholder="必填，请填写报修人" 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="editOwnerRepairInfo.tel"                   type="text" placeholder="必填，请填写联系方式" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">房屋ID</label>
-         <div class="col-sm-10">
-           <input v-model="editOwnerRepairInfo.roomId"                   type="text" placeholder="必填，请填写房屋ID" 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="editOwnerRepairInfo.appointmentTime"                   type="text" placeholder="必填，请填写预约时间" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">报修内容</label>
-         <div class="col-sm-10">
-<textarea  placeholder="必填，请填写报修内容" class="form-control" v-model="editOwnerRepairInfo.context"></textarea>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">报修类型</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editOwnerRepairInfo.repairType">
+                                        <option selected disabled value="">必填，请选择报修类型</option>
+                                        <option value="10001">卧室报修</option>
+                                        <option value="10002">管道报修</option>
+                                        <option value="10003">客厅报修</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">报修人</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editOwnerRepairInfo.repairName" type="text" placeholder="必填，请填写报修人"
+                                           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="editOwnerRepairInfo.tel" type="number" placeholder="必填，请填写联系方式"
+                                           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="editOwnerRepairInfo.roomId" readonly type="text" placeholder="必填，请填写房屋编号"
+                                           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="editOwnerRepairInfo.appointmentTime" type="text"
+                                           placeholder="必填，请填写预约时间" class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">报修内容</label>
+                                <div class="col-sm-10">
+                                    <textarea placeholder="必填，请填写报修内容" class="form-control"
+                                              v-model="editOwnerRepairInfo.context"></textarea></div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editOwnerRepair()" ><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>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="editOwnerRepair()"><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>

WebService/src/main/resources/components/ownerRepairPackage/ownerRepair-manage/ownerRepairManage.html

@@ -5,33 +5,46 @@
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button"  class="btn btn-link btn-sm" style="margin-right:10px;"  v-on:click="_moreCondition()">{{ownerRepairManageInfo.moreCondition == true?'隐藏':'更多'}}</button>
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
+                                v-on:click="_moreCondition()">{{ownerRepairManageInfo.moreCondition == true?'隐藏':'更多'}}
+                        </button>
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-<div class="col-sm-4" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入报修ID" v-model="ownerRepairManageInfo.conditions.repairId" class=" form-control">
-                            </div>                        </div><div class="col-sm-4" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入报修人" v-model="ownerRepairManageInfo.conditions.repairName" class=" form-control">
-                            </div>                        </div><div class="col-sm-3" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入报修电话" v-model="ownerRepairManageInfo.conditions.tel" class=" form-control">
-                            </div>                        </div><div class="col-sm-1">
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入报修ID"
+                                       v-model="ownerRepairManageInfo.conditions.repairId" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入报修人"
+                                       v-model="ownerRepairManageInfo.conditions.repairName" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入报修电话" v-model="ownerRepairManageInfo.conditions.tel"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOwnerRepairMethod()">
-                                    <i class="glyphicon glyphicon-search"></i> 查询
+                                <i class="glyphicon glyphicon-search"></i> 查询
                             </button>
-                        </div></div>
-<div class="row">
-<div class="col-sm-4" v-if="ownerRepairManageInfo.moreCondition == true">
-<select class="custom-select" v-model="ownerRepairManageInfo.conditions.repairType">
-         <option selected  value="">请选择报修类型</option>
-         <option  value="10001">卧室报修</option>
-<option  value="10002">管道报修</option>
-<option  value="10003">客厅报修</option>
-  </select>                        </div></div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-4" v-if="ownerRepairManageInfo.moreCondition == true">
+                            <select class="custom-select" v-model="ownerRepairManageInfo.conditions.repairType">
+                                <option selected value="">请选择报修类型</option>
+                                <option value="10001">卧室报修</option>
+                                <option value="10002">管道报修</option>
+                                <option value="10003">客厅报修</option>
+                            </select></div>
+                    </div>
 
 
                 </div>
@@ -42,11 +55,11 @@
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
-                    <h5>业主报修信息</h5>
+                    <h5>报修信息</h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddOwnerRepairModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            添加业主报修
+                            报修登记
                         </button>
                     </div>
                 </div>
@@ -57,7 +70,7 @@
                     >
                         <thead>
                         <tr>
-                                                        <th class="text-center">报修ID</th>
+                            <th class="text-center">报修ID</th>
                             <th class="text-center">报修类型</th>
                             <th class="text-center">报修人</th>
                             <th class="text-center">联系方式</th>
@@ -70,18 +83,24 @@
                         </thead>
                         <tbody>
                         <tr v-for="ownerRepair in ownerRepairManageInfo.ownerRepairs">
-                                                        <td class="text-center">{{ownerRepair.repairId}}</td>
+                            <td class="text-center">{{ownerRepair.repairId}}</td>
                             <td class="text-center">{{ownerRepair.repairType}}</td>
                             <td class="text-center">{{ownerRepair.repairName}}</td>
                             <td class="text-center">{{ownerRepair.tel}}</td>
                             <td class="text-center">{{ownerRepair.roomId}}</td>
                             <td class="text-center">{{ownerRepair.appointmentTime}}</td>
-                            <td class="text-center"><div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditOwnerRepairModel(ownerRepair)">修改</button>
+                            <td class="text-center">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openEditOwnerRepairModel(ownerRepair)">修改
+                                    </button>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteOwnerRepairModel(ownerRepair)">删除</button>
-                                </div></td>
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openDeleteOwnerRepairModel(ownerRepair)">删除
+                                    </button>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>
@@ -100,7 +119,6 @@
         </div>
     </div>
 
-    
 
     <vc:create name="addOwnerRepair"
                callBackListener=""