diff --git a/app.js b/app.js index c5e3ae43d..06a598c93 100755 --- a/app.js +++ b/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)); diff --git a/public/components/property/addMeterWater/addMeterWater.html b/public/components/property/addMeterWater/addMeterWater.html index d09949161..548f8bd97 100755 --- a/public/components/property/addMeterWater/addMeterWater.html +++ b/public/components/property/addMeterWater/addMeterWater.html @@ -14,6 +14,7 @@ + diff --git a/public/components/property/addMeterWater/addMeterWater.js b/public/components/property/addMeterWater/addMeterWater.js index 8d967dc97..1ebfa567d 100755 --- a/public/components/property/addMeterWater/addMeterWater.js +++ b/public/components/property/addMeterWater/addMeterWater.js @@ -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: { diff --git a/public/components/property/importMeterWaterFee/importMeterWaterFee.html b/public/components/property/importMeterWaterFee/importMeterWaterFee.html index 30309c805..79d9956ae 100755 --- a/public/components/property/importMeterWaterFee/importMeterWaterFee.html +++ b/public/components/property/importMeterWaterFee/importMeterWaterFee.html @@ -14,6 +14,7 @@ + diff --git a/public/components/property/importMeterWaterFee/importMeterWaterFee.js b/public/components/property/importMeterWaterFee/importMeterWaterFee.js index 0762a24cd..f80ec2f9f 100755 --- a/public/components/property/importMeterWaterFee/importMeterWaterFee.js +++ b/public/components/property/importMeterWaterFee/importMeterWaterFee.js @@ -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); }, diff --git a/public/pages/admin/goldBuyCartManage/goldBuyCartManage.html b/public/pages/admin/goldBuyCartManage/goldBuyCartManage.html new file mode 100644 index 000000000..b1e87fc96 --- /dev/null +++ b/public/pages/admin/goldBuyCartManage/goldBuyCartManage.html @@ -0,0 +1,53 @@ +
+
+
+
+
+
购买记录
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
交易编号商户名称金额数量金币类型购买人购买时间备注
{{systemGoldSetting.busiId}}{{systemGoldSetting.storeName}}{{systemGoldSetting.amount}}{{systemGoldSetting.goldCount}}{{systemGoldSetting.goldTypeName}}{{systemGoldSetting.buyerName}}{{systemGoldSetting.createTime}}{{systemGoldSetting.remark}}
+
    +
    + + +
    +
    +
    +
    + +
    \ No newline at end of file diff --git a/public/pages/admin/goldBuyCartManage/goldBuyCartManage.js b/public/pages/admin/goldBuyCartManage/goldBuyCartManage.js new file mode 100644 index 000000000..372d23287 --- /dev/null +++ b/public/pages/admin/goldBuyCartManage/goldBuyCartManage.js @@ -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); diff --git a/public/pages/property/meterWaterManage/meterWaterManage.html b/public/pages/property/meterWaterManage/meterWaterManage.html index c4b10cbaa..1f946e077 100755 --- a/public/pages/property/meterWaterManage/meterWaterManage.html +++ b/public/pages/property/meterWaterManage/meterWaterManage.html @@ -77,7 +77,7 @@ - {{meterWater.meterType == '1010'?'电表':'水表'}} + {{_getMeteTypeName(meterWater.meterType)}} {{meterWater.objName}} {{meterWater.preDegrees}} {{meterWater.curDegrees}} diff --git a/public/pages/property/meterWaterManage/meterWaterManage.js b/public/pages/property/meterWaterManage/meterWaterManage.js index 1146684d3..9deb9a0c1 100755 --- a/public/pages/property/meterWaterManage/meterWaterManage.js +++ b/public/pages/property/meterWaterManage/meterWaterManage.js @@ -82,6 +82,14 @@ }, _openMeterWaterImport:function(){ vc.emit('importMeterWaterFee', 'openImportMeterWaterFeeModal',{}); + }, + _getMeteTypeName:function(_meterType){ + if(_meterType == '1010'){ + return "电表"; + }else if(_meterType == '2020'){ + return "水表"; + } + return "煤气费"; } } }); diff --git a/public/pages/property/reportNoFeeRoom/reportNoFeeRoom.html b/public/pages/property/reportNoFeeRoom/reportNoFeeRoom.html new file mode 100755 index 000000000..b1f59c652 --- /dev/null +++ b/public/pages/property/reportNoFeeRoom/reportNoFeeRoom.html @@ -0,0 +1,49 @@ +
    +
    +
    +
    +
    +
    未收费房屋
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    序号楼栋单元房屋业主名称业主电话
    {{index+1}}{{room.floorNum}}{{room.unitNum}}{{room.roomNum}}{{room.ownerName}}{{room.link}}
    +
      +
      + + +
      +
      +
      +
      +
      \ No newline at end of file diff --git a/public/pages/property/reportNoFeeRoom/reportNoFeeRoom.js b/public/pages/property/reportNoFeeRoom/reportNoFeeRoom.js new file mode 100755 index 000000000..a84ba81da --- /dev/null +++ b/public/pages/property/reportNoFeeRoom/reportNoFeeRoom.js @@ -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);