From 0cc6fb68b2020e3ce9f2a6a62f5e42fe44b90628 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Mon, 26 Feb 2024 02:07:48 +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 --- .../reportPayFeeDetail.html | 767 ++++++++---------- .../reportPayFeeDetail/reportPayFeeDetail.js | 4 +- 2 files changed, 351 insertions(+), 420 deletions(-) diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html index 6e5b206fe..9b4ecb1f3 100644 --- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html +++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.html @@ -1,437 +1,368 @@
-
-
-
-
-
- -
-
- + +
+
+
+ +
+
+ +
+
+
+
+ +
+
+
-
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
- - -
+
+
+
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
+
+
+
+
-
-
- -
+
+
+
+ +
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+ +
+
+
-
-
-
-
-
- -
- -
- + +
+
+
+ +
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{fee.oId?fee.oId:'-'}} +
+ {{fee.objName}}/{{fee.ownerName}} +
+ 		{{fee.feeTypeCdName}}>{{fee.feeName}}{{fee.stateName}}{{fee.primeRate}} +
{{vc.dateFormat(fee.startTime)}}
+ ~
+ {{vc.dateFormat(fee.endTime)}} + + {{vc.dateSubOneDay(vc.dateFormat(fee.startTime),vc.dateFormat(fee.endTime),fee.feeFlag)}} + +
+ 		{{fee.createTime}}{{fee.cashierName || '-'}}{{fee.payableAmount}}/{{fee.receivableAmount}}{{fee.receivedAmount}}{{fee.withholdAmount || 0}}{{fee.preferentialAmount}}/{{fee.deductionAmount}}{{fee.giftAmount}}{{fee.lateFee}}{{fee.builtUpArea}}{{fee.psName || '-'}}{{fee.remark}}
+ +
+
+
+ +
+
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{fee.oId?fee.oId:'-'}} -
- {{fee.objName}}/{{fee.ownerName}} -
- 		{{fee.feeTypeCdName}}>{{fee.feeName}}{{fee.stateName}}{{fee.primeRate}} -
{{vc.dateFormat(fee.startTime)}}
- ~
- {{vc.dateFormat(fee.endTime)}} - - {{vc.dateSubOneDay(vc.dateFormat(fee.startTime),vc.dateFormat(fee.endTime),fee.feeFlag)}} - -
- 		{{fee.createTime}}{{fee.cashierName || '-'}}{{fee.payableAmount}}/{{fee.receivableAmount}}{{fee.receivedAmount}}{{fee.withholdAmount || 0}}{{fee.preferentialAmount}}/{{fee.deductionAmount}}{{fee.giftAmount}}{{fee.lateFee}} - {{fee.vacantHousingDiscount}}/{{fee.vacantHousingReduction}} - {{fee.builtUpArea}}{{fee.psName}}
-
    -
    - +
    -
    -
    - -
    -
    - -
    -
    -
    -
    - - - {{reportPayFeeDetailInfo.totalReceivableAmount}} - - - -
    -
    - - - {{reportPayFeeDetailInfo.allReceivableAmount}} - - - -
    -
    -
    -
    - - - {{reportPayFeeDetailInfo.totalReceivedAmount}} - - - -
    -
    - - - {{reportPayFeeDetailInfo.allReceivedAmount}} - - - -
    -
    -
    -
    - - - {{reportPayFeeDetailInfo.totalPreferentialAmount}} - - - -
    -
    - - - {{reportPayFeeDetailInfo.allPreferentialAmount}} - - - -
    -
    -
    -
    - - - {{reportPayFeeDetailInfo.totalDeductionAmount}} - - - -
    -
    - - - {{reportPayFeeDetailInfo.allDeductionAmount}} - - - -
    -
    -
    -
    - - - {{reportPayFeeDetailInfo.totalGiftAmount}} - - - -
    -
    - - - {{reportPayFeeDetailInfo.allGiftAmount}} - - - -
    -
    -
    -
    - - - {{reportPayFeeDetailInfo.totalLateFee}} - - - -
    -
    - - - {{reportPayFeeDetailInfo.allLateFee}} - - - -
    -
    -
    -
    - - - {{reportPayFeeDetailInfo.totalVacantHousingDiscount}} - - - -
    -
    - - - {{reportPayFeeDetailInfo.allVacantHousingDiscount}} - - - -
    -
    -
    -
    - - - {{reportPayFeeDetailInfo.totalVacantHousingReduction}} - - - -
    -
    - - - {{reportPayFeeDetailInfo.allVacantHousingReduction}} - - - -
    -
    + + + {{reportPayFeeDetailInfo.totalReceivableAmount}} + + +
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    - -
    +
    + + + {{reportPayFeeDetailInfo.allReceivableAmount}} + + +
    +
    +
    + + + {{reportPayFeeDetailInfo.totalReceivedAmount}} + + + +
    +
    + + + {{reportPayFeeDetailInfo.allReceivedAmount}} + + + +
    +
    +
    +
    + + + {{reportPayFeeDetailInfo.totalPreferentialAmount}} + + + +
    +
    + + + {{reportPayFeeDetailInfo.allPreferentialAmount}} + + + +
    +
    +
    +
    + + + {{reportPayFeeDetailInfo.totalDeductionAmount}} + + + +
    +
    + + + {{reportPayFeeDetailInfo.allDeductionAmount}} + + + +
    +
    +
    +
    + + + {{reportPayFeeDetailInfo.totalGiftAmount}} + + + +
    +
    + + + {{reportPayFeeDetailInfo.allGiftAmount}} + + + +
    +
    +
    +
    + + + {{reportPayFeeDetailInfo.totalLateFee}} + + + +
    +
    + + + {{reportPayFeeDetailInfo.allLateFee}} + + + +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    + +
    +
    + +
    diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js index 3e2b827ec..2bed292b3 100644 --- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js +++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js @@ -37,7 +37,7 @@ conditions: { floorId: '', roomNum: '', - roomName: '', // 1-1-101 + payerObjName: '', // 1-1-101 configId: '', primeRate: '1', state: '1400', @@ -325,7 +325,7 @@ _resetListFees: function (_page, _rows) { $that.reportPayFeeDetailInfo.conditions.floorId = ""; $that.reportPayFeeDetailInfo.conditions.roomNum = ""; - $that.reportPayFeeDetailInfo.conditions.roomName = ""; + $that.reportPayFeeDetailInfo.conditions.payerObjName = ""; $that.reportPayFeeDetailInfo.conditions.primeRate = "1"; $that.reportPayFeeDetailInfo.conditions.startTime = ""; $that.reportPayFeeDetailInfo.conditions.endTime = "";