From b21bcaffdb965e600c5f4dbd282325b1f5616959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Thu, 26 Mar 2026 10:02:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_issue/models/issue_library.py       | 1 +
 yuthon_issue/views/issue_library_views.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/yuthon_issue/models/issue_library.py b/yuthon_issue/models/issue_library.py
index 1097de0c5..ea8ac341d 100644
--- a/yuthon_issue/models/issue_library.py
+++ b/yuthon_issue/models/issue_library.py
@@ -23,6 +23,7 @@ class IssueLibrary(models.Model):
     code = fields.Char(string='编号', required=True, copy=False,
                        default=lambda self: self.env['ir.sequence'].next_by_code('issue_library_code'))
     its_original_state = fields.Char(string='原议题状态')
+    supporting_department = fields.Text(string='协办部门/单位')
     issue_state = fields.Selection([
         ('to_do', '待推送'),
         ('draft', '待申报'),
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index 22a074682..36de66872 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -177,6 +177,7 @@
                                readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify', 'draft'] or is_modify)"/>
                         <field name="handling_situation" string="办理情况" placeholder="(存在问题)"
                                readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify', 'draft'] or is_modify)"/>
+                        <field name="supporting_department" readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify', 'draft'] or is_modify)"/>
                         <field name="deliberation_content" readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify', 'draft'] or is_modify)"/>
                         <field name="will_based" readonly="not (is_admin or issue_state in ['to_do', 'cancel','to_modify', 'draft'] or is_modify)"/>
                     </group>

From 5ef79a0caeb013cb48d59a90d0a86f02edc4878f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <pengyuthon@163.com>
Date: Thu, 26 Mar 2026 10:09:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_holiday/views/extended_vacation_approval_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_holiday/views/extended_vacation_approval_views.xml b/yuthon_holiday/views/extended_vacation_approval_views.xml
index 7e01fc5e8..6007c4523 100644
--- a/yuthon_holiday/views/extended_vacation_approval_views.xml
+++ b/yuthon_holiday/views/extended_vacation_approval_views.xml
@@ -47,7 +47,7 @@
                             <field name="type_vacations_ids" widget="many2many_tags"/>
                             <field name="department_id" invisible="1"/>
                             <field name="date_postponed"/>
-                            <field name="employee_ids" widget="many2many_tags"/>
+                            <field name="employee_ids" widget="many2many_tags" domain="[('company_id', '=', company_id)]"/>
                         </group>
                      </group>
                      <group string="延长明细">