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

!5229 !5228 添加功能

Browse Source 
Merge pull request !5229 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-09-18 10:15:22 +00:00
committed by Gitee
parent 3ee49c014c 99f58d7963
commit 4c4be682cc
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/views/soong_workflow_record.xml
+3 -3
View File
@@ -15,7 +15,7 @@
<field name="workflow_id" string="审批类型"/>
<field name="text" optional="hide"/>
<field name="documents_ids" optional="hide"/>
<filter name="is_start" string="草稿" domain="[('approve_state', '=', 'start')]"/>
<filter name="is_start" string="草稿" domain="[('approve_state', '=', 'start')]" />
<filter name="is_to_do" string="待办" domain="[('soong_state', '=', 'to_do')]"/>
<group expand="0" string="审批分组">
<filter string="审批类型分组" name='group_by_approvals_group_id' context="{'group_by':'approvals_group_id'}"/>
@@ -23,8 +23,8 @@
</group>
<header_search>
<quick_filter string="状态">
<filter string="草稿" name="approve_state" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'start')]"/>
<filter string="待办" name="to_do" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('employee_ids.user_id', '=', uid)]"/>
<filter string="草稿" name="approve_state" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'start')]" shownumber="1" />
<filter string="待办" name="to_do" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('employee_ids.user_id', '=', uid)]" shownumber="1" />
<filter string="已办" name="done" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('employee_ids.user_id', '!=', uid)]"/>
<filter string="结束" name="end" domain="[('users_ids', 'in', uid), ('reclaim_state', '=', False), ('approve_state', '=', 'end')]"/>
</quick_filter>
soong_workflow/wizard/soong_workflow_comment_wizard.py
+9 -3
View File
@@ -181,10 +181,16 @@ class SoongWorkflowCommentWizard(models.TransientModel):
('name', '=', link.name),
('workflow_id', '=', workflow_id.id)
])
if node.button_ids[0].name != '转交':
button = node.button_ids[-1] if node.button_ids else False
if node.button_ids:
# 优先找“转交”按钮
transfer_btn = next((btn for btn in node.button_ids if btn.name == '转交'), None)
if transfer_btn:
button = transfer_btn
else:
# 找不到“转交”再找“结束”
button = next((btn for btn in node.button_ids if btn.name == '结束'), None)
else:
button = node.button_ids[0] if node.button_ids else False
button = False
if not button:
return self.env['hr.employee']