Skip to content

Commit ff83c88

Browse files
928255095928255095
committed
优化费用导入bug
1 parent aab2e8d commit ff83c88

File tree

3 files changed

+202
-175
lines changed

3 files changed

+202
-175
lines changed

‎public/components/property/importRoomFee/importRoomFee.html

Lines changed: 73 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -2,80 +2,86 @@
22
<div class="modal-dialog modal-lg">
33
<div class="modal-content">
44
<div class="modal-body">
5-
<h3 class="m-t-none m-b "><vc:i18n name="费用导入" namespace="importRoomFee"></vc:i18n></h3>
5+
<h3 class="m-t-none m-b ">
6+
<vc:i18n name="费用导入" namespace="importRoomFee"></vc:i18n>
7+
</h3>
68
<div class="ibox-content">
7-
<div>
8-
<div>
9-
<div class="form-group row">
10-
<label class="col-sm-2 col-form-label">
11-
<span><vc:i18n name="费用类型" namespace="importRoomFee"></vc:i18n></span>
12-
</label>
13-
<div class="col-sm-10">
14-
<select class="custom-select" v-model="importRoomFeeInfo.feeTypeCd"
15-
@change="_changeFeeTypeCd(importRoomFeeInfo.feeTypeCd)">
16-
<option selected disabled value="">{{vc.i18n('必填，请选择费用类型','importRoomFee')}}</option>
179

18-
<option v-for="(item,index) in importRoomFeeInfo.feeTypeCds" :key="index"
19-
v-bind:value="item.statusCd">
20-
{{item.name}}
21-
</option>
22-
</select>
23-
</div>
24-
</div>
25-
<div class="form-group row">
26-
<label class="col-sm-2 col-form-label">
27-
<span><vc:i18n name="费用对象" namespace="importRoomFee"></vc:i18n></span>
28-
</label>
29-
<div class="col-sm-10">
30-
<select class="custom-select" v-model="importRoomFeeInfo.objType"
31-
>
32-
<option selected disabled value="">{{vc.i18n('必填，请选择费用对象','importRoomFee')}}</option>
33-
<option value="3333">{{vc.i18n('房屋','importRoomFee')}}</option>
34-
<option value="6666">{{vc.i18n('车位车辆','importRoomFee')}}</option>
35-
</select>
36-
</div>
37-
</div>
38-
<div class="form-group row">
39-
<label class="col-sm-2 col-form-label">
40-
<span><vc:i18n name="选择文件" namespace="importRoomFee"></vc:i18n></span>
41-
</label>
42-
<div class="col-sm-10">
43-
<div class="custom-file">
44-
<input id="excelTemplate" ref="excelTemplate" type="file"
45-
class="custom-file-input form-control" name="excelTemplate"
46-
v-on:change="getExcelTemplate($event)" accept=".xls,.xlsx">
47-
<label for="excelTemplate" class="custom-file-label">
48-
{{importRoomFeeInfo.excelTemplate==''?'必填，请选择数据文件':importRoomFeeInfo.excelTemplate.name}}
49-
</label>
50-
</div>
51-
</div>
52-
</div>
53-
<div class="form-group row">
54-
<label class="col-sm-2 col-form-label">
55-
<span><vc:i18n name="下载模板" namespace="importRoomFee"></vc:i18n></span>
10+
<div class="form-group row">
11+
<label class="col-sm-2 col-form-label">
12+
<span>
13+
<vc:i18n name="费用类型" namespace="importRoomFee"></vc:i18n>
14+
</span>
15+
</label>
16+
<div class="col-sm-10">
17+
<select class="custom-select" v-model="importRoomFeeInfo.feeTypeCd"
18+
@change="_changeFeeTypeCd(importRoomFeeInfo.feeTypeCd)">
19+
<option selected disabled value="">{{vc.i18n('必填，请选择费用类型','importRoomFee')}}</option>
20+
21+
<option v-for="(item,index) in importRoomFeeInfo.feeTypeCds" :key="index"
22+
v-bind:value="item.statusCd">
23+
{{item.name}}
24+
</option>
25+
</select>
26+
</div>
27+
</div>
28+
<div class="form-group row">
29+
<label class="col-sm-2 col-form-label">
30+
<span>
31+
<vc:i18n name="费用对象" namespace="importRoomFee"></vc:i18n>
32+
</span>
33+
</label>
34+
<div class="col-sm-10">
35+
<select class="custom-select" v-model="importRoomFeeInfo.objType">
36+
<option selected disabled value="">{{vc.i18n('必填，请选择费用对象','importRoomFee')}}</option>
37+
<option value="3333">{{vc.i18n('房屋','importRoomFee')}}</option>
38+
<option value="6666">{{vc.i18n('车位车辆','importRoomFee')}}</option>
39+
</select>
40+
</div>
41+
</div>
42+
<div class="form-group row">
43+
<label class="col-sm-2 col-form-label">
44+
<span>
45+
<vc:i18n name="选择文件" namespace="importRoomFee"></vc:i18n>
46+
</span>
47+
</label>
48+
<div class="col-sm-10">
49+
<div class="custom-file">
50+
<input id="excelTemplate" ref="excelTemplate" type="file"
51+
class="custom-file-input form-control" name="excelTemplate"
52+
v-on:change="getExcelTemplate($event)" accept=".xls,.xlsx">
53+
<label for="excelTemplate" class="custom-file-label">
54+
{{importRoomFeeInfo.excelTemplate==''?'必填，请选择数据文件':importRoomFeeInfo.excelTemplate.name}}
5655
</label>
57-
<div class="col-sm-10">
58-
请先下载
59-
<a :href="'/callComponent/importRoomFee/exportData?communityId='+importRoomFeeInfo.communityId+'&objType='+importRoomFeeInfo.objType"
60-
target="_blank">
61-
<span><vc:i18n name="导入模板" namespace="importRoomFee"></vc:i18n></span>
62-
</a>
63-
准备数据后，上传导入
64-
</div>
65-
</div>
66-
<div class="ibox-content">
67-
<button class="btn btn-primary float-right" type="button" v-on:click="_importData()">
68-
<i class="fa fa-check"></i>&nbsp;导入
69-
</button>
70-
<button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
71-
data-dismiss="modal">
72-
<i class="fa fa-close"></i>&nbsp;取消
73-
</button>
7456
</div>
7557
</div>
7658
</div>
59+
<div class="form-group row">
60+
<label class="col-sm-2 col-form-label">
61+
<span>
62+
<vc:i18n name="下载模板" namespace="importRoomFee"></vc:i18n>
63+
</span>
64+
</label>
65+
<div class="col-sm-10">
66+
请先下载
67+
<a href="javascript:void(0)" @click="_downloadImportFeeTemplate()"
68+
>
69+
<vc:i18n name="导入模板" namespace="importRoomFee"></vc:i18n>
70+
</a>
71+
准备数据后，上传导入
72+
</div>
73+
</div>
74+
<div class="ibox-content">
75+
<button class="btn btn-primary float-right" type="button" v-on:click="_importData()">
76+
<i class="fa fa-check"></i>&nbsp;导入
77+
</button>
78+
<button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
79+
data-dismiss="modal">
80+
<i class="fa fa-close"></i>&nbsp;取消
81+
</button>
82+
</div>
7783
</div>
7884
</div>
7985
</div>
8086
</div>
81-
</div>
87+
</div>

‎public/components/property/importRoomFee/importRoomFee.js

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,29 @@
9191
vc.toast(errInfo, 10000);
9292
});
9393
},
94-
_exportRoomFeeTemplate: function () {
95-
vc.jumpToPage('/callComponent/importRoomFee/exportData?communityId=' + vc.getCurrentCommunity().communityId + "&objType=" + $that.importRoomFeeInfo.objType);
94+
_downloadImportFeeTemplate: function () {
95+
//vc.jumpToPage('/callComponent/importRoomFee/exportData?communityId=' + vc.getCurrentCommunity().communityId + "&objType=" + $that.importRoomFeeInfo.objType);
96+
$('#importRoomFeeModel').modal('hide');
97+
98+
let param = {
99+
params: {
100+
communityId:vc.getCurrentCommunity().communityId,
101+
objType:$that.importRoomFeeInfo.objType,
102+
pagePath:'exportFeeImportTemplate'
103+
}
104+
};
105+
//发送get请求
106+
vc.http.apiGet('/export.exportData', param,
107+
function (json, res) {
108+
let _json = JSON.parse(json);
109+
vc.toast(_json.msg);
110+
if (_json.code == 0) {
111+
vc.jumpToPage('/#/pages/property/downloadTempFile?tab=下载中心')
112+
}
113+
},
114+
function (errInfo, error) {
115+
console.log('请求失败处理');
116+
});
96117
},
97118
clearAddFeeConfigInfo: function() {
98119
var _feeTypeCds = $that.importRoomFeeInfo.feeTypeCds;

0 commit comments

Comments
 (0)