!8678 !8677 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…

Merge pull request !8678 from 李鹏宇/dev

yuthon_issue/wizard/issue_line_add_wizard.py

@@ -6,16 +6,10 @@ class IssueLineAddWizard(models.Model):
     _name = "issue.line.add.wizard"
 
     issue_id = fields.Many2one('issue.library')
-    department_id = fields.Many2one('hr.department', string="部门")
+    department_id = fields.Many2one('hr.department', string="部门", default=lambda self: self.env.user.employee_id.department_id)
     approval_group_id = fields.Many2one('soong.approval.group', string="类别")
     workflow_record_ids = fields.Many2many('soong.workflow.record', string="流程")
 
-    @api.onchange('department_id')
-    def _onchange_department_id(self):
-        if self.department_id:
-            return {'domain': {'approval_group_id': ['|', ('name', '!=', '人力资源'), ('parent_id.name', '!=', '人力资源')]}}
-        return {'domain': {'approval_group_id': ['|', ('name', '!=', '人力资源'), ('parent_id.name', '!=', '人力资源')]}}
-
     def confirm(self):
         for record_id in self.workflow_record_ids:
             self.env['issue.library.approval.line'].create({

yuthon_issue/wizard/issue_line_add_wizard.xml

@@ -7,11 +7,10 @@
             <form sting="添加流程弹窗">
                 <group>
                     <field name="issue_id" invisible="1"/>
-                    <field name="department_id"/>
+                    <field name="department_id" invisible="1"/>
                     <field name="approval_group_id" domain="['|', ('name', '!=', '人力资源'), ('parent_id.name', '!=', '人力资源')]"/>
                     <field name="workflow_record_ids" widget="many2many_tags" 
-                           domain="[('approvals_group_id', '=', approval_group_id), ('department_id', '=', department_id)]"
-                           invisible="not approval_group_id"/>
+                           domain="[('approvals_group_id', '=', approval_group_id), ('department_id', '=', department_id)]"/>
                 </group>
                 <footer>
                     <button name="confirm" string="确定" type="object" class="oe_highlight"/>