优化代码

This commit is contained in:
java110 2020-06-30 18:08:26 +08:00
parent 3115a685cf
commit b63e8024e1
6 changed files with 293 additions and 254 deletions

View File

@ -1,84 +0,0 @@
<div id="ownerRepairDetailModel" 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">
<h3 class="m-t-none m-b ">报修详情</h3>
<div class="ibox-content">
<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="ownerRepairDetailInfo.repairId" type="text"
readonly 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="ownerRepairDetailInfo.repairTypeName" type="text"
readonly 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="ownerRepairDetailInfo.repairName" type="text" readonly
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="ownerRepairDetailInfo.tel" type="number" readonly
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="ownerRepairDetailInfo.roomName" readonly type="text" readonly
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="ownerRepairDetailInfo.appointmentTime" type="text"
readonly 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="ownerRepairDetailInfo.userName" type="text"
readonly 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="ownerRepairDetailInfo.stateName" type="text"
readonly 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 readonly cols="15" class="form-control"
v-model="ownerRepairDetailInfo.context"></textarea></div>
</div>
<div class="ibox-content">
<button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
data-dismiss="modal">取消
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

View File

@ -1,88 +0,0 @@
(function(vc){
vc.extends({
data:{
ownerRepairDetailInfo:{
repairId:'',
repairType:'',
repairTypeName:'',
repairName:'',
tel:'',
roomId:'',
roomName:'',
appointmentTime:'',
context:'',
stateName:'',
roomId:'',
userId:'',
userName:''
}
},
_initMethod:function(){
},
_initEvent:function(){
vc.on('ownerRepairDetail','openOwnerRepairDetailModal',function(_ownerInfo){
vc.component.clearOwnerRepairDetailInfo();
vc.copyObject(_ownerInfo,vc.component.ownerRepairDetailInfo);
vc.component._getRoom();
$('#ownerRepairDetailModel').modal('show');
});
},
methods:{
clearOwnerRepairDetailInfo:function(){
vc.component.ownerRepairDetailInfo = {
repairId:'',
repairType:'',
repairTypeName:'',
repairName:'',
tel:'',
roomId:'',
roomName:'',
appointmentTime:'',
context:'',
stateName:'',
roomId:'',
userId:'',
userName:''
};
},
_getRoom:function(){
var param={
params:{
roomId:vc.component.ownerRepairDetailInfo.roomId,
communityId:vc.getCurrentCommunity().communityId,
page:1,
row:1
}
};
//查询房屋信息 业主信息
vc.http.get('ownerRepairManage',
'getRoom',
param,
function(json,res){
if(res.status == 200){
var _roomInfos=JSON.parse(json);
if(!_roomInfos.hasOwnProperty("rooms")){
vc.toast("非法操作,未找到房屋信息");
//vc.jumpToPage('/admin.html#/listOwner');
return ;
}
var _roomInfo = _roomInfos.rooms[0];
vc.component.ownerRepairDetailInfo.roomName= _roomInfo.floorNum+"号楼 "+_roomInfo.unitNum+"单元 "+_roomInfo.roomNum + "室";
}else{
vc.toast("非法操作,未找到房屋信息");
vc.jumpToPage('/admin.html#/pages/property/listOwner');
}
},function(errInfo,error){
console.log('请求失败处理');
vc.toast("非法操作,未找到房屋信息");
vc.jumpToPage('/admin.html#/pages/property/listOwner');
}
);
}
}
});
})(window.vc);

View File

@ -0,0 +1,117 @@
<div>
<div class="row">
<div class="col-lg-12">
<div class="ibox">
<div class="ibox-title">
<h5>工单详情</h5>
<div class="ibox-tools" style="top:10px;">
</div>
</div>
<div class="ibox-content">
<div>
<div>
<div class="row">
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">工单编码:</label>
<label class="">{{ownerRepairDetailInfo.repairId}}</label>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">报修类型:</label>
<label class="">{{ownerRepairDetailInfo.repairTypeName}}</label>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">报修人:</label>
<label class="">{{ownerRepairDetailInfo.repairName}}</label>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">联系方式:</label>
<label class="">{{ownerRepairDetailInfo.tel}}</label>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">房屋:</label>
<label class="">{{ownerRepairDetailInfo.roomName}}</label>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">预约时间:</label>
<label class="">{{ownerRepairDetailInfo.appointmentTime}}</label>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-4">
<div class="form-group">
<label class="col-form-label">状态</label>
<label class="">{{ownerRepairDetailInfo.stateName}}</label>
</div>
</div>
<div class="col-sm-8">
<div class="form-group">
<label class="col-form-label">报修内容</label>
<label class="">{{ownerRepairDetailInfo.context}}</label>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div class="ibox">
<div class="ibox-title">
<h5>处理过程</h5>
<div class="ibox-tools" style="top:10px;">
</div>
</div>
<div class="ibox-content">
<table class="table table-stripped">
<thead>
<tr>
<th scope="col">序号</th>
<th scope="col">处理人</th>
<th scope="col">状态</th>
<th scope="col">处理时间</th>
<th scope="col">耗时</th>
<th scope="col">意见</th>
</tr>
</thead>
<tbody>
<tr v-for="(item,index) in ownerRepairDetailInfo.repairUsers">
<th scope="row">{{index+1}}</th>
<td>{{item.auditName}}</td>
<td>{{item.stateName}}</td>
<td>{{item.auditTime}}</td>
<td>{{item.duration}}</td>
<td>{{item.message}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>

View File

@ -0,0 +1,110 @@
(function (vc) {
vc.extends({
data: {
ownerRepairDetailInfo: {
repairId: '',
repairType: '',
repairTypeName: '',
repairName: '',
tel: '',
roomId: '',
roomName: '',
appointmentTime: '',
context: '',
stateName: '',
roomId: '',
userId: '',
userName: '',
repairUsers:[]
}
},
_initMethod: function () {
let repairId = vc.getParam('repairId');
if (!vc.notNull(repairId)) {
vc.toast('非法操作');
vc.jumpToPage('/admin.html#/pages/property/repairPoolManage');
return;
}
$that._listRepairPools()
},
_initEvent: function () {
},
methods: {
_getRoom: function () {
var param = {
params: {
roomId: vc.component.ownerRepairDetailInfo.roomId,
communityId: vc.getCurrentCommunity().communityId,
page: 1,
row: 1
}
};
//查询房屋信息 业主信息
vc.http.get('ownerRepairManage',
'getRoom',
param,
function (json, res) {
if (res.status == 200) {
var _roomInfos = JSON.parse(json);
if (!_roomInfos.hasOwnProperty("rooms")) {
vc.toast("非法操作,未找到房屋信息");
//vc.jumpToPage('/admin.html#/listOwner');
return;
}
var _roomInfo = _roomInfos.rooms[0];
vc.component.ownerRepairDetailInfo.roomName = _roomInfo.floorNum + "号楼 " + _roomInfo.unitNum + "单元 " + _roomInfo.roomNum + "室";
} else {
vc.toast("非法操作,未找到房屋信息");
}
}, function (errInfo, error) {
console.log('请求失败处理');
vc.toast("非法操作,未找到房屋信息");
}
);
},
_listRepairPools: function () {
var param = {
params: {
page: 1,
row: 1,
communityId: vc.getCurrentCommunity().communityId,
repairId: $that.ownerRepairDetailInfo.repairId
}
};
//发送get请求
vc.http.get('ownerRepairManage',
'list',
param,
function (json, res) {
var _repairPoolManageInfo = JSON.parse(json);
let _repairs = _repairPoolManageInfo.data;
if (_repairs.length < 1) {
vc.toast("数据异常");
vc.jumpToPage('/admin.html#/pages/property/repairPoolManage');
return;
}
vc.copyObject(_repairs[0], $that.ownerRepairDetailInfo);
//查询房屋信息
vc.component._getRoom();
}, function (errInfo, error) {
console.log('请求失败处理');
}
);
},
}
});
})(window.vc);

View File

@ -1,4 +1,4 @@
<div class="animated fadeInRight ecommerce">
<div class="animated fadeInRight ecommerce">
<div class="row">
<div class="col-lg-12">
<div class="ibox ">
@ -6,7 +6,7 @@
<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?'隐藏':'更多'}}
v-on:click="_moreCondition()">{{repairPoolManageInfo.moreCondition == true?'隐藏':'更多'}}
</button>
</div>
</div>
@ -14,41 +14,44 @@
<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">
<select class="custom-select" v-model="repairPoolManageInfo.conditions.repairType">
<option selected value="">请选择报修类型</option>
<option v-for="(item,index) in repairPoolManageInfo.repairSettings"
:value="item.repairType">{{item.repairTypeName}}</option>
</select>
</div>
</div>
<div class="col-sm-4">
<div class="form-group">
<input type="text" placeholder="请输入报修人"
v-model="ownerRepairManageInfo.conditions.repairName" class=" form-control">
v-model="repairPoolManageInfo.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">
<select class="custom-select" v-model="repairPoolManageInfo.conditions.state">
<option selected value="">请选择报修状态</option>
<option v-for="(item,index) in repairPoolManageInfo.states" :value="item.statusCd">
{{item.name}}</option>
</select>
</div>
</div>
<div class="col-sm-1">
<button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOwnerRepairMethod()">
<button type="button" class="btn btn-primary btn-sm" v-on:click="_queryRepairPoolMethod()">
<i class="fa fa-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 v-for="(item,index) in ownerRepairManageInfo.repairSettings"
:value="item.repairType">{{item.repairTypeName}}</option>
</select></div>
<div class="col-sm-4" v-if="ownerRepairManageInfo.moreCondition == true">
<select class="custom-select" v-model="ownerRepairManageInfo.conditions.state">
<option selected value="">请选择报修状态</option>
<option v-for="(item,index) in ownerRepairManageInfo.states"
:value="item.statusCd">{{item.name}}</option>
</select>
<div class="col-sm-4" v-if="repairPoolManageInfo.moreCondition == true">
<input type="text" placeholder="请输入报修ID" v-model="repairPoolManageInfo.conditions.repairId"
class=" form-control">
</div>
<div class="col-sm-4" v-if="repairPoolManageInfo.moreCondition == true">
<input type="text" placeholder="请输入报修电话" v-model="repairPoolManageInfo.conditions.tel"
class=" form-control">
</div>
</div>
@ -61,59 +64,54 @@
<div class="col-lg-12">
<div class="ibox">
<div class="ibox-title">
<h5><span v-text="ownerRepairManageInfo.conditions.roomName"></span>报修信息</h5>
<h5><span v-text="repairPoolManageInfo.conditions.roomName"></span>报修工单池</h5>
<div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddOwnerRepairModal()" v-if:click="ownerRepairManageInfo.conditions.roomId != ''">
<i class="fa fa-plus"></i>
登记
</button>
</div>
</div>
<div class="ibox-content">
<table class="footable table table-stripped toggle-arrow-tiny"
data-page-size="15"
>
<table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
<thead>
<tr>
<th class="text-center">报修ID</th>
<th class="text-center">报修类型</th>
<th class="text-center">报修人</th>
<th class="text-center">联系方式</th>
<th class="text-center">预约时间</th>
<th class="text-center">状态</th>
<th class="text-center">操作</th>
</tr>
<tr>
<th class="text-center">工单编码</th>
<th class="text-center">报修类型</th>
<th class="text-center">报修人</th>
<th class="text-center">联系方式</th>
<th class="text-center">预约时间</th>
<th class="text-center">状态</th>
<th class="text-center">操作</th>
</tr>
</thead>
<tbody>
<tr v-for="ownerRepair in ownerRepairManageInfo.ownerRepairs">
<td class="text-center">{{ownerRepair.repairId}}</td>
<td class="text-center">{{ownerRepair.repairTypeName}}</td>
<td class="text-center">{{ownerRepair.repairName}}</td>
<td class="text-center">{{ownerRepair.tel}}</td>
<td class="text-center">{{ownerRepair.appointmentTime}}</td>
<td class="text-center">{{ownerRepair.stateName}}</td>
<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>
<tr v-for="repairPool in repairPoolManageInfo.repairPools">
<td class="text-center">{{repairPool.repairId}}</td>
<td class="text-center">{{repairPool.repairTypeName}}</td>
<td class="text-center">{{repairPool.repairName}}</td>
<td class="text-center">{{repairPool.tel}}</td>
<td class="text-center">{{repairPool.appointmentTime}}</td>
<td class="text-center">{{repairPool.stateName}}</td>
<td class="text-center">
<div class="btn-group" v-if="repairPool.repairWay == '100'">
<button class="btn-white btn btn-xs"
v-on:click="_openEditRepairPoolModel(repairPool)">派单
</button>
</div>
<div class="btn-group">
<button class="btn-white btn btn-xs"
v-on:click="_openRepairDetail(repairPool)">详情
</button>
</div>
</td>
</tr>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="7">
<ul class="pagination float-right"></ul>
</td>
</tr>
<tr>
<td colspan="7">
<ul class="pagination float-right"></ul>
</td>
</tr>
</tfoot>
</table>
<!-- 分页 -->
@ -123,12 +121,4 @@
</div>
</div>
<vc:create path="property/addOwnerRepair"
callBackListener=""
callBackFunction=""
></vc:create>
<vc:create path="property/editOwnerRepair"></vc:create>
<vc:create path="property/deleteOwnerRepair"></vc:create>
</div>
</div>

View File

@ -29,8 +29,8 @@
_initMethod: function () {
//vc.component._listRepairPools(DEFAULT_PAGE, DEFAULT_ROWS);
//vc.component._validateParam();
$that._listRepairSettings();
vc.getDict('r_repair_pool',"state",function(_data){
$that._listRepairSettings(DEFAULT_PAGE, 50);
vc.getDict('r_repair_pool', "state", function (_data) {
vc.component.repairPoolManageInfo.states = _data;
});
},
@ -48,13 +48,12 @@
vc.component.repairPoolManageInfo.conditions.page = _page;
vc.component.repairPoolManageInfo.conditions.row = _rows;
vc.component.repairPoolManageInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
vc.component.repairPoolManageInfo.conditions.state = '1000';
var param = {
params: vc.component.repairPoolManageInfo.conditions
};
//发送get请求
vc.http.get('repairPoolManage',
vc.http.get('ownerRepairManage',
'list',
param,
function (json, res) {
@ -71,13 +70,8 @@
}
);
},
_openAddRepairPoolModal: function () {
vc.emit('addRepairPool', 'openAddRepairPoolModal', vc.component.repairPoolManageInfo.conditions);
},
_openEditRepairPoolModel: function (_repairPool) {
_repairPool.roomName = vc.component.repairPoolManageInfo.conditions.roomName;
_repairPool.roomId = vc.component.repairPoolManageInfo.conditions.roomId;
vc.emit('editRepairPool', 'openEditRepairPoolModal', _repairPool);
_openRepairDetail: function (_repairPool) {
vc.jumpToPage('/admin.html#/pages/property/ownerRepairDetail?repairId=' + _repairPool.repairId)
},
_openDeleteRepairPoolModel: function (_repairPool) {
vc.emit('deleteRepairPool', 'openDeleteRepairPoolModal', _repairPool);