diff --git a/public/components/common/editCommunity/editCommunity.js b/public/components/common/editCommunity/editCommunity.js
index 2a53ab3f5..fdd7e5ee5 100755
--- a/public/components/common/editCommunity/editCommunity.js
+++ b/public/components/common/editCommunity/editCommunity.js
@@ -10,7 +10,8 @@
cityCode: '',
mapX: '101.33',
mapY: '101.33',
-
+ payFeeMonth: 12,
+ feePrice: 0,
attrs: []
}
},
@@ -140,7 +141,8 @@
cityCode: '',
mapX: '101.33',
mapY: '101.33',
-
+ payFeeMonth: 12,
+ feePrice: 0,
attrs: _attrs
}
},
diff --git a/public/pages/common/enterCommunity/enterCommunity.html b/public/pages/common/enterCommunity/enterCommunity.html
index 2f0818db2..f98918535 100755
--- a/public/pages/common/enterCommunity/enterCommunity.html
+++ b/public/pages/common/enterCommunity/enterCommunity.html
@@ -22,7 +22,8 @@
小区编码 |
联系方式 |
面积 |
-
+
开始时间 |
+
结束时间 |
状态 |
操作 |
@@ -54,6 +55,12 @@
{{community.communityArea}}
|
+
+ {{community.startTime}}
+ |
+
+ {{community.endTime}}
+ |
diff --git a/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.html b/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.html
new file mode 100644
index 000000000..0f118cc75
--- /dev/null
+++ b/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.html
@@ -0,0 +1,62 @@
+
+
+
+
+
+ {{printPayFeeInfo.payObjName}}
+
+
+ {{printPayFeeInfo.feeReceipt[0].objName}}
+
+
+
+
+
+ | {{item.feeName}} |
+
+ {{vc.dateFormat(item.startTime)}}至{{vc.dateSubOneDay(vc.dateFormat(item.startTime),vc.dateFormat(item.endTime),item.feeFlag)}}
+ {{item.preDegrees}} 至 {{item.curDegrees}}
+ |
+
+
+ 无
+ |
+
+ {{vc.dateFormat(item.startTime)}}至{{vc.dateSubOneDay(vc.dateFormat(item.startTime),vc.dateFormat(item.endTime),item.feeFlag)}}
+ |
+ {{item.squarePrice}} |
+ {{item.area}} |
+ {{item.amount}} |
+
+
+ |
+ ( ){{vc.changeNumMoneyToChinese(printPayFeeInfo.amount)}}
+ |
+ : |
+ {{printPayFeeInfo.amount}} |
+
+
+ |
+ {{printPayFeeInfo.feeTime}} |
+
+
+ | 单号 |
+ {{printPayFeeInfo.receiptNum}} |
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js b/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js
new file mode 100644
index 000000000..734890c99
--- /dev/null
+++ b/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js
@@ -0,0 +1,159 @@
+(function (vc) {
+
+ vc.extends({
+ data: {
+ printPayFeeInfo: {
+ communityName: '',
+ receiptId: '',
+ receiptIds: '',
+ roomName: '',
+ amount: 0.00,
+ fees: [],
+ feeTime: '',
+ wechatName: '',
+ content: '',
+ qrImg: '',
+ payObjName: '',
+ feeReceipt: [],
+ apply: 'N'
+ },
+ printFlag: '0'
+ },
+ _initMethod: function () {
+ //vc.component._initPrintPurchaseApplyDateInfo();
+
+ $that.printPayFeeInfo.receiptId = vc.getParam('receiptId');
+ $that.printPayFeeInfo.receiptIds = vc.getParam('receiptIds');
+ $that.printPayFeeInfo.apply = vc.getParam('apply');
+
+ //$that.printPayFeeInfo.feeTime = vc.dateTimeFormat(new Date());
+
+ $that.printPayFeeInfo.communityName = vc.getCurrentCommunity().name;
+
+ $that._loadReceipt();
+
+ $that._loadPrintSpec();
+ },
+ _initEvent: function () {
+
+
+ },
+ methods: {
+ _initPayFee: function () {
+
+ },
+ _loadReceipt: function () {
+
+ var param = {
+ params: {
+ page: 1,
+ row: 30,
+ receiptId: $that.printPayFeeInfo.receiptId,
+ receiptIds: $that.printPayFeeInfo.receiptIds,
+ communityId: vc.getCurrentCommunity().communityId
+ }
+ };
+
+ //发送get请求
+ vc.http.apiGet('/feeReceipt/queryFeeReceipt',
+ param,
+ function (json, res) {
+ var _feeReceiptManageInfo = JSON.parse(json);
+ let _feeReceipt = _feeReceiptManageInfo.data;
+ let _amount = 0;
+ _feeReceipt.forEach(item => {
+ _amount += parseFloat(item.amount)
+ });
+
+ $that.printPayFeeInfo.amount = _amount.toFixed(2);
+ $that.printPayFeeInfo.roomName = _feeReceipt[0].objName;
+ $that.printPayFeeInfo.feeTime = _feeReceipt[0].createTime;
+ $that.printPayFeeInfo.receiptNum = _feeReceipt[0].receiptId;
+ $that.printPayFeeInfo.payObjName = _feeReceipt[0].payObjName;
+ $that.printPayFeeInfo.feeReceipt = _feeReceipt;
+
+ $that._loadReceiptDetail();
+
+ }, function (errInfo, error) {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ _loadReceiptDetail: function () {
+
+ var param = {
+ params: {
+ page: 1,
+ row: 100,
+ receiptId: $that.printPayFeeInfo.receiptId,
+ receiptIds: $that.printPayFeeInfo.receiptIds,
+ communityId: vc.getCurrentCommunity().communityId
+ }
+ };
+ //发送get请求
+ vc.http.apiGet('/feeReceipt/queryFeeReceiptDetail',
+ param,
+ function (json, res) {
+ var _feeReceiptManageInfo = JSON.parse(json);
+ let _feeReceiptDetails = _feeReceiptManageInfo.data;
+ _feeReceiptDetails.forEach(item => {
+ $that.printPayFeeInfo.feeReceipt.forEach(im => {
+ if (item.receiptId == im.receiptId) {
+ item.objName = im.objName;
+ item.feeTypeCd = im.feeTypeCd;
+ }
+ })
+ })
+ $that.printPayFeeInfo.fees = _feeReceiptDetails;
+ }, function (errInfo, error) {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ _loadPrintSpec: function () {
+ var param = {
+ params: {
+ page: 1,
+ row: 1,
+ specCd: 2020,
+ communityId: vc.getCurrentCommunity().communityId
+ }
+ };
+
+ //发送get请求
+ vc.http.apiGet('/feePrintSpec/queryFeePrintSpec',
+ param,
+ function (json, res) {
+ var _json = JSON.parse(json);
+ var _data = _json.data;
+ if (_data.length > 0) {
+ $that.printPayFeeInfo.content = _data[0].content;
+ $that.printPayFeeInfo.qrImg = _data[0].qrImg;
+ if (_data[0].printName) {
+ $that.printPayFeeInfo.communityName = _data[0].printName;
+ }
+ }
+ }, function (errInfo, error) {
+ console.log('请求失败处理');
+ }
+ );
+ },
+ _printPurchaseApplyDiv: function () {
+
+ $that.printFlag = '1';
+ console.log('console.log($that.printFlag);', $that.printFlag);
+ document.getElementById("print-btn").style.display = "none";//隐藏
+
+ window.print();
+ //$that.printFlag = false;
+ window.opener = null;
+ window.close();
+ },
+ _closePage: function () {
+ window.opener = null;
+ window.close();
+ }
+ }
+ });
+
+})(window.vc);