Skip to content

Commit 9cbda85

Browse files
928255095928255095
committed
报修设置加入办理时长和超时预警功能
1 parent 95e589f commit 9cbda85

File tree

12 files changed

+165
-147
lines changed

12 files changed

+165
-147
lines changed

‎public/components/property/addRepairSetting/addRepairSetting.html renamed to ‎public/components/work/addRepairSetting/addRepairSetting.html

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,17 @@ <h3 class="m-t-none m-b ">
77
</h3>
88
<div class="ibox-content">
99
<div class="form-group row">
10-
<label class="col-sm-2 col-form-label">
10+
<label class="col-sm-2 col-form-label text-right">
1111
<vc:i18n name="类型名称" namespace="addRepairSetting"></vc:i18n>
1212
</label>
13-
<div class="col-sm-10">
13+
<div class="col-sm-4">
1414
<input v-model.trim="addRepairSettingInfo.repairTypeName" type="text"
1515
:placeholder="vc.i18n('必填，请填写类型名称','addRepairSetting')" class="form-control">
1616
</div>
17-
</div>
18-
<div class="form-group row">
19-
<label class="col-sm-2 col-form-label">
17+
<label class="col-sm-2 col-form-label text-right">
2018
<vc:i18n name="设置类型" namespace="addRepairSetting"></vc:i18n>
2119
</label>
22-
<div class="col-sm-10">
20+
<div class="col-sm-4">
2321
<select class="custom-select" v-model="addRepairSettingInfo.repairSettingType">
2422
<option selected disabled value="">
2523
{{vc.i18n('必填，请选择报修设置类型','addRepairSetting')}}
@@ -30,10 +28,10 @@ <h3 class="m-t-none m-b ">
3028
</div>
3129
</div>
3230
<div class="form-group row">
33-
<label class="col-sm-2 col-form-label">
31+
<label class="col-sm-2 col-form-label text-right">
3432
<vc:i18n name="派单方式" namespace="addRepairSetting"></vc:i18n>
3533
</label>
36-
<div class="col-sm-10">
34+
<div class="col-sm-4">
3735
<select class="custom-select" v-model="addRepairSettingInfo.repairWay">
3836
<option selected disabled value="">
3937
{{vc.i18n('必填，请选择派单方式','addRepairSetting')}}
@@ -43,12 +41,10 @@ <h3 class="m-t-none m-b ">
4341
<option value="300">{{vc.i18n('轮训','addRepairSetting')}}</option>
4442
</select>
4543
</div>
46-
</div>
47-
<div class="form-group row">
48-
<label class="col-sm-2 col-form-label">
44+
<label class="col-sm-2 col-form-label text-right">
4945
<vc:i18n name="公共区域" namespace="addRepairSetting"></vc:i18n>
5046
</label>
51-
<div class="col-sm-10">
47+
<div class="col-sm-4">
5248
<select class="custom-select" v-model="addRepairSettingInfo.publicArea">
5349
<option selected disabled value="">
5450
{{vc.i18n('必填，请选择区域','addRepairSetting')}}
@@ -59,10 +55,10 @@ <h3 class="m-t-none m-b ">
5955
</div>
6056
</div>
6157
<div class="form-group row">
62-
<label class="col-sm-2 col-form-label">
58+
<label class="col-sm-2 col-form-label text-right">
6359
<vc:i18n name="业主端展示" namespace="addRepairSetting"></vc:i18n>
6460
</label>
65-
<div class="col-sm-10">
61+
<div class="col-sm-4">
6662
<select class="custom-select" v-model="addRepairSettingInfo.isShow">
6763
<option selected disabled value="">
6864
{{vc.i18n('必填，请选择是否在业主端展示','addRepairSetting')}}
@@ -71,12 +67,10 @@ <h3 class="m-t-none m-b ">
7167
<option value="N">{{vc.i18n('否','addRepairSetting')}}</option>
7268
</select>
7369
</div>
74-
</div>
75-
<div class="form-group row">
76-
<label class="col-sm-2 col-form-label">
70+
<label class="col-sm-2 col-form-label text-right">
7771
<vc:i18n name="通知方式" namespace="addRepairSetting"></vc:i18n>
7872
</label>
79-
<div class="col-sm-10">
73+
<div class="col-sm-4">
8074
<select class="custom-select" v-model="addRepairSettingInfo.notifyWay">
8175
<option selected disabled value="">
8276
{{vc.i18n('必填，请选择通知方式','addRepairSetting')}}
@@ -87,20 +81,27 @@ <h3 class="m-t-none m-b ">
8781
</select>
8882
</div>
8983
</div>
90-
<div class="form-group row" v-if="addRepairSettingInfo.payFeeFlag == 'T'">
91-
<label class="col-sm-2 col-form-label">
92-
<vc:i18n name="收费金额" namespace="addRepairSetting"></vc:i18n>
84+
<div class="form-group row">
85+
<label class="col-sm-2 col-form-label text-right">
86+
<vc:i18n name="办理时长" namespace="addRepairSetting"></vc:i18n>
87+
</label>
88+
<div class="col-sm-4">
89+
<input v-model.trim="addRepairSettingInfo.doTime" type="number"
90+
:placeholder="vc.i18n('必填，请填写办理时长（小时）','addRepairSetting')" class="form-control">
91+
</div>
92+
<label class="col-sm-2 col-form-label text-right">
93+
<vc:i18n name="超时预警" namespace="addRepairSetting"></vc:i18n>
9394
</label>
94-
<div class="col-sm-10">
95-
<input v-model.trim="addRepairSettingInfo.priceScope" type="text"
96-
:placeholder="vc.i18n('必填，请填写收费金额','addRepairSetting')" class="form-control">
95+
<div class="col-sm-4">
96+
<input v-model.trim="addRepairSettingInfo.warningTime" type="number"
97+
:placeholder="vc.i18n('必填，请填写超时预警（分钟）','addRepairSetting')" class="form-control">
9798
</div>
9899
</div>
99100
<div class="form-group row">
100-
<label class="col-sm-2 col-form-label">
101+
<label class="col-sm-2 col-form-label text-right">
101102
<vc:i18n name="回访设置" namespace="addRepairSetting"></vc:i18n>
102103
</label>
103-
<div class="col-sm-10">
104+
<div class="col-sm-4">
104105
<select class="custom-select" v-model="addRepairSettingInfo.returnVisitFlag">
105106
<option selected disabled value="">
106107
{{vc.i18n('必填，请选择是否回访','addRepairSetting')}}
@@ -112,10 +113,10 @@ <h3 class="m-t-none m-b ">
112113
</div>
113114
</div>
114115
<div class="form-group row">
115-
<label class="col-sm-2 col-form-label">
116+
<label class="col-sm-2 col-form-label text-right">
116117
<vc:i18n name="说明" namespace="addRepairSetting"></vc:i18n>
117118
</label>
118-
<div class="col-sm-10">
119+
<div class="col-sm-4">
119120
<textarea v-model.trim="addRepairSettingInfo.remark"
120121
:placeholder="vc.i18n('选填，请填写说明','addRepairSetting')"
121122
class="form-control"></textarea>

‎public/components/property/addRepairSetting/addRepairSetting.js renamed to ‎public/components/work/addRepairSetting/addRepairSetting.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
priceScope: '',
1313
returnVisitFlag: '003',
1414
isShow: 'Y',
15+
doTime:'24',
16+
warningTime:'30',
1517
notifyWay: 'WECHAT'
1618
}
1719
},
@@ -117,7 +119,7 @@
117119
//关闭model
118120
$('#addRepairSettingModel').modal('hide');
119121
$that.clearAddRepairSettingInfo();
120-
vc.emit('repairSettingManage', 'listRepairSetting', {});
122+
vc.emit('repairSetting', 'listRepairSetting', {});
121123
vc.toast("添加成功，请记得绑定维修师傅！");
122124
return;
123125
} else {
@@ -126,7 +128,7 @@
126128
},
127129
function (errInfo, error) {
128130
console.log('请求失败处理');
129-
vc.message(errInfo);
131+
vc.toast(errInfo);
130132
});
131133
},
132134
clearAddRepairSettingInfo: function () {
@@ -141,6 +143,8 @@
141143
priceScope: '',
142144
returnVisitFlag: '003',
143145
isShow: 'Y',
146+
doTime:'24',
147+
warningTime:'30',
144148
notifyWay: 'WECHAT'
145149
};
146150
}

‎public/components/property/deleteRepairSetting/deleteRepairSetting.html renamed to ‎public/components/work/deleteRepairSetting/deleteRepairSetting.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<div class="modal fade" id="deleteRepairSettingModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
2-
aria-hidden="true">
1+
<div class="modal fade" id="deleteRepairSettingModel" role="dialog" aria-labelledby="exampleModalLabel"
2+
aria-hidden="true">
33
<div class="modal-dialog" role="document">
44
<div class="modal-content">
55
<div class="modal-header">
66
<h5 class="modal-title" id="exampleModalLabel">
7-
<span><vc:i18n name="请确认您的操作" namespace="deleteRepairSetting"></vc:i18n></span>!
7+
<vc:i18n name="请确认您的操作!" namespace="deleteRepairSetting"></vc:i18n>
88
</h5>
99
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
1010
<span aria-hidden="true">&times;</span>
@@ -13,19 +13,19 @@ <h5 class="modal-title" id="exampleModalLabel">
1313
<div class="modal-body">
1414
<tr align="center">
1515
<th>
16-
<span><vc:i18n name="确定删除报修设置" namespace="deleteRepairSetting"></vc:i18n></span>
16+
<vc:i18n name="确定删除报修设置" namespace="deleteRepairSetting"></vc:i18n>
1717
</th>
1818
</tr>
1919
</div>
2020
<div class="modal-footer">
2121
<button type="button" class="btn btn-secondary" data-dismiss="modal"
22-
v-on:click="closeDeleteRepairSettingModel()">
23-
<span><vc:i18n name="点错了" namespace="deleteRepairSetting"></vc:i18n></span>
22+
v-on:click="closeDeleteRepairSettingModel()">
23+
<vc:i18n name="点错了" namespace="deleteRepairSetting"></vc:i18n>
2424
</button>
2525
<button type="button" class="btn btn-primary" v-on:click="deleteRepairSetting()">
26-
<span><vc:i18n name="确认删除" namespace="deleteRepairSetting"></vc:i18n></span>
26+
<vc:i18n name="确认删除" namespace="deleteRepairSetting"></vc:i18n>
2727
</button>
2828
</div>
2929
</div>
3030
</div>
31-
</div>
31+
</div>

‎public/components/property/deleteRepairSetting/deleteRepairSetting.js renamed to ‎public/components/work/deleteRepairSetting/deleteRepairSetting.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
},
88
_initEvent: function () {
99
vc.on('deleteRepairSetting', 'openDeleteRepairSettingModal', function (_params) {
10-
vc.component.deleteRepairSettingInfo = _params;
10+
$that.deleteRepairSettingInfo = _params;
1111
$('#deleteRepairSettingModel').modal('show');
1212
});
1313
},
1414
methods: {
1515
deleteRepairSetting: function () {
16-
vc.component.deleteRepairSettingInfo.communityId = vc.getCurrentCommunity().communityId;
16+
$that.deleteRepairSettingInfo.communityId = vc.getCurrentCommunity().communityId;
1717
vc.http.apiPost(
18-
'repair.deleteRepairSetting',
19-
JSON.stringify(vc.component.deleteRepairSettingInfo),
18+
'/repair.deleteRepairSetting',
19+
JSON.stringify($that.deleteRepairSettingInfo),
2020
{
2121
emulateJSON: true
2222
},
@@ -26,7 +26,7 @@
2626
if (_json.code == 0) {
2727
//关闭model
2828
$('#deleteRepairSettingModel').modal('hide');
29-
vc.emit('repairSettingManage', 'listRepairSetting', {});
29+
vc.emit('repairSetting', 'listRepairSetting', {});
3030
vc.toast("删除成功");
3131
return;
3232
} else {
@@ -35,12 +35,12 @@
3535
},
3636
function (errInfo, error) {
3737
console.log('请求失败处理');
38-
vc.message(json);
38+
vc.toast(json);
3939
});
4040
},
4141
closeDeleteRepairSettingModel: function () {
4242
$('#deleteRepairSettingModel').modal('hide');
4343
}
4444
}
4545
});
46-
})(window.vc, window.vc.component);
46+
})(window.vc, window.$that);

0 commit comments

Comments
 (0)