From bb0a94a2bafc9aa5eddc80b5636961a2ea2279fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 26 Mar 2026 11:11:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_hr_attendance/models/go_approval.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/models/go_approval.py b/yuthon_hr_attendance/models/go_approval.py
index bcdacf38f..bea068b3d 100644
--- a/yuthon_hr_attendance/models/go_approval.py
+++ b/yuthon_hr_attendance/models/go_approval.py
@@ -197,7 +197,7 @@ class GoApprovals(models.Model):
 
             # 3.1 查询当月的vacation_reports记录
             reports_id = self.env['yuthon.vacation.reports'].search([
-                ('employee_id', '=', self.users_id.employee_id.id),
+                ('employee_id', '=', self.users_id.employee_ids.id),
                 ('vacation_date', '=', month_first)
             ], limit=1)
 

From e2e97322c4581e28ffa13031509cb180deff2ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 26 Mar 2026 11:11:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_issue/views/issue_library_views.xml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index 36de66872..34d8b0db6 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -396,9 +396,11 @@
                 <field name="company_id" column_invisible="1"/>
                 <field name="is_confirm" column_invisible="1"/>
                 <button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"
-                        invisible="issue_state_party != 'will' or is_party_passed == 'pass'"/>
+                        invisible="issue_state_party != 'will' or is_party_passed == 'pass' or issue_state_party == False"/>
                 <button name="meeting_record" string="会议详情" type="object" class="btn btn-blue"
                         invisible="issue_state_party == 'will'"/>
+                <button name="approval_details" string="审批详情" type="object" class="btn btn-blue"
+                        invisible="not issue_approval_id"/>
                  <button name="correction" string="修正提醒" type="object" class="btn btn-blue" invisible="is_confirm"/>
                 <button name="correction_confirm" string="确认" type="object" class="btn btn-blue" invisible="not is_confirm"/>
                 <button name="refunded" string="退回" type="object" class="btn btn-blue" invisible="party_char"/>
@@ -437,9 +439,11 @@
                 <field name="company_id" column_invisible="1"/>
                 <field name="is_confirm" column_invisible="1"/>
                 <button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"
-                        invisible="issue_state_party != 'will' or is_party_passed == 'pass'"/>
+                        invisible="issue_state_party != 'will' or is_party_passed == 'pass' or issue_state_party == False"/>
                 <button name="meeting_record" string="会议详情" type="object" class="btn btn-blue"
                         invisible="issue_state_party == 'will'"/>
+                <button name="approval_details" string="审批详情" type="object" class="btn btn-blue"
+                        invisible="not issue_approval_id"/>
                  <button name="correction" string="修正提醒" type="object" class="btn btn-blue" invisible="is_confirm"/>
                 <button name="correction_confirm" string="确认" type="object" class="btn btn-blue" invisible="not is_confirm"/>
                 <button name="refunded" string="退回" type="object" class="btn btn-blue" invisible="party_char"/>
@@ -616,9 +620,11 @@
                 <field name="is_class_passed" column_invisible="1"/>
                 <field name="is_confirm" column_invisible="1"/>
                 <button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"
-                        invisible="issue_state_class != 'will' or is_class_passed == 'pass'"/>
+                        invisible="issue_state_party != 'will' or is_party_passed == 'pass' or issue_state_party == False"/>
                 <button name="meeting_record" string="会议详情" type="object" class="btn btn-blue"
                         invisible="issue_state_class == 'will'"/>
+                <button name="approval_details" string="审批详情" type="object" class="btn btn-blue"
+                        invisible="not issue_approval_id"/>
                  <button name="correction" string="修正提醒" type="object" class="btn btn-blue" invisible="is_confirm"/>
                 <button name="correction_confirm" string="确认" type="object" class="btn btn-blue" invisible="not is_confirm"/>
                 <button name="refunded" string="退回" type="object" class="btn btn-blue" invisible="class_char"/>
@@ -779,10 +785,12 @@
                 <field name="company_id" optional="hide"/>
                 <field name="is_boss_passed" column_invisible="1"/>
                 <field name="is_confirm" column_invisible="1"/>
-                <button name="single_meeting_issue" string="上会" type="object" class="oe_highlight"
-                        invisible="issue_state_boss != 'will' or is_boss_passed == 'pass'"/>
+                <button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"
+                        invisible="issue_state_party != 'will' or is_party_passed == 'pass' or issue_state_party == False"/>
                 <button name="meeting_record" string="会议详情" type="object" class="oe_highlight"
                         invisible="issue_state_boss == 'will'"/>
+                <button name="approval_details" string="审批详情" type="object" class="btn btn-blue"
+                        invisible="not issue_approval_id"/>
                  <button name="correction" string="修正提醒" type="object" class="btn btn-blue" invisible="is_confirm"/>
                 <button name="correction_confirm" string="确认" type="object" class="btn btn-blue" invisible="not is_confirm"/>
                 <button name="refunded" string="退回" type="object" class="btn btn-blue" invisible="boss_char"/>