diff --git a/public/components/contract/contractDetailFile/contractDetailFile.js b/public/components/contract/contractDetailFile/contractDetailFile.js index 21ad957fb..000f67851 100644 --- a/public/components/contract/contractDetailFile/contractDetailFile.js +++ b/public/components/contract/contractDetailFile/contractDetailFile.js @@ -35,8 +35,8 @@ vc.http.apiGet('/contractFile/queryContractFile', param, function (json, res) { - var _contractTFile = JSON.parse(json); - vc.component.contractDetailInfo.files = _contractTFile.data; + let _contractTFile = JSON.parse(json); + $that.contractDetailFileInfo.files = _contractTFile.data; }, function (errInfo, error) { console.log('请求失败处理'); diff --git a/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.html b/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.html new file mode 100644 index 000000000..6a9ec894b --- /dev/null +++ b/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.html @@ -0,0 +1,88 @@ + \ No newline at end of file diff --git a/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.js b/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.js new file mode 100644 index 000000000..cb434214d --- /dev/null +++ b/public/components/fee/searchOwnerInvoice/searchOwnerInvoice.js @@ -0,0 +1,65 @@ +(function (vc) { + vc.extends({ + propTypes: { + emitChooseOwner: vc.propTypes.string, + emitLoadData: vc.propTypes.string + }, + data: { + searchOwnerInvoiceInfo: { + ownerInvoices: [], + ownerNameLike: '', + roomName: '' + } + }, + _initMethod: function () { + }, + _initEvent: function () { + vc.on('searchOwnerInvoice', 'openSearchOwnerInvoiceModel', function (_param) { + $('#searchOwnerInvoiceModel').modal('show'); + $that._refreshsearchOwnerInvoiceData(); + $that._loadAllOwnerInvoiceInfo(1, 10); + }); + vc.on('searchOwnerInvoice', 'paginationPlus', 'page_event', function (_currentPage) { + $that._loadAllOwnerInvoiceInfo(_currentPage, 10); + }); + }, + methods: { + _loadAllOwnerInvoiceInfo: function (_page, _row) { + let param = { + params: { + page: _page, + row: _row, + communityId: vc.getCurrentCommunity().communityId, + ownerNameLike: $that.searchOwnerInvoiceInfo.ownerNameLike, + } + }; + //发送get请求 + vc.http.apiGet('/invoice.listOwnerInvoice', + param, + function (json) { + let _json = JSON.parse(json); + $that.searchOwnerInvoiceInfo.ownerInvoices = _json.data; + vc.emit('searchOwnerInvoice', 'paginationPlus', 'init', { + total: _ownerInfo.records, + currentPage: _page + }); + }, + function () { + console.log('请求失败处理'); + } + ); + }, + chooseOwnerInvoice: function (_owner) { + vc.emit($props.emitChooseOwner, 'chooseOwnerInvoice', _owner); + vc.emit($props.emitLoadData, 'listOwnerInvoiceData', _owner); + $('#searchOwnerInvoiceModel').modal('hide'); + }, + searchOwnerInvoices: function () { + $that._loadAllOwnerInfo(1, 10, $that.searchOwnerInvoiceInfo.ownerNameLike); + }, + _refreshsearchOwnerInvoiceData: function () { + $that.searchOwnerInvoiceInfo.ownerNameLike = ""; + } + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/pages/admin/addContract/addContract.js b/public/pages/admin/addContract/addContract.js index b45215a7f..c0b1acf9b 100644 --- a/public/pages/admin/addContract/addContract.js +++ b/public/pages/admin/addContract/addContract.js @@ -79,14 +79,14 @@ $that.addContractInfo.objId = param.ownerId; }) vc.on("addContract", "notify3", function (info) { - vc.component.addContractInfo.nextUserId = info.staffId; - vc.component.addContractInfo.staffName = info.staffName; + $that.addContractInfo.nextUserId = info.staffId; + $that.addContractInfo.staffName = info.staffName; }); }, methods: { addContractValidate() { return vc.validate.validate({ - addContractInfo: vc.component.addContractInfo + addContractInfo: $that.addContractInfo }, { 'addContractInfo.contractName': [ { @@ -255,7 +255,7 @@ param, function (json, res) { var _contractTFile = JSON.parse(json); - vc.component.addContractInfo.rooms = _contractTFile.data; + $that.addContractInfo.rooms = _contractTFile.data; }, function (errInfo, error) { console.log('请求失败处理'); @@ -263,15 +263,15 @@ ); }, saveContractInfo: function () { - if (!vc.component.addContractValidate()) { + if (!$that.addContractValidate()) { vc.toast(vc.validate.errInfo); return; } - vc.component.addContractInfo.communityId = vc.getCurrentCommunity().communityId; + $that.addContractInfo.communityId = vc.getCurrentCommunity().communityId; vc.http.apiPost( '/contract/saveContract', - JSON.stringify(vc.component.addContractInfo), { + JSON.stringify($that.addContractInfo), { emulateJSON: true }, function (json, res) { @@ -293,7 +293,7 @@ }, clearAddContractInfo: function () { let _contractTypes = $that.addContractInfo.contractTypes; - vc.component.addContractInfo = { + $that.addContractInfo = { contractName: '', contractCode: '', contractType: '', @@ -343,7 +343,7 @@ param, function (json, res) { var _contractTypeManageInfo = JSON.parse(json); - vc.component.addContractInfo.contractTypes = _contractTypeManageInfo.data; + $that.addContractInfo.contractTypes = _contractTypeManageInfo.data; }, function (errInfo, error) { console.log('请求失败处理'); @@ -362,7 +362,7 @@ param, function (json, res) { var _contractTypeManageInfo = JSON.parse(json); - vc.component.addContractInfo.contractPartyAs = _contractTypeManageInfo.data; + $that.addContractInfo.contractPartyAs = _contractTypeManageInfo.data; }, function (errInfo, error) { console.log('请求失败处理'); @@ -433,20 +433,20 @@ } }, getFile: function (e, index) { - vc.component.addContractInfo.tempfile = e.target.files[0]; - $that.addContractInfo.contractFilePo[index].fileRealName = vc.component.addContractInfo.tempfile.name; + $that.addContractInfo.tempfile = e.target.files[0]; + $that.addContractInfo.contractFilePo[index].fileRealName = $that.addContractInfo.tempfile.name; this._importData(index); }, _importData: function (index) { // 导入数据 - let _fileName = vc.component.addContractInfo.tempfile.name; + let _fileName = $that.addContractInfo.tempfile.name; let _suffix = _fileName.substring(_fileName.lastIndexOf('.') + 1); - if (!vc.component.checkFileType(_suffix.toLowerCase())) { + if (!$that.checkFileType(_suffix.toLowerCase())) { vc.toast('操作失败，请上传图片、PDF格式的文件'); return; } - var param = new FormData(); - param.append("uploadFile", vc.component.addContractInfo.tempfile); + let param = new FormData(); + param.append("uploadFile", $that.addContractInfo.tempfile); vc.http.upload( 'importRoomFee', 'uploadContactFile', @@ -505,7 +505,7 @@ param, function (json, res) { let _expirationContractInfo = JSON.parse(json); - vc.copyObject(_expirationContractInfo.data[0], vc.component.addContractInfo); + vc.copyObject(_expirationContractInfo.data[0], $that.addContractInfo); $that.addContractInfo.contractId = ''; $that.addContractInfo.contractCode = ''; $that.addContractInfo.contractName = ''; diff --git a/public/pages/fee/addOwnerInvoice/addOwnerInvoice.html b/public/pages/fee/addOwnerInvoice/addOwnerInvoice.html index e84c222a7..c050d97c5 100644 --- a/public/pages/fee/addOwnerInvoice/addOwnerInvoice.html +++ b/public/pages/fee/addOwnerInvoice/addOwnerInvoice.html @@ -83,6 +83,6 @@ - + \ No newline at end of file diff --git a/public/pages/fee/addOwnerInvoice/addOwnerInvoice.js b/public/pages/fee/addOwnerInvoice/addOwnerInvoice.js index d77053164..8a8d3a593 100644 --- a/public/pages/fee/addOwnerInvoice/addOwnerInvoice.js +++ b/public/pages/fee/addOwnerInvoice/addOwnerInvoice.js @@ -17,9 +17,8 @@ }, _initEvent: function () { - vc.on('addOwnerInvoice', 'chooseOwner', function (_owner) { - $that.addOwnerInvoiceInfo.ownerName = _owner.name; - $that.addOwnerInvoiceInfo.ownerId = _owner.ownerId; + vc.on('addOwnerInvoice', 'chooseOwnerInvoice', function (_owner) { + vc.copyObject(_owner,$that.addOwnerInvoiceInfo); $that._loadFeeDetails(); }); }, @@ -116,21 +115,16 @@ if (_json.code == 0) { //关闭model vc.goBack(); - return; } vc.toast(_json.msg); - }, function (errInfo, error) { - console.log('请求失败处理'); - vc.toast(errInfo); - }); }, _openChooseOwner: function () { - vc.emit('searchOwner', 'openSearchOwnerModel', {}); + vc.emit('searchOwnerInvoice', 'openSearchOwnerInvoiceModel', {}); }, }