mirror of
https://gitee.com/java110/MicroCommunityWeb.git
synced 2026-02-25 06:09:11 +08:00
Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunityWeb
This commit is contained in:
commit
9bd05580da
8
app.js
8
app.js
@ -36,11 +36,11 @@ let opts = {
|
||||
//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
|
||||
|
||||
|
||||
//app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
|
||||
//app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
|
||||
app.use('/callComponent',proxy('http://api.demo.winqi.cn:8012',opts));
|
||||
app.use('/app',proxy('http://api.demo.winqi.cn:8012',opts));
|
||||
|
||||
app.use('/callComponent',proxy('http://192.168.1.106:8012',opts));
|
||||
app.use('/app',proxy('http://192.168.1.106:8012',opts));
|
||||
// app.use('/callComponent',proxy('http://192.168.1.106:8012',opts));
|
||||
// app.use('/app',proxy('http://192.168.1.106:8012',opts));
|
||||
|
||||
//app.use('/callComponent',proxy('http://192.168.1.16:8012',opts));
|
||||
//app.use('/app',proxy('http://192.168.1.16:8012',opts));
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
<option selected disabled value="">必填,请选择费用类型</option>
|
||||
<option value="888800010015">水费</option>
|
||||
<option value="888800010016">电费</option>
|
||||
<option value="888800010009">煤气费</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
vc.component.addMeterWaterInfo.roomId = _param.roomId;
|
||||
vc.component.addMeterWaterInfo.objId = _param.roomId;
|
||||
// $that.addMeterWaterInfo.objName = _param.name.replace('0单元', ''); //处理商铺;
|
||||
$that.addMeterWaterInfo.objName = $that.transRoomName(_param.roomName);
|
||||
$that.addMeterWaterInfo.objName = $that.transRoomName(_param.name);
|
||||
$that._queryPreMeterWater(_param.roomId);
|
||||
}
|
||||
});
|
||||
@ -259,6 +259,8 @@
|
||||
let _feeTypeCd = $that.addMeterWaterInfo.feeTypeCd;
|
||||
if (_feeTypeCd == '888800010015') {
|
||||
_meterType = '2020';
|
||||
}else if(_feeTypeCd == '888800010009'){
|
||||
_meterType = '3030';
|
||||
}
|
||||
let param = {
|
||||
params: {
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
<option selected disabled value="">必填,请选择费用类型</option>
|
||||
<option value="888800010015">水费</option>
|
||||
<option value="888800010016">电费</option>
|
||||
<option value="888800010009">煤气费</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -112,6 +112,8 @@
|
||||
|
||||
if(_feeTypeCd == '888800010015'){
|
||||
_meterType = '2020';
|
||||
}else if(_feeTypeCd == '888800010009'){
|
||||
_meterType = '3030';
|
||||
}
|
||||
vc.jumpToPage('/callComponent/importMeterWaterFee/exportData?communityId=' + vc.getCurrentCommunity().communityId+'&meterType='+_meterType);
|
||||
},
|
||||
|
||||
53
public/pages/admin/goldBuyCartManage/goldBuyCartManage.html
Normal file
53
public/pages/admin/goldBuyCartManage/goldBuyCartManage.html
Normal file
@ -0,0 +1,53 @@
|
||||
<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="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
|
||||
<thead>
|
||||
<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>
|
||||
<th class="text-center">备注</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="systemGoldSetting in goldBuyCartManageInfo.systemGoldSettings">
|
||||
<td class="text-center">{{systemGoldSetting.busiId}}</td>
|
||||
<td class="text-center">{{systemGoldSetting.storeName}}</td>
|
||||
<td class="text-center">{{systemGoldSetting.amount}}</td>
|
||||
<td class="text-center">{{systemGoldSetting.goldCount}}</td>
|
||||
<td class="text-center">{{systemGoldSetting.goldTypeName}}</td>
|
||||
<td class="text-center">{{systemGoldSetting.buyerName}}</td>
|
||||
<td class="text-center">{{systemGoldSetting.createTime}}</td>
|
||||
<td class="text-center">{{systemGoldSetting.remark}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="7">
|
||||
<ul class="pagination float-right"></ul>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
<!-- 分页 -->
|
||||
<vc:create path="frame/pagination"></vc:create>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
74
public/pages/admin/goldBuyCartManage/goldBuyCartManage.js
Normal file
74
public/pages/admin/goldBuyCartManage/goldBuyCartManage.js
Normal file
@ -0,0 +1,74 @@
|
||||
/**
|
||||
入驻小区
|
||||
**/
|
||||
(function(vc){
|
||||
var DEFAULT_PAGE = 1;
|
||||
var DEFAULT_ROWS = 10;
|
||||
vc.extends({
|
||||
data:{
|
||||
goldBuyCartManageInfo:{
|
||||
systemGoldSettings:[],
|
||||
total:0,
|
||||
records:1,
|
||||
moreCondition:false,
|
||||
settingId:'',
|
||||
conditions:{
|
||||
title:'',
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
_initMethod:function(){
|
||||
vc.component._listSystemGoldSettings(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
},
|
||||
_initEvent:function(){
|
||||
|
||||
vc.on('systemGoldSettingManage','listSystemGoldSetting',function(_param){
|
||||
vc.component._listSystemGoldSettings(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
});
|
||||
vc.on('pagination','page_event',function(_currentPage){
|
||||
vc.component._listSystemGoldSettings(_currentPage,DEFAULT_ROWS);
|
||||
});
|
||||
},
|
||||
methods:{
|
||||
_listSystemGoldSettings:function(_page, _rows){
|
||||
|
||||
vc.component.goldBuyCartManageInfo.conditions.page = _page;
|
||||
vc.component.goldBuyCartManageInfo.conditions.row = _rows;
|
||||
var param = {
|
||||
params:vc.component.goldBuyCartManageInfo.conditions
|
||||
};
|
||||
|
||||
//发送get请求
|
||||
vc.http.apiGet('/goldBusiness/queryGoldBusiness',
|
||||
param,
|
||||
function(json,res){
|
||||
var _goldBuyCartManageInfo=JSON.parse(json);
|
||||
vc.component.goldBuyCartManageInfo.total = _goldBuyCartManageInfo.total;
|
||||
vc.component.goldBuyCartManageInfo.records = _goldBuyCartManageInfo.records;
|
||||
vc.component.goldBuyCartManageInfo.systemGoldSettings = _goldBuyCartManageInfo.data;
|
||||
vc.emit('pagination','init',{
|
||||
total:vc.component.goldBuyCartManageInfo.records,
|
||||
currentPage:_page
|
||||
});
|
||||
},function(errInfo,error){
|
||||
console.log('请求失败处理');
|
||||
}
|
||||
);
|
||||
},
|
||||
_querySystemGoldSettingMethod:function(){
|
||||
vc.component._listSystemGoldSettings(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
|
||||
},
|
||||
_moreCondition:function(){
|
||||
if(vc.component.goldBuyCartManageInfo.moreCondition){
|
||||
vc.component.goldBuyCartManageInfo.moreCondition = false;
|
||||
}else{
|
||||
vc.component.goldBuyCartManageInfo.moreCondition = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
})(window.vc);
|
||||
@ -77,7 +77,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="meterWater in meterWaterManageInfo.meterWaters">
|
||||
<td class="text-center">{{meterWater.meterType == '1010'?'电表':'水表'}}</td>
|
||||
<td class="text-center">{{_getMeteTypeName(meterWater.meterType)}}</td>
|
||||
<td class="text-center">{{meterWater.objName}}</td>
|
||||
<td class="text-center">{{meterWater.preDegrees}}</td>
|
||||
<td class="text-center">{{meterWater.curDegrees}}</td>
|
||||
|
||||
@ -82,6 +82,14 @@
|
||||
},
|
||||
_openMeterWaterImport:function(){
|
||||
vc.emit('importMeterWaterFee', 'openImportMeterWaterFeeModal',{});
|
||||
},
|
||||
_getMeteTypeName:function(_meterType){
|
||||
if(_meterType == '1010'){
|
||||
return "电表";
|
||||
}else if(_meterType == '2020'){
|
||||
return "水表";
|
||||
}
|
||||
return "煤气费";
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
49
public/pages/property/reportNoFeeRoom/reportNoFeeRoom.html
Executable file
49
public/pages/property/reportNoFeeRoom/reportNoFeeRoom.html
Executable file
@ -0,0 +1,49 @@
|
||||
<div class=" animated fadeInRight ecommerce">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="ibox">
|
||||
<div class="ibox-title">
|
||||
<h5>未收费房屋</h5>
|
||||
<!--<div class="ibox-tools" style="top:10px;">
|
||||
<button type="button" class="btn btn-primary btn-sm" v-on:click="_exportFee()">
|
||||
<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">
|
||||
<thead>
|
||||
<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>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(room,index) in reportNoFeeRoomInfo.rooms">
|
||||
<td class="text-center">{{index+1}}</td>
|
||||
<td class="text-center">{{room.floorNum}}</td>
|
||||
<td class="text-center">{{room.unitNum}}</td>
|
||||
<td class="text-center">{{room.roomNum}}</td>
|
||||
<td class="text-center">{{room.ownerName}}</td>
|
||||
<td class="text-center">{{room.link}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="8">
|
||||
<ul class="pagination float-right"></ul>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
<!-- 分页 -->
|
||||
<vc:create path="frame/pagination"></vc:create>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
73
public/pages/property/reportNoFeeRoom/reportNoFeeRoom.js
Executable file
73
public/pages/property/reportNoFeeRoom/reportNoFeeRoom.js
Executable file
@ -0,0 +1,73 @@
|
||||
/**
|
||||
入驻小区
|
||||
**/
|
||||
(function (vc) {
|
||||
var DEFAULT_PAGE = 1;
|
||||
var DEFAULT_ROWS = 10;
|
||||
vc.extends({
|
||||
data: {
|
||||
reportNoFeeRoomInfo: {
|
||||
rooms: [],
|
||||
total: 0,
|
||||
records: 1,
|
||||
moreCondition: false,
|
||||
conditions: {
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
_initMethod: function () {
|
||||
|
||||
vc.component._listRepairs(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
|
||||
|
||||
},
|
||||
_initEvent: function () {
|
||||
vc.on('pagination', 'page_event', function (_currentPage) {
|
||||
vc.component._listRepairs(_currentPage, DEFAULT_ROWS);
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
|
||||
//查询
|
||||
_queryMethod: function () {
|
||||
vc.component._listRepairs(DEFAULT_PAGE, DEFAULT_ROWS);
|
||||
},
|
||||
//查询方法
|
||||
_listRepairs: function (_page, _rows) {
|
||||
vc.component.reportNoFeeRoomInfo.conditions.page = _page;
|
||||
vc.component.reportNoFeeRoomInfo.conditions.row = _rows;
|
||||
vc.component.reportNoFeeRoomInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
|
||||
var param = {
|
||||
params: vc.component.reportNoFeeRoomInfo.conditions
|
||||
};
|
||||
//发送get请求
|
||||
vc.http.apiGet('/reportFeeMonthStatistics/queryNoFeeRooms',
|
||||
param,
|
||||
function (json, res) {
|
||||
var _reportNoFeeRoomInfo = JSON.parse(json);
|
||||
vc.component.reportNoFeeRoomInfo.total = _reportNoFeeRoomInfo.total;
|
||||
vc.component.reportNoFeeRoomInfo.records = _reportNoFeeRoomInfo.records;
|
||||
vc.component.reportNoFeeRoomInfo.rooms = _reportNoFeeRoomInfo.data;
|
||||
|
||||
vc.emit('pagination', 'init', {
|
||||
total: vc.component.reportNoFeeRoomInfo.records,
|
||||
currentPage: _page,
|
||||
dataCount: vc.component.reportNoFeeRoomInfo.total
|
||||
});
|
||||
}, function (errInfo, error) {
|
||||
console.log('请求失败处理');
|
||||
}
|
||||
);
|
||||
},
|
||||
_moreCondition: function () {
|
||||
if (vc.component.reportNoFeeRoomInfo.moreCondition) {
|
||||
vc.component.reportNoFeeRoomInfo.moreCondition = false;
|
||||
} else {
|
||||
vc.component.reportNoFeeRoomInfo.moreCondition = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
})(window.vc);
|
||||
Loading…
Reference in New Issue
Block a user