diff --git a/app.js b/app.js index 4b4cb0be0..0ba9148d2 100644 --- a/app.js +++ b/app.js @@ -34,10 +34,10 @@ let opts = { //app.use('/callComponent',proxy('https://app.demo.winqi.cn/',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('/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.16:8012',opts)); -app.use('/app',proxy('http://192.168.1.16: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.16:8012',opts)); +//app.use('/app',proxy('http://192.168.1.16:8012',opts)); //app.listen(3000); app.use(express.json()); diff --git a/public/components/property/importRoomFee/importRoomFee.html b/public/components/property/importRoomFee/importRoomFee.html new file mode 100644 index 000000000..f95824bb0 --- /dev/null +++ b/public/components/property/importRoomFee/importRoomFee.html @@ -0,0 +1,60 @@ + \ No newline at end of file diff --git a/public/components/property/importRoomFee/importRoomFee.js b/public/components/property/importRoomFee/importRoomFee.js new file mode 100644 index 000000000..7241f34e4 --- /dev/null +++ b/public/components/property/importRoomFee/importRoomFee.js @@ -0,0 +1,159 @@ +(function (vc) { + + vc.extends({ + data: { + importRoomFeeInfo: { + communityId: vc.getCurrentCommunity().communityId, + excelTemplate: '', + feeTypeCd: '', + feeConfigs: [] + } + }, + _initMethod: function () { + vc.getDict('pay_fee_config', "fee_type_cd", function (_data) { + vc.component.importRoomFeeInfo.feeTypeCds = _data; + }); + + }, + _initEvent: function () { + vc.on('importRoomFee', 'openImportRoomFeeModal', + function (_room) { + $('#importRoomFeeModel').modal('show'); + + }); + }, + methods: { + + importRoomFeeValidate() { + return vc.validate.validate({ + importRoomFeeInfo: vc.component.importRoomFeeInfo + }, + { + 'importRoomFeeInfo.communityId': [{ + limit: "required", + param: "", + errInfo: "数据异常还没有入驻小区" + } + ], + 'importRoomFeeInfo.feeTypeCd': [{ + limit: "required", + param: "", + errInfo: "费用类型不能为空" + } + ], + 'importRoomFeeInfo.excelTemplate': [ + { + limit: "required", + param: "", + errInfo: "文件不能为空" + } + ] + }); + }, + _importData: function () { + + if (!vc.component.importRoomFeeValidate()) { + vc.toast(vc.validate.errInfo); + return; + } + // 导入数据 + if (!vc.component.checkFileType(vc.component.importRoomFeeInfo.excelTemplate.name.split('.')[1])) { + vc.toast('不是有效的Excel格式'); + return; + } + if (!vc.component.checkFileSize(vc.component.importRoomFeeInfo.excelTemplate.size)) { + vc.toast('Excel文件大小不能超过2M'); + return; + } + var param = new FormData(); + param.append("uploadFile", vc.component.importRoomFeeInfo.excelTemplate); + param.append('communityId', vc.component.importRoomFeeInfo.communityId); + + + vc.http.upload( + 'importRoomFee', + 'importData', + param, + { + emulateJSON: true, + //添加请求头 + headers: { + "Content-Type": "multipart/form-data" + } + }, + function (json, res) { + //vm.menus = vm.refreshMenuActive(JSON.parse(json),0); + if (res.status == 200) { + //关闭model + vc.toast("处理成功"); + vc.jumpToPage('/admin.html#/pages/property/listOwner') + return; + } + vc.toast(json, 10000); + }, + function (errInfo, error) { + console.log('请求失败处理'); + vc.toast(errInfo, 10000); + }); + }, + _exportRoomFeeTemplate:function(){ + vc.jumpToPage('/callComponent/importRoomFee/exportData?communityId='+vc.getCurrentCommunity().communityId); + }, + clearAddFeeConfigInfo: function () { + var _feeTypeCds = vc.component.importRoomFeeInfo.feeTypeCds; + vc.component.importRoomFeeInfo = { + communityId: vc.getCurrentCommunity().communityId, + excelTemplate: '', + feeTypeCd: '', + feeConfigs: [] + }; + + vc.component.importRoomFeeInfo.feeTypeCds = _feeTypeCds; + }, + _changeFeeTypeCd: function (_feeTypeCd) { + + var param = { + params: { + page: 1, + row: 20, + communityId: vc.getCurrentCommunity().communityId, + feeTypeCd: _feeTypeCd, + isDefault: 'F' + } + }; + + //发送get请求 + vc.http.get('importRoomFee', 'list', param, + function (json, res) { + var _feeConfigManageInfo = JSON.parse(json); + vc.component.importRoomFeeInfo.feeConfigs = _feeConfigManageInfo.feeConfigs; + }, + function (errInfo, error) { + console.log('请求失败处理'); + }); + }, + getExcelTemplate: function (e) { + //console.log("getExcelTemplate 开始调用") + vc.component.importRoomFeeInfo.excelTemplate = e.target.files[0]; + }, + checkFileType: function (fileType) { + const acceptTypes = ['xls', 'xlsx']; + for (var i = 0; i < acceptTypes.length; i++) { + if (fileType === acceptTypes[i]) { + return true; + } + } + return false; + }, + checkFileSize: function (fileSize) { + //2M + const MAX_SIZE = 2 * 1024 * 1024; + if (fileSize > MAX_SIZE) { + return false; + } + return true; + } + } + }); + +})(window.vc); \ No newline at end of file diff --git a/public/pages/property/roomCreateFee/roomCreateFee.html b/public/pages/property/roomCreateFee/roomCreateFee.html index 8711364b5..283506d59 100644 --- a/public/pages/property/roomCreateFee/roomCreateFee.html +++ b/public/pages/property/roomCreateFee/roomCreateFee.html @@ -76,6 +76,10 @@
房屋信息
+
\ No newline at end of file diff --git a/public/pages/property/roomCreateFee/roomCreateFee.js b/public/pages/property/roomCreateFee/roomCreateFee.js index 98f2028e0..47409e689 100644 --- a/public/pages/property/roomCreateFee/roomCreateFee.js +++ b/public/pages/property/roomCreateFee/roomCreateFee.js @@ -170,6 +170,9 @@ _toOwnerPayFee:function(_room){ let roomName = _room.floorNum + "栋"+_room.unitNum+"单元"+_room.roomNum+"室" vc.jumpToPage('/admin.html#/pages/property/owePayFeeOrder?payObjId='+_room.roomId+"&payObjType=3333&roomName="+roomName); + }, + _openRoomFeeImport:function(){ + vc.emit('importRoomFee','openImportRoomFeeModal',{}); } } });