!8205 !8204 添加功能

Merge pull request !8205 from 李鹏宇/dev
2026-01-22 02:41:20 +00:00
parent 223683d7d1 bea6363faf
commit 83a3c52932
3 changed files with 4 additions and 5 deletions
@@ -13,7 +13,6 @@
        "data/notice_template_data.xml",
        "security/soong_workflow_security.xml",
        "security/ir.model.access.csv",
-        "security/company_rule.xml",
        "views/kklw_workflow_approval_views.xml",
        "views/soong_approval_users_views.xml",
        "views/soong_note_views.xml",
@@ -106,9 +106,10 @@
                </div>
                <group invisible="node_btn_name != '分发'">
                    <field name="employee_ids" widget="many2many_tags" string="董事长" domain="[('user_role_id.name', '=', '董事长')]" options="{'no_create': True}"  groups="yuthon_salary.group_jtbb_user"/>
-
-                    <field name="dep_manager_employee_ids" widget="many2many_tags" string="承办"  options="{'no_create': True}"/>
-                    <field name="circulated_employee_ids" widget="many2many_tags" options="{'no_create': True}"/>
+                    <!-- 分发弹窗：本公司开关控制人员筛选范围 -->
+                    <field name="is_this_company"/>
+                    <field name="dep_manager_employee_ids" widget="many2many_tags" string="承办"  options="{'no_create': True}" domain="[('company_id', '=', company_id)] if is_this_company else []"/>
+                    <field name="circulated_employee_ids" widget="many2many_tags" options="{'no_create': True}" domain="[('company_id', '=', company_id)] if is_this_company else []"/>
                    <field name="supervising_employee_ids" widget="many2many_tags" invisible="not is_supervising" options="{'no_create': True}"/>
                </group>
                <footer>
@@ -15,7 +15,6 @@
                'room', 'yuthon_issue', 'mail', 'web', 'yuthon_trade'],
    'data': [
        'security/ir.model.access.csv',
-        'security/company_rule.xml',
        'data/process_code_data.xml',
        'data/stage_approval_data.xml',
        'data/tage_approval_data.xml',