diff --git a/public/pages/property/printPayFee/printPayFee.js b/public/pages/property/printPayFee/printPayFee.js index 25b116b47..3b25a4081 100755 --- a/public/pages/property/printPayFee/printPayFee.js +++ b/public/pages/property/printPayFee/printPayFee.js @@ -71,7 +71,6 @@ $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; @@ -102,6 +101,7 @@ 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) { diff --git a/public/pages/property/printPayFeeBangTai/printPayFeeBangTai.js b/public/pages/property/printPayFeeBangTai/printPayFeeBangTai.js index 3a196feba..1f6003a76 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,6 +98,7 @@ 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) { diff --git a/public/pages/property/printPayFeeTianlin/printPayFeeTianlin.js b/public/pages/property/printPayFeeTianlin/printPayFeeTianlin.js index 663516643..3223a0722 100644 --- a/public/pages/property/printPayFeeTianlin/printPayFeeTianlin.js +++ b/public/pages/property/printPayFeeTianlin/printPayFeeTianlin.js @@ -76,7 +76,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.storeName = _feeReceipt[0].storeName; $that.printPayFeeInfo.feeReceipt = _feeReceipt; @@ -110,6 +110,7 @@ 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) { diff --git a/public/pages/property/printPayFeeXiangyun/printPayFeeXiangyun.js b/public/pages/property/printPayFeeXiangyun/printPayFeeXiangyun.js index d2c750438..675ea0f2c 100644 --- a/public/pages/property/printPayFeeXiangyun/printPayFeeXiangyun.js +++ b/public/pages/property/printPayFeeXiangyun/printPayFeeXiangyun.js @@ -71,7 +71,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; @@ -101,6 +101,7 @@ 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){ diff --git a/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js b/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js index b8637729b..8bb80bd5e 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,6 +105,7 @@ 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) { diff --git a/public/pages/property/printSmallPayFee/printSmallPayFee.html b/public/pages/property/printSmallPayFee/printSmallPayFee.html index 62bbbf57e..59d2c98eb 100755 --- a/public/pages/property/printSmallPayFee/printSmallPayFee.html +++ b/public/pages/property/printSmallPayFee/printSmallPayFee.html @@ -30,13 +30,19 @@ {{vc.dateSubOneDay(vc.dateFormat(item.startTime),vc.dateFormat(item.endTime),item.feeFlag)}}
- /固定费:{{item.squarePrice}} + {{item.squarePrice}}
- /用量:{{item.area}} + {{item.area}}
- : + {{item.primeRate}} +
+
+ {{item.preDegrees}} 至 {{item.curDegrees}} +
+
+ {{item.amount < 0 ? item.amount + "(退费)" : item.amount}}
@@ -48,6 +54,9 @@
:{{printSmallPayFeeInfo.amount}}
+
+ :{{vc.getData('/nav/getUserInfo').name}} +
diff --git a/public/pages/property/printSmallPayFee/printSmallPayFee.js b/public/pages/property/printSmallPayFee/printSmallPayFee.js index a9bf49b0e..08ee3caa8 100755 --- a/public/pages/property/printSmallPayFee/printSmallPayFee.js +++ b/public/pages/property/printSmallPayFee/printSmallPayFee.js @@ -5,6 +5,7 @@ communityName: '', receiptId: '', receiptIds: '', + receiptNum:'', roomName: '', amount: 0.00, fees: [], @@ -56,7 +57,6 @@ $that.printSmallPayFeeInfo.amount = _amount; $that.printSmallPayFeeInfo.roomName = _feeReceipt[0].objName; $that.printSmallPayFeeInfo.feeTime = _feeReceipt[0].createTime; - $that.printSmallPayFeeInfo.receiptNum = _feeReceipt[0].receiptId; $that.printSmallPayFeeInfo.payObjName = _feeReceipt[0].payObjName; $that._loadReceiptDetail(); }, function (errInfo, error) { @@ -80,6 +80,7 @@ function (json, res) { var _feeReceiptManageInfo = JSON.parse(json); let _feeReceiptDetails = _feeReceiptManageInfo.data; + $that.printSmallPayFeeInfo.receiptNum = _feeReceiptDetails[0].payOrderId; $that.printSmallPayFeeInfo.fees = _feeReceiptDetails; }, function (errInfo, error) { console.log('请求失败处理');