议题和流程

soong_workflow/models/soong_workflow_mixin.py

@@ -849,7 +849,6 @@ class SoongWorkflowMixin(models.AbstractModel):
                 "all_workflow_links": allowed_link_ids,
                 "default_invalid_link_ids": invalid_links.ids,
                 "default_allowed_issue_ids": [(6, 0, avoid_issue_ids)],
-                "default_issue_filter_ids": [(6, 0, avoid_issue_ids)],
             },
         }
 

soong_workflow/wizard/soong_workflow_comment_wizard.py

@@ -39,8 +39,6 @@ class SoongWorkflowCommentWizard(models.TransientModel):
     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',
                                        'wizard_id', 'issue_id', string='回避议题')
     avoid_comment = fields.Char(string='回避意见')

soong_workflow/wizard/soong_workflow_comment_wizard_view.xml

@@ -89,10 +89,8 @@
                                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="issue_filter_ids" invisible="1"/>
                         <field name="avoid_issue_ids" widget="many2many_tags"
-                               invisible="not is_avoid" options="{'no_create': True}"
-                               domain="[('id', 'in', issue_filter_ids)]"/>
+                               invisible="not is_avoid" options="{'no_create': True}"/>
                         <field name="avoid_comment" invisible="not is_avoid" placeholder="请输入回避意见..."/>
                     </div>
                     <group>
@@ -145,10 +143,8 @@
                                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="issue_filter_ids" invisible="1"/>
                         <field name="avoid_issue_ids" widget="many2many_tags"
-                               invisible="not is_avoid" options="{'no_create': True}"
-                               domain="[('id', 'in', issue_filter_ids)]"/>
+                               invisible="not is_avoid" options="{'no_create': True}"/>
                         <field name="avoid_comment" invisible="not is_avoid" placeholder="请输入回避意见..."/>
                         <field name="employee_trans_domain_ids" invisible="1"/>
                         <!--  退回意见退回类型  -->

yuthon_issue/__manifest__.py

@@ -28,6 +28,7 @@
         'views/issue_party_approval_views.xml',
         'views/issue_library_type_views.xml',
         'wizard/issue_line_add_wizard.xml',
+        'wizard/soong_workflow_comment_wizard_inherit.xml',
         'report/meeting_minutes_report.xml',
         'views/menus.xml',
     ],

yuthon_issue/models/__init__.py

@@ -11,4 +11,5 @@ from . import issue_library_type
 from . import issue_party_approval
 from . import issue_class_approval
 from . import issue_boss_approval
+from . import soong_workflow_mixin_inherit
 

yuthon_issue/models/soong_workflow_mixin_inherit.py

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+from odoo import models
+
+
+class SoongWorkflowMixin(models.AbstractModel):
+    _inherit = 'soong.workflow.mixin'
+
+    def _add_comment(self, btn_rec):
+        res = super()._add_comment(btn_rec)
+        avoid_issue_ids = self._get_avoid_issue_ids()
+        if avoid_issue_ids:
+            res['context']['default_issue_filter_ids'] = [(6, 0, avoid_issue_ids)]
+        return res

yuthon_issue/wizard/__init__.py

@@ -1 +1,2 @@
 from . import issue_line_add_wizard
+from . import soong_workflow_comment_wizard_inherit

yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+from odoo import fields, models
+
+
+class SoongWorkflowCommentWizard(models.TransientModel):
+    _inherit = 'soong.workflow.comment.wizard'
+
+    issue_filter_ids = fields.Many2many(
+        'issue.library', 'soong_comment_wizard_issue_filter_rel',
+        'wizard_id', 'issue_id', string='议题过滤')

yuthon_issue/wizard/soong_workflow_comment_wizard_inherit.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_soong_workflow_comment_wizard_inherit" model="ir.ui.view">
+        <field name="name">soong.workflow.comment.wizard.inherit</field>
+        <field name="model">soong.workflow.comment.wizard</field>
+        <field name="inherit_id" ref="soong_workflow.view_soong_workflow_comment_wizard"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='avoid_issue_ids']" position="before">
+                <field name="issue_filter_ids" invisible="1"/>
+            </xpath>
+            <xpath expr="//field[@name='avoid_issue_ids']" position="attributes">
+                <attribute name="domain">[('id', 'in', issue_filter_ids)]</attribute>
+            </xpath>
+        </field>
+    </record>
+</odoo>