@@ -84,7 +84,9 @@
{{fee.stateName}} |
-
+
|
diff --git a/public/components/community/aRoomDetailRoomFee/aRoomDetailRoomFee.js b/public/components/community/aRoomDetailRoomFee/aRoomDetailRoomFee.js
index df6321cec..909819728 100644
--- a/public/components/community/aRoomDetailRoomFee/aRoomDetailRoomFee.js
+++ b/public/components/community/aRoomDetailRoomFee/aRoomDetailRoomFee.js
@@ -101,7 +101,9 @@
_changeContractConfigId:function() {
$that._loadARoomDetailRoomFeeData(DEFAULT_PAGE, DEFAULT_ROWS);
},
-
+ _toAdminFeeDetail:function(_fee){
+ vc.jumpToPage('/#/pages/fee/adminFeeDetail?feeId='+_fee.feeId);
+ }
}
diff --git a/public/components/fee/aFeeDetailConfig/aFeeDetailConfig.html b/public/components/fee/aFeeDetailConfig/aFeeDetailConfig.html
new file mode 100644
index 000000000..08813ac52
--- /dev/null
+++ b/public/components/fee/aFeeDetailConfig/aFeeDetailConfig.html
@@ -0,0 +1,82 @@
+
\ No newline at end of file
diff --git a/public/components/fee/aFeeDetailConfig/aFeeDetailConfig.js b/public/components/fee/aFeeDetailConfig/aFeeDetailConfig.js
new file mode 100644
index 000000000..45a5c6588
--- /dev/null
+++ b/public/components/fee/aFeeDetailConfig/aFeeDetailConfig.js
@@ -0,0 +1,62 @@
+/**
+ 入驻小区
+ **/
+(function (vc) {
+ var DEFAULT_PAGE = 1;
+ var DEFAULT_ROWS = 10;
+ vc.extends({
+ data: {
+ aFeeDetailConfigInfo: {
+ feeConfigs: [],
+ configId:'',
+ }
+ },
+ _initMethod: function () {
+ },
+ _initEvent: function () {
+ vc.on('aFeeDetailConfig', 'switch', function (_data) {
+ $that.aFeeDetailConfigInfo.configId = _data.configId;
+ $that._loadAFeeDetailConfigData(DEFAULT_PAGE, DEFAULT_ROWS);
+ });
+ vc.on('aFeeDetailConfig', 'paginationPlus', 'page_event',
+ function (_currentPage) {
+ $that._loadAFeeDetailConfigData(_currentPage, DEFAULT_ROWS);
+ });
+ vc.on('aFeeDetailConfig', 'notify', function (_data) {
+ $that._loadAFeeDetailConfigData(DEFAULT_PAGE,DEFAULT_ROWS);
+ })
+ },
+ methods: {
+ _loadAFeeDetailConfigData: function (_page, _row) {
+ let param = {
+ params: {
+ configId:$that.aFeeDetailConfigInfo.configId,
+ page:_page,
+ row:_row
+ }
+ };
+
+ //发送get请求
+ vc.http.apiGet('/feeConfig.queryAdminFeeConfigs',
+ param,
+ function (json) {
+ let _json = JSON.parse(json);
+ $that.aFeeDetailConfigInfo.feeConfigs = _json.feeConfigs;
+ vc.emit('aFeeDetailConfig', 'paginationPlus', 'init', {
+ total: _json.records,
+ dataCount: _json.total,
+ currentPage: _page
+ });
+ },
+ function () {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ //查询
+ _qureyAFeeDetailConfig: function () {
+ $that._loadAFeeDetailConfigData(DEFAULT_PAGE, DEFAULT_ROWS);
+ },
+ }
+ });
+})(window.vc);
\ No newline at end of file
diff --git a/public/components/fee/aFeeDetailDiscount/aFeeDetailDiscount.html b/public/components/fee/aFeeDetailDiscount/aFeeDetailDiscount.html
new file mode 100644
index 000000000..1ba70a548
--- /dev/null
+++ b/public/components/fee/aFeeDetailDiscount/aFeeDetailDiscount.html
@@ -0,0 +1,79 @@
+
\ No newline at end of file
diff --git a/public/components/fee/aFeeDetailDiscount/aFeeDetailDiscount.js b/public/components/fee/aFeeDetailDiscount/aFeeDetailDiscount.js
new file mode 100644
index 000000000..8343857a1
--- /dev/null
+++ b/public/components/fee/aFeeDetailDiscount/aFeeDetailDiscount.js
@@ -0,0 +1,59 @@
+/**
+ 入驻小区
+ **/
+(function (vc) {
+ var DEFAULT_PAGE = 1;
+ var DEFAULT_ROWS = 10;
+ vc.extends({
+ data: {
+ aFeeDetailDiscountInfo: {
+ applyRoomDiscounts: [],
+ feeId: '',
+ }
+ },
+ _initMethod: function () {
+ },
+ _initEvent: function () {
+ vc.on('aFeeDetailDiscount', 'switch', function (_data) {
+ $that.aFeeDetailDiscountInfo.feeId = _data.feeId;
+ $that._loadAFeeDetailDiscountData(DEFAULT_PAGE, DEFAULT_ROWS);
+ });
+ vc.on('aFeeDetailDiscount', 'paginationPlus', 'page_event',
+ function (_currentPage) {
+ $that._loadAFeeDetailDiscountData(_currentPage, DEFAULT_ROWS);
+ });
+ },
+ methods: {
+ _loadAFeeDetailDiscountData: function (_page, _row) {
+ let param = {
+ params: {
+ feeId: $that.aFeeDetailDiscountInfo.feeId,
+ page: _page,
+ row: _row
+ }
+ };
+
+ //发送get请求
+ vc.http.apiGet('/fee.queryAdminApplyRoomDiscount',
+ param,
+ function (json) {
+ var _roomInfo = JSON.parse(json);
+ $that.aFeeDetailDiscountInfo.applyRoomDiscounts = _roomInfo.data;
+ vc.emit('aFeeDetailDiscount', 'paginationPlus', 'init', {
+ total: _roomInfo.records,
+ dataCount: _roomInfo.total,
+ currentPage: _page
+ });
+ },
+ function () {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ //查询
+ _qureyAFeeDetailDiscount: function () {
+ $that._loadAFeeDetailDiscountData(DEFAULT_PAGE, DEFAULT_ROWS);
+ },
+ }
+ });
+})(window.vc);
\ No newline at end of file
diff --git a/public/components/fee/aFeeDetailFeeObj/aFeeDetailFeeObj.html b/public/components/fee/aFeeDetailFeeObj/aFeeDetailFeeObj.html
new file mode 100644
index 000000000..006e6a8dd
--- /dev/null
+++ b/public/components/fee/aFeeDetailFeeObj/aFeeDetailFeeObj.html
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/components/fee/aFeeDetailFeeObj/aFeeDetailFeeObj.js b/public/components/fee/aFeeDetailFeeObj/aFeeDetailFeeObj.js
new file mode 100644
index 000000000..aba6c3bc5
--- /dev/null
+++ b/public/components/fee/aFeeDetailFeeObj/aFeeDetailFeeObj.js
@@ -0,0 +1,61 @@
+/**
+ 入驻小区
+ **/
+(function (vc) {
+ var DEFAULT_PAGE = 1;
+ var DEFAULT_ROWS = 10;
+ vc.extends({
+ data: {
+ aFeeDetailFeeObjInfo: {
+ feeObjs: [],
+ configId:'',
+ payerObjType:''
+ }
+ },
+ _initMethod: function () {
+ },
+ _initEvent: function () {
+ vc.on('aFeeDetailFeeObj', 'switch', function (_data) {
+ $that.aFeeDetailFeeObjInfo.configId = _data.configId;
+ $that._loadAFeeDetailFeeObjData(DEFAULT_PAGE, DEFAULT_ROWS);
+ });
+ vc.on('aFeeDetailFeeObj', 'paginationPlus', 'page_event',
+ function (_currentPage) {
+ $that._loadAFeeDetailFeeObjData(_currentPage, DEFAULT_ROWS);
+ });
+ },
+ methods: {
+ _loadAFeeDetailFeeObjData: function (_page, _row) {
+ let param = {
+ params: {
+ configId:$that.aFeeDetailFeeObjInfo.configId,
+ payerObjType:$that.aFeeDetailFeeObjInfo.payerObjType,
+ page:_page,
+ row:_row
+ }
+ };
+
+ //发送get请求
+ vc.http.apiGet('/feeConfig.listAdminConfigFeeObjs',
+ param,
+ function (json) {
+ var _roomInfo = JSON.parse(json);
+ $that.aFeeDetailFeeObjInfo.feeObjs = _roomInfo.data;
+ vc.emit('aFeeDetailFeeObj', 'paginationPlus', 'init', {
+ total: _roomInfo.records,
+ dataCount: _roomInfo.total,
+ currentPage: _page
+ });
+ },
+ function () {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ //查询
+ _qureyAFeeDetailFeeObj: function () {
+ $that._loadAFeeDetailFeeObjData(DEFAULT_PAGE, DEFAULT_ROWS);
+ },
+ }
+ });
+})(window.vc);
\ No newline at end of file
diff --git a/public/components/fee/aFeeDetailHis/aFeeDetailHis.html b/public/components/fee/aFeeDetailHis/aFeeDetailHis.html
new file mode 100644
index 000000000..3edffbc9c
--- /dev/null
+++ b/public/components/fee/aFeeDetailHis/aFeeDetailHis.html
@@ -0,0 +1,62 @@
+
\ No newline at end of file
diff --git a/public/components/fee/aFeeDetailHis/aFeeDetailHis.js b/public/components/fee/aFeeDetailHis/aFeeDetailHis.js
new file mode 100644
index 000000000..c5d39dfbc
--- /dev/null
+++ b/public/components/fee/aFeeDetailHis/aFeeDetailHis.js
@@ -0,0 +1,101 @@
+/**
+ 入驻小区
+ **/
+(function (vc) {
+ var DEFAULT_PAGE = 1;
+ var DEFAULT_ROWS = 10;
+ vc.extends({
+ data: {
+ aFeeDetailHisInfo: {
+ fees: [],
+ feeId: '',
+ staffNameLike: '',
+ feeNameLike: '',
+ payerObjName: '',
+ logStartTime: '',
+ logEndTime: '',
+ }
+ },
+ _initMethod: function () {
+ },
+ _initEvent: function () {
+ vc.on('aFeeDetailHis', 'switch', function (_data) {
+ $that.aFeeDetailHisInfo.feeId = _data.feeId;
+ $that.aFeeDetailHisInfo.staffNameLike = _data.staffNameLike;
+ $that.aFeeDetailHisInfo.feeNameLike = _data.feeNameLike;
+ $that.aFeeDetailHisInfo.payerObjName = _data.payerObjName;
+ $that.aFeeDetailHisInfo.logStartTime = _data.logStartTime;
+ $that.aFeeDetailHisInfo.logEndTime = _data.logEndTime;
+ $that._loadAFeeDetailHisData(DEFAULT_PAGE, DEFAULT_ROWS);
+ });
+ vc.on('aFeeDetailHis', 'notify',
+ function (_data) {
+ $that._loadAFeeDetailHisData(DEFAULT_PAGE, DEFAULT_ROWS);
+ });
+ vc.on('aFeeDetailHis', 'paginationPlus', 'page_event',
+ function (_currentPage) {
+ vc.component._loadAFeeDetailHisData(_currentPage, DEFAULT_ROWS);
+ });
+ },
+ methods: {
+ _loadAFeeDetailHisData: function (_page, _row) {
+ let param = {
+ params: {
+ feeId: $that.aFeeDetailHisInfo.feeId,
+ staffNameLike: $that.aFeeDetailHisInfo.staffNameLike,
+ feeNameLike: $that.aFeeDetailHisInfo.feeNameLike,
+ payerObjName: $that.aFeeDetailHisInfo.payerObjName,
+ logStartTime: $that.aFeeDetailHisInfo.logStartTime,
+ logEndTime: $that.aFeeDetailHisInfo.logEndTime,
+ page: _page,
+ row: _row
+ }
+ };
+ //发送get请求
+ vc.http.apiGet('/fee.queryAdminHisFee',
+ param,
+ function (json) {
+ let _roomInfo = JSON.parse(json);
+ vc.component.aFeeDetailHisInfo.fees = _roomInfo.data;
+ vc.emit('aFeeDetailHis', 'paginationPlus', 'init', {
+ total: _roomInfo.records,
+ dataCount: _roomInfo.total,
+ currentPage: _page
+ });
+ },
+ function () {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ //查询
+ _qureyAFeeDetailHis: function () {
+ $that._loadAFeeDetailHisData(DEFAULT_PAGE, DEFAULT_ROWS);
+ },
+ _getFeeHisOperate: function (_fee) {
+ let _feeCount = 0;
+ $that.aFeeDetailHisInfo.fees.forEach(item => {
+ if (_fee.bId == item.bId) {
+ _feeCount += 1;
+ }
+ });
+ if (_feeCount <= 1) {
+ if (_fee.operate == 'ADD') {
+ return '添加';
+ }
+ if (_fee.operate == 'DEL') {
+ return '删除';
+ }
+ return "-"
+ }
+ if (_fee.operate == 'ADD') {
+ return '修改(新)';
+ }
+ if (_fee.operate == 'DEL') {
+ return '修改(旧)';
+ }
+ return "-"
+ }
+ }
+ });
+})(window.vc);
\ No newline at end of file
diff --git a/public/components/fee/aFeeDetailImport/aFeeDetailImport.html b/public/components/fee/aFeeDetailImport/aFeeDetailImport.html
new file mode 100644
index 000000000..da0a2b7b7
--- /dev/null
+++ b/public/components/fee/aFeeDetailImport/aFeeDetailImport.html
@@ -0,0 +1,62 @@
+
\ No newline at end of file
diff --git a/public/components/fee/aFeeDetailImport/aFeeDetailImport.js b/public/components/fee/aFeeDetailImport/aFeeDetailImport.js
new file mode 100644
index 000000000..a077fc624
--- /dev/null
+++ b/public/components/fee/aFeeDetailImport/aFeeDetailImport.js
@@ -0,0 +1,59 @@
+/**
+ 入驻小区
+ **/
+(function (vc) {
+ var DEFAULT_PAGE = 1;
+ var DEFAULT_ROWS = 10;
+ vc.extends({
+ data: {
+ aFeeDetailImportInfo: {
+ importFeeDetails: [],
+ feeId: '',
+ }
+ },
+ _initMethod: function () {
+ },
+ _initEvent: function () {
+ vc.on('aFeeDetailImport', 'switch', function (_data) {
+ $that.aFeeDetailImportInfo.feeId = _data.feeId;
+ $that._loadAFeeDetailImportData(DEFAULT_PAGE, DEFAULT_ROWS);
+ });
+ vc.on('aFeeDetailImport', 'paginationPlus', 'page_event',
+ function (_currentPage) {
+ vc.component._loadAFeeDetailImportData(_currentPage, DEFAULT_ROWS);
+ });
+ },
+ methods: {
+ _loadAFeeDetailImportData: function (_page, _row) {
+ let param = {
+ params: {
+ feeId: $that.aFeeDetailImportInfo.feeId,
+ page: _page,
+ row: _row
+ }
+ };
+
+ //发送get请求
+ vc.http.apiGet('/fee.queryAdminImportFeeDetail',
+ param,
+ function (json) {
+ var _roomInfo = JSON.parse(json);
+ vc.component.aFeeDetailImportInfo.importFeeDetails = _roomInfo.data;
+ vc.emit('aFeeDetailImport', 'paginationPlus', 'init', {
+ total: _roomInfo.records,
+ dataCount: _roomInfo.total,
+ currentPage: _page
+ });
+ },
+ function () {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ //查询
+ _qureyAFeeDetailImport: function () {
+ $that._loadAFeeDetailImportData(DEFAULT_PAGE, DEFAULT_ROWS);
+ },
+ }
+ });
+})(window.vc);
\ No newline at end of file
diff --git a/public/components/fee/aFeeDetailSub/aFeeDetailSub.html b/public/components/fee/aFeeDetailSub/aFeeDetailSub.html
new file mode 100644
index 000000000..d411ba97d
--- /dev/null
+++ b/public/components/fee/aFeeDetailSub/aFeeDetailSub.html
@@ -0,0 +1,57 @@
+
\ No newline at end of file
diff --git a/public/components/fee/aFeeDetailSub/aFeeDetailSub.js b/public/components/fee/aFeeDetailSub/aFeeDetailSub.js
new file mode 100644
index 000000000..296732aaf
--- /dev/null
+++ b/public/components/fee/aFeeDetailSub/aFeeDetailSub.js
@@ -0,0 +1,95 @@
+/**
+ 入驻小区
+ **/
+(function(vc) {
+ var DEFAULT_PAGE = 1;
+ var DEFAULT_ROWS = 10;
+ vc.extends({
+ data: {
+ aFeeDetailSubInfo: {
+ subs: [],
+ feeId: '',
+ total: '',
+ records: '',
+ fee:{}
+ }
+ },
+ _initMethod: function() {},
+ _initEvent: function() {
+ //切换 至费用页面
+ vc.on('aFeeDetailSub', 'switch', function(_param) {
+ if (_param.feeId == '') {
+ return;
+ }
+ vc.copyObject(_param, $that.aFeeDetailSubInfo);
+ $that._listAFeeDetailSub(DEFAULT_PAGE, DEFAULT_ROWS);
+ $that._loadAFeeDetailSubFeeInfo();
+ });
+ vc.on('aFeeDetailSub', 'loadSub', function() {
+ $that._listAFeeDetailSub(DEFAULT_PAGE, DEFAULT_ROWS);
+ $that._loadAFeeDetailSubFeeInfo();
+
+ });
+ vc.on('aFeeDetailSub', 'paginationPlus', 'page_event',
+ function(_currentPage) {
+ $that._listAFeeDetailSub(_currentPage, DEFAULT_ROWS);
+ });
+ },
+ methods: {
+ _listAFeeDetailSub: function(_page, _rows) {
+ let param = {
+ params: {
+ page: _page,
+ row: _rows,
+ pcFeeId: $that.aFeeDetailSubInfo.feeId,
+ }
+ };
+ //发送get请求
+ vc.http.apiGet('/feeSub.listAdminPayFeeSub',
+ param,
+ function(json, res) {
+ let _json = JSON.parse(json);
+ $that.aFeeDetailSubInfo.total = _json.total;
+ $that.aFeeDetailSubInfo.records = _json.records;
+ $that.aFeeDetailSubInfo.subs = _json.data;
+ vc.emit('aFeeDetailSub', 'paginationPlus', 'init', {
+ total: $that.aFeeDetailSubInfo.records,
+ dataCount: $that.aFeeDetailSubInfo.total,
+ currentPage: _page
+ });
+ },
+ function(errInfo, error) {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ _loadAFeeDetailSubFeeInfo: function () {
+ let param = {
+ params: {
+ page: 1,
+ row: 1,
+ feeId: $that.aFeeDetailSubInfo.feeId,
+ }
+ };
+ //发送get请求
+ vc.http.apiGet('/fee.listAdminFee',
+ param,
+ function (json) {
+ let _feeInfo = JSON.parse(json);
+ // 员工列表 和 岗位列表匹配
+ $that.aFeeDetailSubInfo.fee = _feeInfo.fees[0];
+ },
+ function () {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ _mergeFee:function(_fee){
+ vc.emit('mergeFee', 'openMergeFeeModal',_fee);
+ },
+ _splitPayFee: function (_fee) {
+ vc.emit('splitFee', 'openSplitFeeModal', $that.aFeeDetailSubInfo.fee);
+ }
+ }
+ });
+})(window.vc);
\ No newline at end of file
diff --git a/public/pages/fee/adminFeeDetail/adminFeeDetail.html b/public/pages/fee/adminFeeDetail/adminFeeDetail.html
new file mode 100644
index 000000000..3e0948fb0
--- /dev/null
+++ b/public/pages/fee/adminFeeDetail/adminFeeDetail.html
@@ -0,0 +1,267 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/pages/fee/adminFeeDetail/adminFeeDetail.js b/public/pages/fee/adminFeeDetail/adminFeeDetail.js
new file mode 100644
index 000000000..af5b36e78
--- /dev/null
+++ b/public/pages/fee/adminFeeDetail/adminFeeDetail.js
@@ -0,0 +1,104 @@
+/**
+业主详情页面
+ **/
+(function (vc) {
+ vc.extends({
+ data: {
+ adminFeeDetailInfo: {
+ feeId: '',
+ configId: '',
+ feeFlag:'',
+ feeFlagName: '',
+ feeTypeCdName: '',
+ payerObjName: '',
+ payerObjId: '',
+ payerObjType:'',
+ feeName: '',
+ stateName: '',
+ state: '',
+ startTime: '',
+ batchId: '',
+ endTime: '',
+ deadlineTime: '',
+ amountOwed: '',
+ attrs: [],
+ _currentTab: 'aRoomDetailHisFee',
+ needBack: false,
+ }
+ },
+ _initMethod: function () {
+ $that.adminFeeDetailInfo.feeId = vc.getParam('feeId');
+ if (!vc.notNull($that.adminFeeDetailInfo.feeId)) {
+ return;
+ }
+ $that._loadAdminFeeDetailInfo();
+
+ },
+ _initEvent: function () {
+ vc.on('adminFeeDetail', 'listCarData', function (_info) {
+ //$that._loadAdminFeeDetailInfo();
+ $that.changeTab($that.adminFeeDetailInfo._currentTab);
+ });
+ },
+ methods: {
+ _loadAdminFeeDetailInfo: function () {
+ let param = {
+ params: {
+ page: 1,
+ row: 1,
+ feeId: $that.adminFeeDetailInfo.feeId,
+ }
+ };
+ //发送get请求
+ vc.http.apiGet('/fee.listAdminFee',
+ param,
+ function (json) {
+ let _feeInfo = JSON.parse(json);
+ // 员工列表 和 岗位列表匹配
+ vc.copyObject(_feeInfo.fees[0], $that.adminFeeDetailInfo);
+ $that.adminFeeDetailInfo.attrs = _feeInfo.fees[0].feeAttrs;
+ $that.changeTab($that.adminFeeDetailInfo._currentTab);
+ },
+ function () {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ changeTab: function (_tab) {
+ $that.adminFeeDetailInfo._currentTab = _tab;
+ let _ownerId = "";
+ $that.adminFeeDetailInfo.attrs.forEach(item => {
+ if(item.specCd=='390007'){
+ _ownerId = item.value;
+ }
+ });
+ vc.emit(_tab, 'switch', {
+ feeId: $that.adminFeeDetailInfo.feeId,
+ payerObjId: $that.adminFeeDetailInfo.payerObjId,
+ roomId: $that.adminFeeDetailInfo.payerObjId,
+ carId: $that.adminFeeDetailInfo.payerObjId,
+ configId:$that.adminFeeDetailInfo.configId,
+ state:$that.adminFeeDetailInfo.state,
+ ownerId:_ownerId
+ });
+ },
+
+ _getDeadlineTime: function (_fee) {
+
+ if (_fee.amountOwed == 0 && _fee.endTime == _fee.deadlineTime) {
+ return "-";
+ }
+ if (_fee.state == '2009001') {
+ return "-";
+ }
+ return _fee.deadlineTime;
+ },
+ _getEndTime: function (_fee) {
+ if (_fee.state == '2009001') {
+ return "-";
+ }
+ return _fee.endTime;
+ },
+ }
+ });
+})(window.vc);
\ No newline at end of file