From e77240bdab0cd0ac459e8991acbd67c2f5bf2a78 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Thu, 12 Oct 2023 15:41:16 +0800 Subject: [PATCH] * Fix bug #39503. --- module/report/js/annualdata.js | 2 +- module/screen/control.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/report/js/annualdata.js b/module/report/js/annualdata.js index b4c68daa34..ba187382c4 100644 --- a/module/report/js/annualdata.js +++ b/module/report/js/annualdata.js @@ -202,7 +202,7 @@ $(function() var dept = $('select#dept').val(); var account = $('select#account').val(); if($(this).attr('id') == 'dept') account = ''; - location.href = createLink('screen', 'view', 'screenID=3&year=' + year + '&dept=' + dept + '&account=' + account); + location.href = createLink('screen', 'view', 'screenID=3&year=' + year + '&month=' + '&dept=' + dept + '&account=' + account); }); $('#actionData > div > ul > li').mouseenter(function(e) diff --git a/module/screen/control.php b/module/screen/control.php index fb14789329..863e758ee3 100644 --- a/module/screen/control.php +++ b/module/screen/control.php @@ -67,6 +67,7 @@ class screen extends control * * @param int $screenID * @param int $year + * @param int $month * @param int $dept * @param string $account * @access public @@ -79,7 +80,7 @@ class screen extends control if($screenID == 3) { - echo $this->fetch('report', 'annualData', "year=$year&dept=$dept&account=$account"); + echo $this->fetch('report', 'annualData', "year=$year&month=$month&dept=$dept&account=$account"); return; }