diff --git a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js index 2841f76e6..6aeaaf484 100644 --- a/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js +++ b/public/components/report/dataReportEarnedDetailStatistics/dataReportEarnedDetailStatistics.js @@ -60,8 +60,8 @@ let _json = JSON.parse(json); $that.dataReportEarnedDetailStatisticsInfo.fees = _json.data; vc.emit('dataReportEarnedDetailStatistics', 'paginationPlus', 'init', { - total: _roomInfo.records, - dataCount: _roomInfo.total, + total: _json.records, + dataCount: _json.total, currentPage: _page }); let _feeAmount = 0.0; diff --git a/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.js b/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.js index 27335be50..85c638077 100644 --- a/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.js +++ b/public/components/report/dataReportEarnedStatistics/dataReportEarnedStatistics.js @@ -54,8 +54,8 @@ let _json = JSON.parse(json); $that.dataReportEarnedStatisticsInfo.fees = _json.data; vc.emit('dataReportEarnedStatistics', 'paginationPlus', 'init', { - total: _roomInfo.records, - dataCount: _roomInfo.total, + total: _json.records, + dataCount: _json.total, currentPage: _page }); let _feeAmount = 0.0; diff --git a/public/components/report/dataReportEarnedWayStatistics/dataReportEarnedWayStatistics.html b/public/components/report/dataReportEarnedWayStatistics/dataReportEarnedWayStatistics.html index 304a23d32..16babecb2 100644 --- a/public/components/report/dataReportEarnedWayStatistics/dataReportEarnedWayStatistics.html +++ b/public/components/report/dataReportEarnedWayStatistics/dataReportEarnedWayStatistics.html @@ -19,7 +19,7 @@ @@ -29,7 +29,7 @@ diff --git a/public/pages/property/printRepairDetail/printRepairDetail.html b/public/pages/property/printRepairDetail/printRepairDetail.html index 0a73b759f..8f86c93b3 100755 --- a/public/pages/property/printRepairDetail/printRepairDetail.html +++ b/public/pages/property/printRepairDetail/printRepairDetail.html @@ -1,45 +1,18 @@
-
- -
-
- :{{printRepairDetailInfo.repairId}} + {{printRepairDetailInfo.repairId}}
- :{{nowTime}} + {{nowTime}}
- +
@@ -47,12 +20,12 @@ - - - + + + - +
:{{printRepairDetailInfo.repairName}}:{{printRepairDetailInfo.tel}}:{{printRepairDetailInfo.repairObjName}}{{printRepairDetailInfo.repairName}}{{printRepairDetailInfo.tel}}{{printRepairDetailInfo.repairObjName}}
:{{printRepairDetailInfo.context}}{{printRepairDetailInfo.context}} @@ -64,7 +37,7 @@
- +
diff --git a/public/pages/report/dataReport/dataReport.js b/public/pages/report/dataReport/dataReport.js index 3400e8f21..78cf256c8 100644 --- a/public/pages/report/dataReport/dataReport.js +++ b/public/pages/report/dataReport/dataReport.js @@ -149,9 +149,8 @@ changeTab: function(_tab) { $that.dataReportInfo._currentTab = _tab; vc.emit(_tab, 'switch', { - ownerId: $that.dataReportInfo.ownerId, - ownerName: $that.dataReportInfo.name, - link: $that.dataReportInfo.link, + startDate: $that.dataReportInfo.conditions.startDate, + endDate: $that.dataReportInfo.conditions.endDate, }) }, }