pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!6766 !6765 添加功能

Browse Source 
Merge pull request !6766 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-12-01 01:43:42 +00:00
committed by Gitee
parent f7234e54db 8102ab4bd5
commit ecad7bc75e
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/views/soong_workflow_record.xml
+14 -3
View File
@@ -190,14 +190,25 @@
</tree>
</field>
</record>
<record id="soong_workflow_record_my_action" model="ir.actions.act_window">
<field name="name">我的流程</field>
<record id="soong_workflow_record_my_to_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">{'check_employee': 1, 'search_default_is_start':1, 'search_default_is_to_do':1}</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)]</field>
<field name="domain">[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('soong_state', '=', 'to_do')]</field>
<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_my_done_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">{'check_employee': 1, 'search_default_is_start':1, 'search_default_is_to_do':1}</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), ('soong_state', '=', 'done')]</field>
<field name="search_view_id" ref="soong_workflow_record_search"/>
<field name="view_id" ref="soong_workflow_record_my_tree"/>
</record>
yuthon_hr_attendance/models/yuthon_vacation_reports.py
+1 -1
View File
@@ -436,7 +436,7 @@ class YuthonVacationReports(models.Model):
}
def attendance_confirmation(self):
reports = self.env["yuthon.vacation.reports"].search([])
reports = self.env["yuthon.vacation.reports"].search([('employee_id.name', '=', '叶华锋')])
employee_ids = {report.employee_id for report in reports if report.employee_id}
for employee in employee_ids:
employee_reports = reports.filtered(lambda r: r.employee_id == employee)
yuthon_work_brand/views/hr_menus.xml
+10 -1
View File
@@ -637,8 +637,17 @@
<menuitem id="menu_workflow_approval_request_my_start"
name="我的流程"
parent="holiday_manage_menu_root_board"
action="soong_workflow.soong_workflow_record_my_action"
sequence="2"/>
<menuitem id="menu_workflow_approval_request_my_to_approval"
name="待办"
parent="menu_workflow_approval_request_my_start"
action="soong_workflow.soong_workflow_record_my_to_action"
sequence="1"/>
<menuitem id="menu_workflow_approval_request_my_done_approval"
name="已办"
parent="menu_workflow_approval_request_my_start"
action="soong_workflow.soong_workflow_record_my_done_action"
sequence="5"/>
<menuitem id="yuthon_notice_menu1_board"
parent="holiday_manage_menu_root_board"