From 897aebc6a65e48a37570ee129ce414dbf058bcdd Mon Sep 17 00:00:00 2001 From: java110 <928255095@qq.com> Date: Wed, 7 Jun 2023 09:54:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/property/printPayFee/printPayFee.js | 4 +- .../printPayFeeBangTai/printPayFeeBangTai.js | 4 +- .../printPayFeeTianlin/printPayFeeTianlin.js | 2 +- .../printPayFeeXiangyun.js | 55 +++++----- .../printPayFeeXinShiDai.js | 4 +- .../printSmallPayFee/printSmallPayFee.html | 100 +++++++++--------- .../printSmallPayFee/printSmallPayFee.js | 4 +- 7 files changed, 89 insertions(+), 84 deletions(-) diff --git a/public/pages/property/printPayFee/printPayFee.js b/public/pages/property/printPayFee/printPayFee.js index 3b25a4081..959fa1b88 100755 --- a/public/pages/property/printPayFee/printPayFee.js +++ b/public/pages/property/printPayFee/printPayFee.js @@ -84,7 +84,7 @@ }, _loadReceiptDetail: function() { - var param = { + let param = { params: { page: 1, row: 100, @@ -101,7 +101,7 @@ function(json, res) { var _feeReceiptManageInfo = JSON.parse(json); let _feeReceiptDetails = _feeReceiptManageInfo.data; - $that.printPayFeeInfo.receiptNum = _feeReceiptDetails[0].payOrderId; + $that.printPayFeeInfo.receiptNum = _feeReceiptDetails[0].receiptId + "(" + _feeReceiptDetails[0].payOrderId + ")"; _feeReceiptDetails.forEach(item => { $that.printPayFeeInfo.feeReceipt.forEach(im => { if (item.receiptId == im.receiptId) { diff --git a/public/pages/property/printPayFeeBangTai/printPayFeeBangTai.js b/public/pages/property/printPayFeeBangTai/printPayFeeBangTai.js index 1f6003a76..1c39fb4b3 100644 --- a/public/pages/property/printPayFeeBangTai/printPayFeeBangTai.js +++ b/public/pages/property/printPayFeeBangTai/printPayFeeBangTai.js @@ -68,7 +68,7 @@ $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.receiptNum = _feeReceipt[0].receiptId; $that.printPayFeeInfo.payObjName = _feeReceipt[0].payObjName; $that.printPayFeeInfo.feeReceipt = _feeReceipt; @@ -98,7 +98,7 @@ function(json, res) { var _feeReceiptManageInfo = JSON.parse(json); let _feeReceiptDetails = _feeReceiptManageInfo.data; - $that.printPayFeeInfo.receiptNum = _feeReceiptDetails[0].payOrderId; + $that.printPayFeeInfo.receiptNum = _feeReceiptDetails[0].receiptId + "(" + _feeReceiptDetails[0].payOrderId + ")"; _feeReceiptDetails.forEach(item => { $that.printPayFeeInfo.feeReceipt.forEach(im => { if (item.receiptId == im.receiptId) { diff --git a/public/pages/property/printPayFeeTianlin/printPayFeeTianlin.js b/public/pages/property/printPayFeeTianlin/printPayFeeTianlin.js index 3223a0722..3fa9239c1 100644 --- a/public/pages/property/printPayFeeTianlin/printPayFeeTianlin.js +++ b/public/pages/property/printPayFeeTianlin/printPayFeeTianlin.js @@ -110,7 +110,7 @@ function(json, res) { var _feeReceiptManageInfo = JSON.parse(json); let _feeReceiptDetails = _feeReceiptManageInfo.data; - $that.printPayFeeInfo.receiptNum = _feeReceiptDetails[0].payOrderId; + $that.printPayFeeInfo.receiptNum = _feeReceiptDetails[0].receiptId + "(" + _feeReceiptDetails[0].payOrderId + ")"; _feeReceiptDetails.forEach(item => { $that.printPayFeeInfo.feeReceipt.forEach(im => { if (item.receiptId == im.receiptId) { diff --git a/public/pages/property/printPayFeeXiangyun/printPayFeeXiangyun.js b/public/pages/property/printPayFeeXiangyun/printPayFeeXiangyun.js index 675ea0f2c..81452e021 100644 --- a/public/pages/property/printPayFeeXiangyun/printPayFeeXiangyun.js +++ b/public/pages/property/printPayFeeXiangyun/printPayFeeXiangyun.js @@ -1,4 +1,4 @@ -(function (vc) { +(function(vc) { vc.extends({ data: { @@ -14,20 +14,20 @@ wechatName: '', content: '', qrImg: '', - payObjName:'', - feeReceipt:[], - apply:'N' + payObjName: '', + feeReceipt: [], + apply: 'N' }, printFlag: '0' }, - _initMethod: function () { + _initMethod: function() { //vc.component._initPrintPurchaseApplyDateInfo(); $that.printPayFeeInfo.receiptId = vc.getParam('receiptId'); $that.printPayFeeInfo.receiptIds = vc.getParam('receiptIds'); $that.printPayFeeInfo.detailIds = vc.getParam('detailIds'); $that.printPayFeeInfo.apply = vc.getParam('apply'); - + //$that.printPayFeeInfo.feeTime = vc.dateTimeFormat(new Date()); $that.printPayFeeInfo.communityName = vc.getCurrentCommunity().name; @@ -36,15 +36,15 @@ $that._loadPrintSpec(); }, - _initEvent: function () { + _initEvent: function() { }, methods: { - _initPayFee: function () { + _initPayFee: function() { }, - _loadReceipt: function () { + _loadReceipt: function() { var param = { params: { @@ -60,7 +60,7 @@ //发送get请求 vc.http.apiGet('/feeReceipt/queryFeeReceipt', param, - function (json, res) { + function(json, res) { var _feeReceiptManageInfo = JSON.parse(json); let _feeReceipt = _feeReceiptManageInfo.data; let _amount = 0; @@ -77,12 +77,13 @@ $that._loadReceiptDetail(); - }, function (errInfo, error) { + }, + function(errInfo, error) { console.log('请求失败处理'); } ); }, - _loadReceiptDetail: function () { + _loadReceiptDetail: function() { var param = { params: { @@ -98,13 +99,13 @@ //发送get请求 vc.http.apiGet('/feeReceipt/queryFeeReceiptDetail', param, - function (json, res) { + function(json, res) { var _feeReceiptManageInfo = JSON.parse(json); let _feeReceiptDetails = _feeReceiptManageInfo.data; - $that.printPayFeeInfo.receiptNum = _feeReceiptDetails[0].payOrderId; - _feeReceiptDetails.forEach(item=>{ - $that.printPayFeeInfo.feeReceipt.forEach(im =>{ - if(item.receiptId == im.receiptId){ + $that.printPayFeeInfo.receiptNum = _feeReceiptDetails[0].receiptId + "(" + _feeReceiptDetails[0].payOrderId + ")"; + _feeReceiptDetails.forEach(item => { + $that.printPayFeeInfo.feeReceipt.forEach(im => { + if (item.receiptId == im.receiptId) { item.objName = im.objName; item.feeTypeCd = im.feeTypeCd; } @@ -113,12 +114,13 @@ $that.printPayFeeInfo.fees = _feeReceiptDetails; - }, function (errInfo, error) { + }, + function(errInfo, error) { console.log('请求失败处理'); } ); }, - _loadPrintSpec: function () { + _loadPrintSpec: function() { var param = { params: { page: 1, @@ -131,39 +133,40 @@ //发送get请求 vc.http.apiGet('/feePrintSpec/queryFeePrintSpec', param, - function (json, res) { + 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){ + if (_data[0].printName) { $that.printPayFeeInfo.communityName = _data[0].printName; } } - }, function (errInfo, error) { + }, + function(errInfo, error) { console.log('请求失败处理'); } ); }, - _printPurchaseApplyDiv: function () { + _printPurchaseApplyDiv: function() { $that.printFlag = '1'; console.log('console.log($that.printFlag);', $that.printFlag); - document.getElementById("print-btn").style.display = "none";//隐藏 + document.getElementById("print-btn").style.display = "none"; //隐藏 window.print(); //$that.printFlag = false; window.opener = null; window.close(); }, - _closePage: function () { + _closePage: function() { window.opener = null; window.close(); } } }); -})(window.vc); +})(window.vc); \ No newline at end of file diff --git a/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js b/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js index 8bb80bd5e..baab4079d 100644 --- a/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js +++ b/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js @@ -70,7 +70,7 @@ $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.receiptNum = _feeReceipt[0].receiptId; $that.printPayFeeInfo.payObjName = _feeReceipt[0].payObjName; $that.printPayFeeInfo.feeReceipt = _feeReceipt; @@ -105,7 +105,7 @@ function(json, res) { var _feeReceiptManageInfo = JSON.parse(json); let _feeReceiptDetails = _feeReceiptManageInfo.data; - $that.printPayFeeInfo.receiptNum = _feeReceiptDetails[0].payOrderId; + $that.printPayFeeInfo.receiptNum = _feeReceiptDetails[0].receiptId + "(" + _feeReceiptDetails[0].payOrderId + ")"; _feeReceiptDetails.forEach(item => { $that.printPayFeeInfo.feeReceipt.forEach(im => { if (item.receiptId == im.receiptId) { diff --git a/public/pages/property/printSmallPayFee/printSmallPayFee.html b/public/pages/property/printSmallPayFee/printSmallPayFee.html index 59d2c98eb..57048d524 100755 --- a/public/pages/property/printSmallPayFee/printSmallPayFee.html +++ b/public/pages/property/printSmallPayFee/printSmallPayFee.html @@ -7,7 +7,10 @@ **************************
- ：{{printSmallPayFeeInfo.receiptNum}} + {{printSmallPayFeeInfo.receiptNum}} +
+
+ {{printSmallPayFeeInfo.payOrderId}}
：{{printSmallPayFeeInfo.roomName}} @@ -20,8 +23,7 @@
************************** -
+
：{{item.feeName}}
@@ -42,70 +44,69 @@ {{item.preDegrees}} 至 {{item.curDegrees}}
- - {{item.amount < 0 ? item.amount + "(退费)" : item.amount}} + {{item.amount + < 0 ? item.amount + "(退费)" : item.amount}}
+
+ ：{{item.remark}} +
+ **************************
-
- ：{{item.remark}} +
+
+ ：{{printSmallPayFeeInfo.amount}} +
+
+ ：{{vc.getData('/nav/getUserInfo').name}} +
+
+
**************************
-
-
- ：{{printSmallPayFeeInfo.amount}} -
-
- ：{{vc.getData('/nav/getUserInfo').name}} -
-
-
-
- ************************** - - - + -