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

!12026 !12025 添加功能

Browse Source 
Merge pull request !12026 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-06-11 02:41:59 +00:00
committed by Gitee
parent 1c1a72912c c41c533e2f
commit 161e3c4e97
3 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
-8
View File
@@ -88,10 +88,6 @@
<field name="comment_note_id" class="mb-3" style="width: 100%;" options="{'no_create': True}"
domain="[('note_setting_id.users_role_ids', 'in', user_role_ids)]"/>
<field name="comment_note" placeholder="请输入意见内容..." style="width: 100%;"/>
<field name="allowed_issue_ids" invisible="1"/>
<field name="avoid_issue_ids" widget="many2many_tags"
invisible="not is_avoid" options="{'no_create': True}"
domain="[('id', 'in', allowed_issue_ids)]"/>
<field name="avoid_comment" invisible="not is_avoid" placeholder="请输入回避意见..."/>
</div>
<group>
@@ -142,10 +138,6 @@
<field name="trans_link_id" string="转交节点" invisible="node_btn_name == '退回'"
domain="[('id', 'not in', invalid_link_ids), ('workflow_record_id', '=', workflow_record_id)]"
options="{'no_open': True}" widget="radio" force_save="1"/>
<field name="is_avoid" invisible="res_model not in ['issue.party.approval', 'issue.boss.approval', 'issue.class.approval']"/>
<field name="allowed_issue_ids" invisible="1"/>
<field name="avoid_issue_ids" widget="many2many_tags"
invisible="not is_avoid" options="{'no_create': True}" domain="[('id', 'in', allowed_issue_ids)]"/>
<field name="avoid_comment" invisible="not is_avoid" placeholder="请输入回避意见..."/>
<field name="employee_trans_domain_ids" invisible="1"/>
<!-- 退回意见退回类型 -->
yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.py
-2
View File
@@ -6,8 +6,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
_inherit = 'soong.workflow.comment.wizard'
is_avoid = fields.Boolean(string='是否回避')
allowed_issue_ids = fields.Many2many('issue.library', 'soong_comment_wizard_allowed_issue_rel',
'wizard_id', 'issue_id', string='可选议题')
issue_filter_ids = fields.Many2many('issue.library', 'soong_comment_wizard_issue_filter_rel',
'wizard_id', 'issue_id', string='议题过滤')
avoid_issue_ids = fields.Many2many('issue.library', 'soong_comment_wizard_avoid_issue_rel',
yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.xml
-2
View File
@@ -10,7 +10,6 @@
<xpath expr="//field[@name='employee_trans_domain_ids']" position="before">
<field name="is_avoid"
invisible="res_model not in ['issue.party.approval', 'issue.boss.approval', 'issue.class.approval']"/>
<field name="allowed_issue_ids" invisible="1"/>
<field name="issue_filter_ids" invisible="1"/>
<field name="avoid_issue_ids" widget="many2many_tags"
invisible="not is_avoid" options="{'no_create': True}"
@@ -20,7 +19,6 @@
<!-- 结束区域：插入 avoid 字段 -->
<xpath expr="//group[.//field[@name='document_ids']]/preceding-sibling::div//field[@name='comment_note']" position="after">
<field name="allowed_issue_ids" invisible="1"/>
<field name="issue_filter_ids" invisible="1"/>
<field name="avoid_issue_ids" widget="many2many_tags"
invisible="not is_avoid" options="{'no_create': True}"