From 0a28c52eb300438d6426e280f514e1f0baf39bc9 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: Tue, 20 Jan 2026 20:33:33 +0800
Subject: [PATCH] =?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

---
 .../models/soong_workflow_record.py           |  2 +-
 .../views/soong_workflow_record.xml           | 34 ++-----------------
 .../wizard/soong_workflow_comment_wizard.py   |  1 -
 .../views/yuthon_holiday_statement.xml        | 22 +++++++++++-
 .../views/yuthon_vacation_reports_views.xml   | 21 ++++++++++--
 .../wizard/attendance_controls_wizard.py      | 20 ++++++++++-
 .../views/yuthon_sub_enterprises_view.xml     |  4 +--
 yuthon_work_brand/views/hr_menus.xml          |  1 -
 8 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/soong_workflow/models/soong_workflow_record.py b/soong_workflow/models/soong_workflow_record.py
index 0476901c2..e321cfa9c 100644
--- a/soong_workflow/models/soong_workflow_record.py
+++ b/soong_workflow/models/soong_workflow_record.py
@@ -48,7 +48,7 @@ class SoongWorkflowRecord(models.Model):
     workflow_id = fields.Many2one(comodel_name="soong.workflow", string="类型", ondelete="restrict")
     node_id = fields.Many2one(comodel_name="soong.workflow.node", string="当前节点")
     company_id = fields.Many2one(related="create_uid.company_id", string="公司")
-    is_log2 = fields.Boolean(string="是否是抄送流程")
+    is_log2 = fields.Boolean(string="抄送")
     employee_ids = fields.Many2many('hr.employee', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])])
     employee2_ids = fields.Many2many(
         'hr.employee',
diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index d05c9d68f..76cd860ab 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -61,6 +61,7 @@
                         <filter string="状态" name="group_soong_state" context="{'group_by':'soong_state'}"/>
                     </group>
                      <header_search class="header-search-inline">
+                        <field name="is_log2" stirng="抄送"/>
                         <field name="workflow_id" string="审批类型"/>
                         <field name="name"/>
                         <field name="code"/>
@@ -179,6 +180,8 @@
                     <field name="soong_state"/>
                     <field name="is_manager" column_invisible="1"/>
                     <field name="is_unlink" column_invisible="1"/>
+                    <field name="is_log2" column_invisible="1"/>
+                    <button name="greater_record" type="object" string="更多" class="btn-primary" invisible="not is_log2"/>
                     <button name="delete_record" type="object" string="删除" class="btn-primary" confirm="你确定要删除吗?"
                     invisible="not is_unlink"/>
                     <button name="reminders_record" type="object" string="催办" class="btn-primary" invisible="soong_state != 'done' or create_uid != uid or approve_state == 'end'"/>
@@ -187,27 +190,6 @@
                 </tree>
             </field>
         </record>
-        <!-- 抄送流程 -->
-        <record id="soong_workflow_record_log2_tree" model="ir.ui.view">
-            <field name="name">soong.workflow.log2.record.tree</field>
-            <field name="model">soong.workflow.record</field>
-            <field name="arch" type="xml">
-                <tree string="流程查询" action="open_record" type="object"
-                      decoration-danger="approve_state == 'end'" delete="false"
-                      create="false" default_order="write_date2 desc, id desc" expand="1" limit="10">
-                    <field name="code"/>
-                    <field name="workflow_id" string="审批类型"/>
-                    <field name="name"/>
-                    <field name="approve_state" string="审批状态" widget="badge" decoration-danger="approve_state == 'end'" decoration-success="approve_state == 'pending'"/>
-                    <field name="create_uid"/>
-                    <field name="employee_ids" widget="many2many_tags" string="当前经办人" class="list_ids_width"/>
-                    <field name="soong_state"/>
-                    <field name="is_manager" column_invisible="1"/>
-                    <field name="is_log2" column_invisible="1"/>
-                    <button name="greater_record" type="object" string="更多" class="btn-primary" invisible="not is_log2"/>
-                </tree>
-            </field>
-        </record>
         <record id="soong_workflow_record_department_tree" model="ir.ui.view">
             <field name="name">soong.workflow.department.tree</field>
             <field name="model">soong.workflow.record</field>
@@ -304,16 +286,6 @@
 <!--            <field name="search_view_id" ref="soong_workflow_record_search"/>-->
 <!--            <field name="view_id" ref="soong_workflow_record_my_tree"/>-->
 <!--        </record>-->
-        <record id="soong_workflow_record_is_logs_action" model="ir.actions.act_window">
-            <field name="name">抄送流程</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">soong.workflow.record</field>
-            <field name="view_mode">tree,kanban,search</field>
-            <field name="context">{'header_search_default_approve_state': 1, 'header_search_default_to_do':1, 'check_employee': 1}</field>
-            <field name="domain">[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('is_log2', '=', True)]</field>
-            <field name="search_view_id" ref="soong_workflow_record_search1"/>
-            <field name="view_id" ref="soong_workflow_record_log2_tree"/>
-        </record>
         <record id="soong_workflow_record_todo_action" model="ir.actions.act_window">
             <field name="name">待办</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 644a5af48..61f00e6d1 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -492,7 +492,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                 record_id.write({'state': self.trans_link_id.name})
             for employee in self.circulated_employee_ids:
                 record_id = self.env[self.res_model].search([('id', '=', self.res_id)])
-
                 self.sudo().env["soong.workflow.record.copy"].create({
                     "code": record_id.code,
                     "name": record_id.name,
diff --git a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml
index 30afd6330..b70095a71 100644
--- a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml
+++ b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml
@@ -18,10 +18,30 @@
             </tree>
         </field>
     </record>
+    <record id="view_hr_leave_statement_search" model="ir.ui.view">
+        <field name="name">hr.leave.statement.search</field>
+        <field name="model">hr.leave</field>
+        <field name="arch" type="xml">
+            <search string="请假情况">
+                <field name="caption"/>
+                <field name="employee_id"/>
+                <filter string="员工" name="group_by_employee_id" domain="[]" context="{'group_by': 'employee_id'}"/>
+                <filter name="now_month" string="当月"  domain="[('date_from', '&gt;=', (context_today() + relativedelta(day=1)).strftime('%Y-%m-%d')),
+                        ('date_from', '&lt;', (context_today() + relativedelta(months=+1, day=1)).strftime('%Y-%m-%d'))]"/>
+                <header_search class="header-search-inline">
+                    <field name="date_from"/>
+                    <field name="employee_id"/>
+                    <field name="department_id"/>
+                </header_search>
+            </search>
+        </field>
+    </record>
     <record id="view_yuthon_holiday_statement_action" model="ir.actions.act_window">
         <field name="name">请假情况</field>
         <field name="res_model">hr.leave</field>
-        <field name="view_mode">tree</field>
+        <field name="view_mode">tree,search</field>
+        <field name="context">{'search_default_now_month': 1, 'search_default_group_by_employee_id':1}</field>
         <field name="view_id" ref="view_hr_leave_statement_tree"/>
+        <field name="search_view_id" ref="view_hr_leave_statement_search"/>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
index 51ad09346..a2ca91af3 100644
--- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
@@ -341,6 +341,8 @@
             <field name="model">yuthon.vacation.reports</field>
             <field name="arch" type="xml">
                 <search>
+                     <filter name="now_month" string="当月"  domain="[('vacation_date', '&gt;=', (context_today() + relativedelta(day=1)).strftime('%Y-%m-%d')),
+                        ('vacation_date', '&lt;', (context_today() + relativedelta(months=+1, day=1)).strftime('%Y-%m-%d'))]"/>
                     <field name="employee_id"/>
                     <group expand="0" string="Group By">
                         <filter string="公司" name="group_by_company_id" domain="[]" context="{'group_by': 'company_id'}"/>
@@ -350,6 +352,11 @@
                         <filter string="按年" name="group_by_vacation_year" domain="[]" context="{'group_by': 'vacation_date:year'}"/>
                         <filter string="按月" name="group_by_vacation_month" domain="[]" context="{'group_by': 'vacation_date:month'}"/>
                     </group>
+                    <header_search class="header-search-inline">
+                        <field name="vacation_date"/>
+                        <field name="employee_id"/>
+                        <field name="department_id"/>
+                     </header_search>
                 </search>
             </field>
     </record>
@@ -535,6 +542,14 @@
                 <field name="employee_id"/>
                 <field name="department_id"/>
                 <field name="start_time"/>
+                <filter string="员工" name="group_by_employee_id" domain="[]" context="{'group_by': 'employee_id'}"/>
+                <filter name="now_month" string="当月"  domain="[('start_time', '&gt;=', (context_today() + relativedelta(day=1)).strftime('%Y-%m-%d')),
+                        ('start_time', '&lt;', (context_today() + relativedelta(months=+1, day=1)).strftime('%Y-%m-%d'))]"/>
+                <header_search class="header-search-inline">
+                        <field name="start_time"/>
+                        <field name="employee_id"/>
+                        <field name="department_id"/>
+                 </header_search>
             </search>
         </field>
     </record>
@@ -543,6 +558,7 @@
         <field name="res_model">vacation.over.line</field>
         <field name="view_mode">tree</field>
         <field name="domain">['|', ('workflow_record_id','!=', False), ('is_initial_number', '=', True), ('update_type', '=', 'add')]</field>
+        <field name="context">{'search_default_now_month': 1, 'search_default_group_by_employee_id':1}</field>
         <field name="view_id" ref="view_yuthon_vacation_overtime_tree"/>
         <field name="search_view_id" ref="view_yuthon_vacation_overtime_search"/>
     </record>
@@ -558,7 +574,8 @@
         <field name="res_model">yuthon.vacation.reports</field>
         <field name="view_mode">tree</field>
         <field name="domain">[('meal_fee', '!=', 0)]</field>
-        <field name="context">{'search_default_group_by_vacation_month': True}</field>
+        <field name="context">{'search_default_now_month': 1, 'search_default_group_by_employee_id':1}</field>
+        <field name="search_view_id" ref="view_yuthon_vacation_reports_search"/>
          <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_hr_attendance.view_yuthon_vacation_meal_tree')}),]"/>
     </record>
@@ -566,7 +583,7 @@
         <field name="name">考勤确认单台账</field>
         <field name="res_model">yuthon.vacation.reports</field>
         <field name="view_mode">tree,form</field>
-        <field name="context">{'search_default_group_by_employee_id': 1, 'search_default_group_by_vacation_month': True}</field>
+        <field name="context">{'search_default_now_month': 1, 'search_default_group_by_employee_id':1}</field>
          <field name="view_ids" eval="[(5, 0, 0),
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_hr_attendance.view_yuthon_vacation_reports_tree')}),
          (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_hr_attendance.view_yuthon_vacation_reports_form')})]"/>
diff --git a/yuthon_hr_attendance/wizard/attendance_controls_wizard.py b/yuthon_hr_attendance/wizard/attendance_controls_wizard.py
index c6ae59cf5..859efc0b6 100644
--- a/yuthon_hr_attendance/wizard/attendance_controls_wizard.py
+++ b/yuthon_hr_attendance/wizard/attendance_controls_wizard.py
@@ -13,7 +13,7 @@ class AttendanceControlsWizard(models.TransientModel):
     _description = "考勤操作弹窗"
 
     attendance_id = fields.Many2one('hr.attendance', string="考勤记录")
-
+    vacation_id = fields.Many2one('yuthon.vacation.reports', string="休假记录")
 
     def button_leave(self):
         form_id = self.env.ref('yuthon_holiday.view_hr_leave_batch_form').id
@@ -57,3 +57,21 @@ class AttendanceControlsWizard(models.TransientModel):
             }
         }
 
+    def overtime_vacation(self):
+        tree = self.env.ref('yuthon_hr_attendance.view_yuthon_vacation_overtime_tree').id
+        over_line_id = self.env['vacation.over.line'].search([('vacation_id', '=', self.vacation_id.id)])
+        if over_line_id:
+            return {
+                "type": "ir.actions.act_window",
+                "name": "加班情况",
+                "res_model": "vacation.over.line",
+                "views": [[tree, "tree"]],
+                "domain": [('id', 'in', over_line_id.id)],
+                "context": {
+                    'default_attendance_id': self.attendance_id.id,
+                    'default_users_id': self.attendance_id.employee_id.user_id.id,
+                    'default_shift_id':self.attendance_id.shift_id.id,
+                }
+            }
+
+
diff --git a/yuthon_official/views/yuthon_sub_enterprises_view.xml b/yuthon_official/views/yuthon_sub_enterprises_view.xml
index aba75edfe..3cdeea812 100644
--- a/yuthon_official/views/yuthon_sub_enterprises_view.xml
+++ b/yuthon_official/views/yuthon_sub_enterprises_view.xml
@@ -22,8 +22,8 @@
                             invisible="urgency_level != 'normal'"/>
                     <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
                             invisible="urgency_level != 'urgent'"/>
-                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
-                            invisible="urgency_level != 'emergency'"/>
+                    <widget name="web_ribbon" title="特急" bg_color="text-bg-danger"
+                            invisible="urgency_level != 'extra_urgent'"/>
                     <group col="3">
                         <group>
                             <field name="code" string="流水号" readonly="1"/>
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index be6321482..4b38030cd 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -719,7 +719,6 @@
         <menuitem id="menu_workflow_approval_request_new" name="新建流程" action="soong_workflow.action_kklw_workflow_approval_request" sequence="15"/>
         <menuitem id="menu_soong_workflow_todo_record" name="待办流程" action="soong_workflow.soong_workflow_record_todo_action" sequence="20"/>
         <menuitem id="menu_soong_workflow_done_record" name="已办流程" action="soong_workflow.soong_workflow_record_done_action" sequence="25"/>
-        <menuitem id="menu_soong_workflow_department_record_copy" name="抄送流程" action="soong_workflow.soong_workflow_record_is_logs_action" sequence="30"/>
         <menuitem id="menu_soong_workflow_department_record" name="流程查询" action="soong_workflow.soong_workflow_department_record_action" sequence="35"/>
         <menuitem id="menu_hr_attendance_my_record_board" name="我的考勤" action="yuthon_hr_attendance.hr_attendance_action1" sequence="40"/>
         <menuitem id="menu_hr_attendance_my_abnormal_board" name="我的异常" action="yuthon_hr_attendance.hr_attendance_my_abnormal" sequence="45"/>