From 0331e712bc83c020b34d799c2645151a8d0bd741 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 11 Mar 2024 19:12:44 +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

---
 .../reportFeeSummary/reportFeeSummary.html    |  2 +-
 .../reportFeeSummary/reportFeeSummary.js      | 46 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.html b/public/pages/property/reportFeeSummary/reportFeeSummary.html
index 1aaa17836..dcc6f442c 100644
--- a/public/pages/property/reportFeeSummary/reportFeeSummary.html
+++ b/public/pages/property/reportFeeSummary/reportFeeSummary.html
@@ -52,7 +52,7 @@
                                     <div class="form-group">
                                         <input type="text" :placeholder="vc.i18n('请填写房屋编号','reportFeeSummary')"
                                                class="form-control form-control-md"
-                                               v-model.trim="reportFeeSummaryInfo.conditions.roomNum">
+                                               v-model.trim="reportFeeSummaryInfo.conditions.objName">
                                     </div>
                                 </div>
                                 <div class="col-sm-2">
diff --git a/public/pages/property/reportFeeSummary/reportFeeSummary.js b/public/pages/property/reportFeeSummary/reportFeeSummary.js
index b5b8fbb6e..dcd1014e9 100644
--- a/public/pages/property/reportFeeSummary/reportFeeSummary.js
+++ b/public/pages/property/reportFeeSummary/reportFeeSummary.js
@@ -18,7 +18,7 @@
                 moreCondition: false,
                 conditions: {
                     floorId: '',
-                    roomNum: '',
+                    objName: '',
                     startDate: '',
                     endDate: '',
                     configId: '',
@@ -64,13 +64,13 @@
                     .on('changeDate', function (ev) {
                         var value = $(".startDate").val();
                         var start = Date.parse(new Date(value));
-                        var end = Date.parse(new Date(vc.component.reportFeeSummaryInfo.conditions.endDate));
+                        var end = Date.parse(new Date($that.reportFeeSummaryInfo.conditions.endDate));
                         if (start - end >= 0) {
                             vc.toast("计费起始时间必须小于计费终止时间");
                             $(".startDate").val('');
-                            vc.component.reportFeeSummaryInfo.conditions.startDate = "";
+                            $that.reportFeeSummaryInfo.conditions.startDate = "";
                         } else {
-                            vc.component.reportFeeSummaryInfo.conditions.startDate = value;
+                            $that.reportFeeSummaryInfo.conditions.startDate = value;
                         }
                     });
                 $('.endDate').datetimepicker({
@@ -86,14 +86,14 @@
                 $('.endDate').datetimepicker()
                     .on('changeDate', function (ev) {
                         var value = $(".endDate").val();
-                        var start = Date.parse(new Date(vc.component.reportFeeSummaryInfo.conditions.startDate));
+                        var start = Date.parse(new Date($that.reportFeeSummaryInfo.conditions.startDate));
                         var end = Date.parse(new Date(value));
                         if (start - end >= 0) {
                             vc.toast("计费终止时间必须大于计费起始时间");
                             $(".endDate").val('');
-                            vc.component.reportFeeSummaryInfo.conditions.endDate = "";
+                            $that.reportFeeSummaryInfo.conditions.endDate = "";
                         } else {
-                            vc.component.reportFeeSummaryInfo.conditions.endDate = value;
+                            $that.reportFeeSummaryInfo.conditions.endDate = value;
                         }
                     });
                 //防止多次点击时间插件失去焦点
@@ -144,13 +144,13 @@
                 let param = {
                     params: $that.reportFeeSummaryInfo.conditions
                 };
-                param.params.roomNum = param.params.roomNum.trim();
+                param.params.objName = param.params.objName.trim();
                 param.params.ownerName = param.params.ownerName.trim();
                 param.params.link = param.params.link.trim();
                 if ($that.reportFeeSummaryInfo.configIds.length > 0) {
                     param.params.configIds = $that.reportFeeSummaryInfo.configIds.join(',');
                 } else {
-                    param.params.configIds = vc.component.reportFeeSummaryInfo.configIds;
+                    param.params.configIds = $that.reportFeeSummaryInfo.configIds;
                 }
                 //发送get请求
                 vc.http.apiGet('/reportFeeMonthStatistics.queryReportFeeSummary',
@@ -174,17 +174,17 @@
             },
             //重置
             _resetMethod: function (_page, _rows) {
-                /*vc.component.reportFeeSummaryInfo.conditions.startDate = "";
-                vc.component.reportFeeSummaryInfo.conditions.endDate = "";*/
-                vc.component.reportFeeSummaryInfo.conditions.roomNum = "";
-                vc.component.reportFeeSummaryInfo.conditions.ownerName = "";
-                vc.component.reportFeeSummaryInfo.conditions.link = "";
-                vc.component.reportFeeSummaryInfo.conditions.feeTypeCd = "";
-                vc.component.reportFeeSummaryInfo.conditions.floorName = "";
-                vc.component.reportFeeSummaryInfo.conditions.floorId = "";
-                vc.component.reportFeeSummaryInfo.conditions.unitId = "";
-                vc.component.reportFeeSummaryInfo.configIds = [];
-                vc.component.reportFeeSummaryInfo.conditions.configId = "";
+                /*$that.reportFeeSummaryInfo.conditions.startDate = "";
+                $that.reportFeeSummaryInfo.conditions.endDate = "";*/
+                $that.reportFeeSummaryInfo.conditions.roomNum = "";
+                $that.reportFeeSummaryInfo.conditions.ownerName = "";
+                $that.reportFeeSummaryInfo.conditions.link = "";
+                $that.reportFeeSummaryInfo.conditions.feeTypeCd = "";
+                $that.reportFeeSummaryInfo.conditions.floorName = "";
+                $that.reportFeeSummaryInfo.conditions.floorId = "";
+                $that.reportFeeSummaryInfo.conditions.unitId = "";
+                $that.reportFeeSummaryInfo.configIds = [];
+                $that.reportFeeSummaryInfo.conditions.configId = "";
                 $that._listFees(DEFAULT_PAGE, DEFAULT_ROWS);
             },
             _listFeeConfigs: function () {
@@ -210,10 +210,10 @@
                 vc.emit('searchFloor', 'openSearchFloorModel', {});
             },
             _moreCondition: function () {
-                if (vc.component.reportFeeSummaryInfo.moreCondition) {
-                    vc.component.reportFeeSummaryInfo.moreCondition = false;
+                if ($that.reportFeeSummaryInfo.moreCondition) {
+                    $that.reportFeeSummaryInfo.moreCondition = false;
                 } else {
-                    vc.component.reportFeeSummaryInfo.moreCondition = true;
+                    $that.reportFeeSummaryInfo.moreCondition = true;
                 }
             },
             _listFloors: function () {