From 1718089264c6b910c68c0e307c7d5cc23cbb96fb Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sat, 22 Feb 2025 17:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../security/issue_security_group.xml         |   72 +-
 yuthon_issue/views/issue_library_views.xml    | 1611 -----------------
 yuthon_issue/views/menus.xml                  |  197 +-
 yuthon_salary/__manifest__.py                 |    1 +
 .../security/yuthon_salary_group.xml          |   58 +
 ...nherit_hr_payroll_structure_type_views.xml |   17 +-
 .../inherit_hr_payroll_structure_views.xml    |   21 -
 .../views/yuthon_payroll_project_views.xml    |   44 +-
 .../yuthon_payroll_type_setting_views.xml     |   13 -
 yuthon_work_brand/views/hr_menus.xml          |  210 +--
 10 files changed, 175 insertions(+), 2069 deletions(-)
 create mode 100644 yuthon_salary/security/yuthon_salary_group.xml

diff --git a/yuthon_issue/security/issue_security_group.xml b/yuthon_issue/security/issue_security_group.xml
index 8588f4080..2f831fce0 100644
--- a/yuthon_issue/security/issue_security_group.xml
+++ b/yuthon_issue/security/issue_security_group.xml
@@ -3,72 +3,20 @@
      <record id="module_category_issue_library" model="ir.module.category">
         <field name="name">议题权限</field>
     </record>
-
-    <!-- 党支委议题群组 -->
-    <record id="group_party_topic" model="res.groups">
-        <field name="name">党支委议题</field>
+    <record id="group_issue_user" model="res.groups">
+        <field name="name">议题用户</field>
         <field name="category_id" ref="module_category_issue_library"/>
     </record>
-
-    <!-- 班子会议题群组 -->
-    <record id="group_team_topic" model="res.groups">
-        <field name="name">班子会议题</field>
-        <field name="category_id" ref="module_category_issue_library"/>
-    </record>
-
-    <!-- 董事会议题群组 -->
-    <record id="group_board_topic" model="res.groups">
-        <field name="name">董事会议题</field>
-        <field name="category_id" ref="module_category_issue_library"/>
-    </record>
-
-    <!-- 物管党支委管理员群组 -->
-    <record id="property_group_party_topic" model="res.groups">
-        <field name="name">物管党支委议题</field>
-         <field name="category_id" ref="module_category_issue_library"/>
-    </record>
-
-    <!-- 物管班子会管理员群组 -->
-    <record id="property_group_team_topic" model="res.groups">
-        <field name="name">物管班子会议题</field>
-         <field name="category_id" ref="module_category_issue_library"/>
-    </record>
-
-     <!-- 物管管理员群组 -->
-    <record id="group_property_admin" model="res.groups">
-        <field name="name">物管议题管理员</field>
-        <field name="category_id" ref="module_category_issue_library"/>
-        <field name="implied_ids" eval="[(4, ref('property_group_party_topic')), (4, ref('property_group_team_topic'))]"/>
-        <field name="users" eval="[(4, ref('base.user_admin'))]"/>
-    </record>
-
-    <!-- 粮储党支委管理员群组-->
-    <record id="group_grain_party_topic" model="res.groups">
-        <field name="name">粮储党支委议题</field>
-        <field name="category_id" ref="module_category_issue_library"/>
-    </record>
-
-    <!-- 粮储班子会管理员群组 -->
-    <record id="group_grain_team_topic" model="res.groups">
-        <field name="name">粮储班子会议题</field>
-         <field name="category_id" ref="module_category_issue_library"/>
-    </record>
-
-    <!-- 粮储管理员群组 -->
-    <record id="group_grain_admin" model="res.groups">
-        <field name="name">粮储议题管理员</field>
-        <field name="category_id" ref="module_category_issue_library"/>
-        <field name="implied_ids" eval="[(4, ref('group_grain_party_topic')), (4, ref('group_grain_team_topic'))]"/>
-        <field name="users" eval="[(4, ref('base.user_admin'))]"/>
-    </record>
-
-    <!-- 议题管理员群组 -->
-    <record id="group_topic_admin" model="res.groups">
+    <record id="group_issue_admin" model="res.groups">
         <field name="name">议题管理员</field>
         <field name="category_id" ref="module_category_issue_library"/>
-        <field name="implied_ids" eval="[(4, ref('group_party_topic')), (4, ref('group_team_topic')), (4, ref('group_board_topic')) ,
-        (4, ref('group_property_admin')),(4, ref('property_group_party_topic')),(4, ref('property_group_team_topic')),(4, ref('group_grain_admin')),
-        (4, ref('group_grain_party_topic')),(4, ref('group_grain_team_topic'))]"/>
+        <field name="implied_ids" eval="[(4, ref('group_issue_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_admin'))]"/>
     </record>
+    <record id="yuthon_issue_company_rule_manager" model="ir.rule">
+        <field name="name">yuthon_issue_company_rule_admin</field>
+        <field name="model_id" ref="model_issue_library"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="groups" eval="[(4, ref('group_issue_admin'))]"/>
+    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_issue/views/issue_library_views.xml b/yuthon_issue/views/issue_library_views.xml
index ce1166961..2efb39289 100644
--- a/yuthon_issue/views/issue_library_views.xml
+++ b/yuthon_issue/views/issue_library_views.xml
@@ -1093,1618 +1093,7 @@
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree5')}),
          (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form5')})]"/>
     </record>
-    <!--物管党支委议题库-->
-    <record id="view_issue_library_tree6" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <field name="name"/>
-                <field name="code"/>
-                <field name="creart_datetime"/>
-                <field name="is_party"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-            </tree>
-        </field>
-    </record>
 
-    <record id="view_issue_library_form6" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <field name="code" readonly="1" string="流水号:"/>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="name" required="1"/>
-                            <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="2">
-                        <group>
-                            <field name="is_party" invisible="1"/>
-                        </group>
-                        <group>
-                            <field name="is_note" invisible="1"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-                                    <field name="council" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="code"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-    <!--已上会-->
-    <record id="view_issue_library_on_meeting_tree6" model="ir.ui.view">
-        <field name="name">issue.library.on.meeting.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <field name="code"/>
-                <field name="name" column_invisible="1"/>
-                <field name="name_text" class="list_width"/>
-                <field name="cs_party"/>
-                <field name="cs_class"/>
-                <field name="cs_boss"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-                <button name="approval_details" string="审批详情" type="object" class="oe_highlight"/>
-                 
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_issue_library_on_meeting_form6" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <field name="code" readonly="1" string="流水号:"/>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="name" required="1"/>
-                            <field name="name_text" invisible="1"/>
-                            <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="4">
-                        <group>
-                            <field name="is_party"/>
-                        </group>
-                        <group>
-                            <field name="is_class"/>
-                        </group>
-                        <group>
-                            <field name="is_boss"/>
-                        </group>
-                        <group>
-                            <field name="is_note"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-                                    <field name="council" readonly="1"/>
-                                    <field name="team_meet" readonly="1"/>
-                                    <field name="board_meet" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="code"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="issue_library_action6" model="ir.actions.act_window">
-        <field name="name">议题库</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('is_boss', '=', True)]</field>
-        <field name="search_view_id" ref="view_issue_library_filter"/>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree6')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form6')})]"/>
-    </record>
-
-    <record id="issue_library_action_will6" model="ir.actions.act_window">
-        <field name="name">待上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','will')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree6')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form6')})]"/>
-    </record>
-
-    <record id="issue_library_action_done6" model="ir.actions.act_window">
-        <field name="name">已上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','on_meet')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_tree6')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_form6')})]"/>
-    </record>
-
-    <record id="issue_library_action_cancel6" model="ir.actions.act_window">
-        <field name="name">已取消</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','cancel')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree6')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form6')})]"/>
-    </record>
-    <!--物管班子议题库-->
-    <record id="view_issue_library_tree7" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <field name="name"/>
-                <field name="code"/>
-                <field name="creart_datetime"/>
-                <field name="is_class"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_issue_library_form7" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <field name="code" readonly="1" string="流水号:"/>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="name" required="1"/>
-                            <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="2">
-                        <group>
-                            <field name="is_class" invisible="1"/>
-                        </group>
-                        <group>
-                            <field name="is_note" invisible="1"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-
-                                    <field name="team_meet" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="code"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-    <!--已上会-->
-    <record id="view_issue_library_on_meeting_tree7" model="ir.ui.view">
-        <field name="name">issue.library.on.meeting.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <field name="code"/>
-                <field name="name" column_invisible="1"/>
-                <field name="name_text" class="list_width"/>
-                <field name="cs_party"/>
-                <field name="cs_class"/>
-                <field name="cs_boss"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-                <button name="approval_details" string="审批详情" type="object" class="oe_highlight"/>
-                 
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_issue_library_on_meeting_form7" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <field name="code" readonly="1" string="流水号:"/>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="name" required="1"/>
-                            <field name="name_text" invisible="1"/>
-                            <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="4">
-                        <group>
-                            <field name="is_party"/>
-                        </group>
-                        <group>
-                            <field name="is_class"/>
-                        </group>
-                        <group>
-                            <field name="is_boss"/>
-                        </group>
-                        <group>
-                            <field name="is_note"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-                                    <field name="council" readonly="1"/>
-                                    <field name="team_meet" readonly="1"/>
-                                    <field name="board_meet" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="code"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="issue_library_action7" model="ir.actions.act_window">
-        <field name="name">议题库</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('is_boss', '=', True)]</field>
-        <field name="search_view_id" ref="view_issue_library_filter"/>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree7')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form7')})]"/>
-    </record>
-
-    <record id="issue_library_action_will7" model="ir.actions.act_window">
-        <field name="name">待上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','will')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree7')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form7')})]"/>
-    </record>
-
-    <record id="issue_library_action_done7" model="ir.actions.act_window">
-        <field name="name">已上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','on_meet')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_tree7')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_form7')})]"/>
-    </record>
-
-    <record id="issue_library_action_cancel7" model="ir.actions.act_window">
-        <field name="name">已取消</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','cancel')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree7')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form7')})]"/>
-    </record>
-    <!--粮储党支委议题库-->
-    <record id="view_issue_library_tree9" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <field name="name"/>
-                <field name="code"/>
-                <field name="creart_datetime"/>
-                <field name="is_party"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_issue_library_form9" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <field name="code" readonly="1" string="流水号:"/>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="name" required="1"/>
-                            <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="2">
-                        <group>
-                            <field name="is_party" invisible="1"/>
-                        </group>
-                        <group>
-                            <field name="is_note" invisible="1"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-                                    <field name="council" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="code"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="issue_library_action9" model="ir.actions.act_window">
-        <field name="name">议题库</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('is_boss', '=', True)]</field>
-        <field name="search_view_id" ref="view_issue_library_filter"/>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree9')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form9')})]"/>
-    </record>
-    <!--已上会-->
-    <record id="view_issue_library_on_meeting_tree9" model="ir.ui.view">
-        <field name="name">issue.library.on.meeting.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <field name="code"/>
-                <field name="name" column_invisible="1"/>
-                <field name="name_text" class="list_width"/>
-                <field name="cs_party"/>
-                <field name="cs_class"/>
-                <field name="cs_boss"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-                <button name="approval_details" string="审批详情" type="object" class="oe_highlight"/>
-                 
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_issue_library_on_meeting_form9" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <field name="code" readonly="1" string="流水号:"/>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="name" required="1"/>
-                            <field name="name_text" invisible="1"/>
-                           <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="4">
-                        <group>
-                            <field name="is_party"/>
-                        </group>
-                        <group>
-                            <field name="is_class"/>
-                        </group>
-                        <group>
-                            <field name="is_boss"/>
-                        </group>
-                        <group>
-                            <field name="is_note"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-                                    <field name="council" readonly="1"/>
-                                    <field name="team_meet" readonly="1"/>
-                                    <field name="board_meet" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="code"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="issue_library_action_will9" model="ir.actions.act_window">
-        <field name="name">待上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','will')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree9')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form9')})]"/>
-    </record>
-
-    <record id="issue_library_action_done9" model="ir.actions.act_window">
-        <field name="name">已上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','on_meet')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_tree9')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_form9')})]"/>
-    </record>
-
-    <record id="issue_library_action_cancel9" model="ir.actions.act_window">
-        <field name="name">已取消</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','cancel')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree9')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form9')})]"/>
-    </record>
-    <!--粮储班子议题库-->
-    <record id="view_issue_library_tree10" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <field name="name"/>
-                <field name="code"/>
-                <field name="creart_datetime"/>
-                <field name="is_class"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_issue_library_form10" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="code" readonly="1" string="流水号:"/>
-                        </group>
-                        <group>
-                            <field name="name" required="1"/>
-                            <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="2">
-                        <group>
-                            <field name="is_boss" invisible="1"/>
-                        </group>
-                        <group>
-                            <field name="is_note" invisible="1"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-
-                                    <field name="team_meet" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="code"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="issue_library_action10" model="ir.actions.act_window">
-        <field name="name">议题库</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('is_boss', '=', True)]</field>
-        <field name="search_view_id" ref="view_issue_library_filter"/>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree10')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form10')})]"/>
-    </record>
-    <!--已上会-->
-    <record id="view_issue_library_on_meeting_tree10" model="ir.ui.view">
-        <field name="name">issue.library.on.meeting.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <field name="code"/>
-                <field name="name" column_invisible="1"/>
-                <field name="name_text" class="list_width"/>
-                <field name="cs_party"/>
-                <field name="cs_class"/>
-                <field name="cs_boss"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-                <button name="approval_details" string="审批详情" type="object" class="oe_highlight"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_issue_library_on_meeting_form10" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <group>
-                            <field name="code" readonly="1" string="流水号:"/>
-                        </group>
-                        <group>
-                            <field name="name" required="1"/>
-                            <field name="name_text" invisible="1"/>
-                            <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="4">
-                        <group>
-                            <field name="is_party"/>
-                        </group>
-                        <group>
-                            <field name="is_class"/>
-                        </group>
-                        <group>
-                            <field name="is_boss"/>
-                        </group>
-                        <group>
-                            <field name="is_note"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-                                    <field name="council" readonly="1"/>
-                                    <field name="team_meet" readonly="1"/>
-                                    <field name="board_meet" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="code"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="issue_library_action_will10" model="ir.actions.act_window">
-        <field name="name">待上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','will')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree10')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form10')})]"/>
-    </record>
-
-    <record id="issue_library_action_done10" model="ir.actions.act_window">
-        <field name="name">已上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','on_meet')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_tree10')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_form10')})]"/>
-    </record>
-
-    <record id="issue_library_action_cancel10" model="ir.actions.act_window">
-        <field name="name">已取消</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','cancel')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree10')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form10')})]"/>
-    </record>
-
-    <!--物管议题库-->
-    <record id="view_issue_library_tree11" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <header>
-                    <button name="all_issue_pull" string="批量提交" type="object"/>
-                    <button name="all_meeting_issue" string="批量上会" type="object"/>
-                </header>
-                <field name="name"/>
-                <field name="code"/>
-                <field name="creart_datetime"/>
-                <field name="is_party"/>
-                <field name="is_class"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-                <button name="approval_details" string="审批详情" type="object" class="oe_highlight"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_issue_library_form11" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <field name="code" readonly="1" string="流水号:"/>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="code"/>
-                            <field name="name" required="1"/>
-                            <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="3">
-                        <group>
-                            <field name="is_party"/>
-                        </group>
-                        <group>
-                            <field name="is_class"/>
-                        </group>
-                        <group>
-                            <field name="is_note"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-                                    <field name="council" readonly="1"/>
-                                    <field name="team_meet" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="code"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-    <!--已上会-->
-    <record id="view_issue_library_on_meeting_tree11" model="ir.ui.view">
-        <field name="name">issue.library.on.meeting.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <field name="code"/>
-                <field name="name" column_invisible="1"/>
-                <field name="name_text" class="list_width"/>
-                <field name="cs_party"/>
-                <field name="cs_class"/>
-                <field name="cs_boss"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-                <button name="approval_details" string="审批详情" type="object" class="oe_highlight"/>
-
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_issue_library_on_meeting_form11" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <field name="code" readonly="1" string="流水号:"/>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="name" required="1"/>
-                            <field name="name_text" invisible="1"/>
-                            <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="4">
-                        <group>
-                            <field name="is_party"/>
-                        </group>
-                        <group>
-                            <field name="is_class"/>
-                        </group>
-                        <group>
-                            <field name="is_boss"/>
-                        </group>
-                        <group>
-                            <field name="is_note"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-                                    <field name="council" readonly="1"/>
-                                    <field name="team_meet" readonly="1"/>
-                                    <field name="board_meet" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="code"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-
-    <record id="issue_library_action11" model="ir.actions.act_window">
-        <field name="name">议题库</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_issue_library_filter"/>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree11')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form11')})]"/>
-    </record>
-
-    <record id="issue_library_action_approval11" model="ir.actions.act_window">
-        <field name="name">已审批</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','approval')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree11')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form11')})]"/>
-    </record>
-
-    <record id="issue_library_action_will11" model="ir.actions.act_window">
-        <field name="name">待上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','will')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree11')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form11')})]"/>
-    </record>
-
-    <record id="issue_library_action_done11" model="ir.actions.act_window">
-        <field name="name">已上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','on_meet')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_tree11')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_form11')})]"/>
-    </record>
-
-    <record id="issue_library_action_cancel11" model="ir.actions.act_window">
-        <field name="name">已取消</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','cancel')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree11')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form11')})]"/>
-    </record>
-    <!--粮储议题库-->
-    <record id="view_issue_library_tree12" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <header>
-                    <button name="all_issue_pull" string="批量提交" type="object"/>
-                    <button name="all_meeting_issue" string="批量上会" type="object"/>
-                </header>
-                <field name="name"/>
-                <field name="code"/>
-                <field name="creart_datetime"/>
-                <field name="is_party"/>
-                <field name="is_class"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-                <button name="approval_details" string="审批详情" type="object" class="oe_highlight"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_issue_library_form12" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <field name="code" readonly="1" string="流水号:"/>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="name" required="1"/>
-                            <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="3">
-                        <group>
-                            <field name="is_party"/>
-                        </group>
-                        <group>
-                            <field name="is_class"/>
-                        </group>
-                        <group>
-                            <field name="is_note"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-                                    <field name="council" readonly="1"/>
-                                    <field name="team_meet" readonly="1"/>
-                                    <field name="board_meet" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="code"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-    <!--已上会-->
-    <record id="view_issue_library_on_meeting_tree12" model="ir.ui.view">
-        <field name="name">issue.library.on.meeting.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <tree string="议题库"
-                  decoration-info="state == 'will'"
-                  decoration-success="state == 'done'"
-                  decoration-muted="state == 'cancel'">
-                <field name="code"/>
-                <field name="name" column_invisible="1"/>
-                <field name="name_text" class="list_width"/>
-                <field name="cs_party"/>
-                <field name="cs_class"/>
-                <field name="cs_boss"/>
-                <field name="is_note"/>
-                <field name="state"/>
-                <button name="all_issue_pull" string="提交" type="object" class="oe_highlight"/>
-                <button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
-                <button name="unlink" string="删除" type="object" class="oe_highlight"/>
-                <button name="approval_details" string="审批详情" type="object" class="oe_highlight"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_issue_library_on_meeting_form12" model="ir.ui.view">
-        <field name="name">issue.library.tree</field>
-        <field name="model">issue.library</field>
-        <field name="arch" type="xml">
-            <form string="议题库">
-                <header>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet>
-                    <group>
-                        <field name="code" readonly="1" string="流水号:"/>
-                    </group>
-                    <group>
-                        <group>
-                            <field name="name" required="1"/>
-                            <field name="name_text" invisible="1"/>
-                            <field name="approval_decision_sequence" invisible="1"/>
-                            <field name="notice_documents_ids" widget="preview_many2many"/>
-                            <field name="creart_datetime"/>
-                        </group>
-                        <group>
-                            <field name="employee_id" invisible="1"/>
-                            <field name="department_id" invisible="1"/>
-                            <field name="yuthon_company" invisible="1"/>
-                            <field name="users_role_ids" invisible="1" widget="many2many_tags"/>
-                        </group>
-                    </group>
-                    <group col="4">
-                        <group>
-                            <field name="is_party"/>
-                        </group>
-                        <group>
-                            <field name="is_class"/>
-                        </group>
-                        <group>
-                            <field name="is_boss"/>
-                        </group>
-                        <group>
-                            <field name="is_note"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="决策清单">
-                            <field name="issue_library_line_ids">
-                                <tree editable="bottom">
-                                    <field name="ordinal"/>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="issue_approval_decision_id" class="list_ids_width"/>
-                                    <field name="council" readonly="1"/>
-                                    <field name="team_meet" readonly="1"/>
-                                    <field name="board_meet" readonly="1"/>
-                                    <field name="district_bureau" readonly="1"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联流程">
-                            <field name="issue_library_approval_line_ids" readonly="1">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="workflow_record_id" string="标题"/>
-                                    <field name="code"/>
-                                    <field name="approval_type"/>
-                                    <field name="approval_date"/>
-                                    <button name="open_record" type="object" string="详情" class="btn-primary"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="关联审批" invisible="state != 'approval'">
-                            <group>
-                                <group>
-                                    <field name="issue_approval_id"/>
-                                </group>
-                                <group/>
-                            </group>
-                        </page>
-                        <page string="关联会议">
-                            <field name="issue_library_room_line_ids">
-                                <tree>
-                                    <field name="issue_library_id" column_invisible="1"/>
-                                    <field name="room_booking_id"/>
-                                    <field name="room_id"/>
-                                    <field name="meeting_type_id"/>
-                                    <field name="approval_date"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </sheet>
-            </form>
-        </field>
-    </record>
-    <record id="issue_library_action12" model="ir.actions.act_window">
-        <field name="name">议题库</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_issue_library_filter"/>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree12')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form12')})]"/>
-    </record>
-
-    <record id="issue_library_action_approval12" model="ir.actions.act_window">
-        <field name="name">已审批</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','approval')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree12')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form12')})]"/>
-    </record>
-
-    <record id="issue_library_action_will12" model="ir.actions.act_window">
-        <field name="name">待上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','will')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree12')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form12')})]"/>
-    </record>
-
-    <record id="issue_library_action_done12" model="ir.actions.act_window">
-        <field name="name">已上会</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','on_meet')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_tree12')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_on_meeting_form12')})]"/>
-    </record>
-
-    <record id="issue_library_action_cancel12" model="ir.actions.act_window">
-        <field name="name">已取消</field>
-        <field name="res_model">issue.library</field>
-        <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','cancel')]</field>
-        <field name="view_ids" eval="[(5, 0, 0),
-         (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree12')}),
-         (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form12')})]"/>
-    </record>
      <record id="issue_library_my_action" model="ir.actions.act_window">
         <field name="name">我的议题库</field>
         <field name="res_model">issue.library</field>
diff --git a/yuthon_issue/views/menus.xml b/yuthon_issue/views/menus.xml
index af4e28544..4fdc91d06 100644
--- a/yuthon_issue/views/menus.xml
+++ b/yuthon_issue/views/menus.xml
@@ -5,7 +5,6 @@
               web_icon="yuthon_issue,static/description/icon.png"
               sequence="1"/>
 
-    <!--  天河投资议题库管理  -->
     <menuitem id="yuthon_library_my_menu"
               name="我的议题"
               parent="tianhe_issue_library_menu_root"
@@ -19,7 +18,7 @@
     <menuitem id="tianhe_issue_library_menu"
               parent="tianhe_issue_library_menu_root"
               name="议题库"
-              groups="yuthon_issue.group_topic_admin"
+              groups="yuthon_issue.group_issue_admin"
               sequence="10"/>
     <menuitem id="tianhe_issue_library_all"
               parent="tianhe_issue_library_menu"
@@ -49,7 +48,7 @@
     <menuitem id="tianhe_issue_library_menu_root3"
               name="党支委议题库"
               parent="tianhe_issue_library_menu_root"
-              groups="yuthon_issue.group_party_topic"
+              groups="yuthon_issue.group_issue_admin"
               sequence="15"/>
 
     <menuitem id="issue_library_menu3"
@@ -80,7 +79,7 @@
     <menuitem id="tianhe_issue_library_menu_root4"
               name="班子会议题库"
               parent="tianhe_issue_library_menu_root"
-              groups="yuthon_issue.group_team_topic"
+              groups="yuthon_issue.group_issue_admin"
               sequence="20"/>
 
     <menuitem id="issue_library_menu4"
@@ -111,7 +110,7 @@
     <menuitem id="tianhe_issue_library_menu_root5"
               name="董事会议题库"
               parent="tianhe_issue_library_menu_root"
-              groups="yuthon_issue.group_board_topic"
+              groups="yuthon_issue.group_issue_admin"
               sequence="25"/>
 
     <menuitem id="issue_library_menu5"
@@ -138,194 +137,6 @@
               action="issue_library_action_cancel5"
               sequence="9"/>
 
-        <!--物管议题库-->
-    <menuitem id="tianhe_issue_library_menu_root11"
-              parent="tianhe_issue_library_menu_root"
-              name="物管议题库"
-              groups="yuthon_issue.group_property_admin"
-              sequence="27"/>
-
-    <menuitem id="issue_library_menu11"
-              parent="tianhe_issue_library_menu_root11"
-              name="全部"
-              action="issue_library_action11"
-              sequence="1"/>
-
-    <menuitem id="tianhe_other_issue_library_will11"
-              parent="tianhe_issue_library_menu_root11"
-              name="已审批"
-              action="issue_library_action_will11"
-              sequence="5"/>
-
-    <menuitem id="tianhe_other_issue_library_done11"
-              parent="tianhe_issue_library_menu_root11"
-              name="已上会"
-              action="issue_library_action_done11"
-              sequence="7"/>
-
-    <menuitem id="tianhe_other_issue_library_cancel11"
-              parent="tianhe_issue_library_menu_root11"
-              name="已取消"
-              action="issue_library_action_cancel11"
-              sequence="9"/>
-
-
-    <!-- 物管党支议题库-->
-    <menuitem id="tianhe_issue_library_menu_root6"
-              parent="tianhe_issue_library_menu_root"
-              name="物管党支委议题库"
-              groups="property_group_party_topic"
-              sequence="30"/>
-
-    <menuitem id="issue_library_menu6"
-              parent="tianhe_issue_library_menu_root6"
-              name="全部"
-              action="issue_library_action6"
-              sequence="1"/>
-
-    <menuitem id="tianhe_other_issue_library_will6"
-              parent="tianhe_issue_library_menu_root6"
-              name="待上会"
-              action="issue_library_action_will6"
-              sequence="5"/>
-
-    <menuitem id="tianhe_other_issue_library_done6"
-              parent="tianhe_issue_library_menu_root6"
-              name="已上会"
-              action="issue_library_action_done6"
-              sequence="7"/>
-
-    <menuitem id="tianhe_other_issue_library_cancel6"
-              parent="tianhe_issue_library_menu_root6"
-              name="已取消"
-              action="issue_library_action_cancel6"
-              sequence="9"/>
-
-    <!--物管班子会议题库-->
-    <menuitem id="tianhe_issue_library_menu_root7"
-              parent="tianhe_issue_library_menu_root"
-              name="物管班子会议题库"
-              groups="property_group_team_topic"
-              sequence="35"/>
-
-    <menuitem id="issue_library_menu7"
-              parent="tianhe_issue_library_menu_root7"
-              name="全部"
-              action="issue_library_action7"
-              sequence="1"/>
-
-    <menuitem id="tianhe_other_issue_library_will7"
-              parent="tianhe_issue_library_menu_root7"
-              name="待上会"
-              action="issue_library_action_will7"
-              sequence="5"/>
-
-    <menuitem id="tianhe_other_issue_library_done7"
-              parent="tianhe_issue_library_menu_root7"
-              name="已上会"
-              action="issue_library_action_done7"
-              sequence="7"/>
-
-    <menuitem id="tianhe_other_issue_library_cancel7"
-              parent="tianhe_issue_library_menu_root7"
-              name="已取消"
-              action="issue_library_action_cancel7"
-              sequence="9"/>
-
-
-       <!--粮储议题库-->
-    <menuitem id="tianhe_issue_library_menu_root12"
-              parent="tianhe_issue_library_menu_root"
-              name="粮储议题库"
-              groups="yuthon_issue.group_grain_team_topic"
-              sequence="42"/>
-
-    <menuitem id="issue_library_menu12"
-              parent="tianhe_issue_library_menu_root12"
-              name="全部"
-              action="issue_library_action12"
-              sequence="1"/>
-
-    <menuitem id="tianhe_other_issue_library_will12"
-              parent="tianhe_issue_library_menu_root12"
-              name="已审批"
-              action="issue_library_action_will12"
-              sequence="5"/>
-
-    <menuitem id="tianhe_other_issue_library_done12"
-              parent="tianhe_issue_library_menu_root12"
-              name="已上会"
-              action="issue_library_action_done12"
-              sequence="7"/>
-
-    <menuitem id="tianhe_other_issue_library_cancel12"
-              parent="tianhe_issue_library_menu_root12"
-              name="已取消"
-              action="issue_library_action_cancel12"
-              sequence="9"/>
-
-    <!--粮储党支议题库-->
-    <menuitem id="tianhe_issue_library_menu_root9"
-              parent="tianhe_issue_library_menu_root"
-              name="粮储党支委议题库"
-              groups="yuthon_issue.group_grain_party_topic"
-              sequence="45"/>
-
-    <menuitem id="issue_library_menu9"
-              parent="tianhe_issue_library_menu_root9"
-              name="全部"
-              action="issue_library_action9"
-              sequence="1"/>
-
-    <menuitem id="tianhe_other_issue_library_will9"
-              parent="tianhe_issue_library_menu_root9"
-              name="待上会"
-              action="issue_library_action_will9"
-              sequence="5"/>
-
-    <menuitem id="tianhe_other_issue_library_done9"
-              parent="tianhe_issue_library_menu_root9"
-              name="已上会"
-              action="issue_library_action_done9"
-              sequence="7"/>
-
-    <menuitem id="tianhe_other_issue_library_cancel9"
-              parent="tianhe_issue_library_menu_root9"
-              name="已取消"
-              action="issue_library_action_cancel9"
-              sequence="9"/>
-
-    <!--粮储班子议题库-->
-    <menuitem id="tianhe_issue_library_menu_root10"
-              parent="tianhe_issue_library_menu_root"
-              name="粮储班子会议题库"
-              groups="yuthon_issue.group_grain_team_topic"
-              sequence="50"/>
-
-    <menuitem id="issue_library_menu10"
-              parent="tianhe_issue_library_menu_root10"
-              name="全部"
-              action="issue_library_action10"
-              sequence="1"/>
-
-    <menuitem id="tianhe_other_issue_library_will10"
-              parent="tianhe_issue_library_menu_root10"
-              name="待上会"
-              action="issue_library_action_will10"
-              sequence="5"/>
-
-    <menuitem id="tianhe_other_issue_library_done10"
-              parent="tianhe_issue_library_menu_root10"
-              name="已上会"
-              action="issue_library_action_done10"
-              sequence="7"/>
-
-    <menuitem id="tianhe_other_issue_library_cancel10"
-              parent="tianhe_issue_library_menu_root10"
-              name="已取消"
-              action="issue_library_action_cancel10"
-              sequence="9"/>
-
 
     <menuitem id="issue_meeting_menu"
               parent="tianhe_issue_library_menu_root"
diff --git a/yuthon_salary/__manifest__.py b/yuthon_salary/__manifest__.py
index e52bc52d0..418647de2 100644
--- a/yuthon_salary/__manifest__.py
+++ b/yuthon_salary/__manifest__.py
@@ -13,6 +13,7 @@
     'depends': ['mail', 'base', 'hr', 'yuthon_hr_employee','hr_payroll'],
     'data': [
         'security/ir.model.access.csv',
+        'security/yuthon_salary_group.xml',
         'views/inherit_hr_payroll_structure_views.xml',
         'views/inherit_hr_salary_rule_views.xml',
         'views/inherit_hr_payslip_views.xml',
diff --git a/yuthon_salary/security/yuthon_salary_group.xml b/yuthon_salary/security/yuthon_salary_group.xml
new file mode 100644
index 000000000..b747bc9ab
--- /dev/null
+++ b/yuthon_salary/security/yuthon_salary_group.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="module_category_yuthon_salary" model="ir.module.category">
+        <field name="name">薪资群组</field>
+    </record>
+    <record id="group_salary_user" model="res.groups">
+        <field name="name">薪资用户</field>
+        <field name="category_id" ref="module_category_yuthon_salary"/>
+    </record>
+    <record id="group_salary_admin" model="res.groups">
+        <field name="name">薪资管理员</field>
+        <field name="category_id" ref="module_category_yuthon_salary"/>
+        <field name="implied_ids" eval="[(4, ref('group_salary_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_admin'))]"/>
+    </record>
+    <!--职级类型-->
+    <record id="yuthon_salary_type_company_rule_manager" model="ir.rule">
+        <field name="name">yuthon_salary_company_rule_admin</field>
+        <field name="model_id" ref="model_hr_payroll_structure_type"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+    </record>
+    <!--职级-->
+    <record id="yuthon_salary_structure_company_rule_manager" model="ir.rule">
+        <field name="name">yuthon_salary_structure_rule_admin</field>
+        <field name="model_id" ref="model_hr_payroll_structure"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+    </record>
+    <!--常用项-->
+    <record id="yuthon_salary_common_item_company_rule_manager" model="ir.rule">
+        <field name="name">yuthon_salary_common_item_rule_admin</field>
+        <field name="model_id" ref="model_yuthon_payroll_common"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+    </record>
+    <!--五险一金-->
+    <record id="yuthon_salary_insurance_company_rule_manager" model="ir.rule">
+        <field name="name">yuthon_salary_insurance_rule_admin</field>
+        <field name="model_id" ref="model_yuthon_payroll_insurances"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+    </record>
+    <!--临时项-->
+    <record id="yuthon_salary_temp_item_company_rule_manager" model="ir.rule">
+        <field name="name">yuthon_salary_temp_item_rule_admin</field>
+        <field name="model_id" ref="model_yuthon_payroll_temporary"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+    </record>
+    <!--职级类别配置-->
+    <record id="yuthon_salary_level_company_rule_manager" model="ir.rule">
+        <field name="name">yuthon_salary_level_rule_admin</field>
+        <field name="model_id" ref="model_yuthon_payroll_type_setting"/>
+        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+        <field name="groups" eval="[(4, ref('group_salary_admin'))]"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/yuthon_salary/views/inherit_hr_payroll_structure_type_views.xml b/yuthon_salary/views/inherit_hr_payroll_structure_type_views.xml
index b32438ee7..536288d5d 100644
--- a/yuthon_salary/views/inherit_hr_payroll_structure_type_views.xml
+++ b/yuthon_salary/views/inherit_hr_payroll_structure_type_views.xml
@@ -27,24 +27,9 @@
         </field>
     </record>
     <record id="action_view_hr_payroll_structure_type_form1" model="ir.actions.act_window">
-        <field name="name">天河投资</field>
+        <field name="name">职级类型</field>
         <field name="res_model">hr.payroll.structure.type</field>
         <field name="view_mode">tree,form,search</field>
         <field name="context">{'search_default_group_lv_id': 1}</field>
-        <field name="domain">[('yuthon_company', '=' , 'thtz')]</field>
-    </record>
-    <record id="action_view_hr_payroll_structure_type_form2" model="ir.actions.act_window">
-        <field name="name">天河粮储</field>
-        <field name="res_model">hr.payroll.structure.type</field>
-        <field name="view_mode">tree,form,search</field>
-        <field name="context">{'search_default_group_lv': 1}</field>
-        <field name="domain">[('yuthon_company', '=', 'thlc')]</field>
-    </record>
-    <record id="action_view_hr_payroll_structure_type_form3" model="ir.actions.act_window">
-        <field name="name">天河物管</field>
-        <field name="res_model">hr.payroll.structure.type</field>
-        <field name="view_mode">tree,form,search</field>
-        <field name="context">{'search_default_group_lv': 1}</field>
-        <field name="domain">[('yuthon_company', '=', 'thwg')]</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
index d794a5aea..93b5b1bc8 100644
--- a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+++ b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
@@ -72,27 +72,6 @@
         <field name="view_mode">tree,form,search</field>
         <field name="context">{'search_default_group_lv_name': 1}</field>
     </record>
-    <record id="action_view_hr_payroll_structure_list_form1" model="ir.actions.act_window">
-        <field name="name">天河投资</field>
-        <field name="res_model">hr.payroll.structure</field>
-        <field name="view_mode">tree,form,search</field>
-        <field name="context">{'search_default_group_lv_name': 1}</field>
-        <field name="domain">[('yuthon_company', '=' , 'thtz')]</field>
-    </record>
-    <record id="action_view_hr_payroll_structure_list_form2" model="ir.actions.act_window">
-        <field name="name">天河粮储</field>
-        <field name="res_model">hr.payroll.structure</field>
-        <field name="view_mode">tree,form,search</field>
-        <field name="context">{'search_default_group_lv_name': 1}</field>
-        <field name="domain">[('yuthon_company', '=', 'thlc')]</field>
-    </record>
-    <record id="action_view_hr_payroll_structure_list_form3" model="ir.actions.act_window">
-        <field name="name">天河物管</field>
-        <field name="res_model">hr.payroll.structure</field>
-        <field name="view_mode">tree,form,search</field>
-        <field name="context">{'search_default_group_lv_name': 1}</field>
-        <field name="domain">[('yuthon_company', '=', 'thwg')]</field>
-    </record>
     <record id="all_paroll_write_salary" model="ir.actions.server">
         <field name="name">批量更新职级类型</field>
         <field name="model_id" ref="hr_payroll.model_hr_payroll_structure"/>
diff --git a/yuthon_salary/views/yuthon_payroll_project_views.xml b/yuthon_salary/views/yuthon_payroll_project_views.xml
index 2dcac4d23..ff8db503a 100644
--- a/yuthon_salary/views/yuthon_payroll_project_views.xml
+++ b/yuthon_salary/views/yuthon_payroll_project_views.xml
@@ -14,24 +14,12 @@
             </tree>
         </field>
     </record>
-    <record id="view_yuthon_payroll_tt_common_action" model="ir.actions.act_window">
+    <record id="view_yuthon_payroll_common_action" model="ir.actions.act_window">
         <field name="name">薪资常用项</field>
         <field name="res_model">yuthon.payroll.common</field>
         <field name="domain">[('yuthon_company','=','thtz')]</field>
         <field name="view_mode">tree</field>
     </record>
-    <record id="view_yuthon_payroll_lc_common_action" model="ir.actions.act_window">
-        <field name="name">薪资常用项</field>
-        <field name="res_model">yuthon.payroll.common</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-        <field name="view_mode">tree</field>
-    </record>
-    <record id="view_yuthon_payroll_wg_common_action" model="ir.actions.act_window">
-        <field name="name">薪资常用项</field>
-        <field name="res_model">yuthon.payroll.common</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
-        <field name="view_mode">tree</field>
-    </record>
     <record id="view_yuthon_payroll_temporary_tree" model="ir.ui.view">
         <field name="name">yuthon.payroll.temporary.tree</field>
         <field name="model">yuthon.payroll.temporary</field>
@@ -45,22 +33,9 @@
             </tree>
         </field>
     </record>
-    <record id="view_yuthon_payroll_tt_temporary_action" model="ir.actions.act_window">
+    <record id="view_yuthon_payroll_temporary_action" model="ir.actions.act_window">
         <field name="name">临时工资项</field>
         <field name="res_model">yuthon.payroll.temporary</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
-        <field name="view_mode">tree</field>
-    </record>
-    <record id="view_yuthon_payroll_lc_temporary_action" model="ir.actions.act_window">
-        <field name="name">临时工资项</field>
-        <field name="res_model">yuthon.payroll.temporary</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-        <field name="view_mode">tree</field>
-    </record>
-    <record id="view_yuthon_payroll_wg_temporary_action" model="ir.actions.act_window">
-        <field name="name">临时工资项</field>
-        <field name="res_model">yuthon.payroll.temporary</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
         <field name="view_mode">tree</field>
     </record>
     <record id="view_yuthon_payroll_insurances_tree" model="ir.ui.view">
@@ -88,22 +63,9 @@
             </tree>
         </field>
     </record>
-    <record id="view_yuthon_payroll_tt_insurances_action" model="ir.actions.act_window">
+    <record id="view_yuthon_payroll_insurances_action" model="ir.actions.act_window">
         <field name="name">五险一金</field>
         <field name="res_model">yuthon.payroll.insurances</field>
-        <field name="domain">[('yuthon_company','=','thtz')]</field>
-        <field name="view_mode">tree</field>
-    </record>
-    <record id="view_yuthon_payroll_lc_insurances_action" model="ir.actions.act_window">
-        <field name="name">五险一金</field>
-        <field name="res_model">yuthon.payroll.insurances</field>
-        <field name="domain">[('yuthon_company','=','thlc')]</field>
-        <field name="view_mode">tree</field>
-    </record>
-    <record id="view_yuthon_payroll_wg_insurances_action" model="ir.actions.act_window">
-        <field name="name">五险一金</field>
-        <field name="res_model">yuthon.payroll.insurances</field>
-        <field name="domain">[('yuthon_company','=','thwg')]</field>
         <field name="view_mode">tree</field>
     </record>
 </odoo>
diff --git a/yuthon_salary/views/yuthon_payroll_type_setting_views.xml b/yuthon_salary/views/yuthon_payroll_type_setting_views.xml
index 1c9c3ed12..f0553fba6 100644
--- a/yuthon_salary/views/yuthon_payroll_type_setting_views.xml
+++ b/yuthon_salary/views/yuthon_payroll_type_setting_views.xml
@@ -14,18 +14,5 @@
         <field name="name">职级类别配置</field>
         <field name="res_model">yuthon.payroll.type.setting</field>
         <field name="view_mode">tree</field>
-        <field name="domain">[('yuthon_company', '=' , 'thtz')]</field>
-    </record>
-    <record id="yuthon_payroll_type_setting_action1" model="ir.actions.act_window">
-        <field name="name">职级类别配置</field>
-        <field name="res_model">yuthon.payroll.type.setting</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('yuthon_company', '=', 'thlc')]</field>
-    </record>
-    <record id="yuthon_payroll_type_setting_action2" model="ir.actions.act_window">
-        <field name="name">职级类别配置</field>
-        <field name="res_model">yuthon.payroll.type.setting</field>
-        <field name="view_mode">tree</field>
-        <field name="domain">[('yuthon_company', '=', 'thwg')]</field>
     </record>
 </odoo>
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 999ea1fd7..eb3755bc9 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -310,7 +310,7 @@
     <menuitem id="human_resources_salary_root_board"
               name="薪资管理"
               web_icon="yuthon_work_brand,static/description/salary.png"
-              groups="yuthon_hr_employee.group_hr_employee_salary_user"
+              groups="yuthon_salary.group_salary_user"
               sequence="9"/>
     <menuitem id="human_work_entry_board"
               name="工作分录"
@@ -331,138 +331,124 @@
               parent="human_pay_slips_root_board"
               action="hr_payroll.action_view_hr_payslip_month_form"
               sequence="3"/>
-    <menuitem id="human_pay_setting_structural_tt_board"
-              name="天河投资"
-              parent="human_resources_salary_root_board"
-              sequence="10"/>
-    <menuitem id="hr_payroll_structure_type_tt_board"
+    <menuitem id="hr_payroll_structure_type_board"
               name="职级类型"
-              parent="human_pay_setting_structural_tt_board"
+              parent="human_resources_salary_root_board"
               action="yuthon_salary.action_view_hr_payroll_structure_type_form1"
-              sequence="1"/>
-    <menuitem id="human_pay_setting_structural_tt_board1"
-              name="职级"
-              parent="human_pay_setting_structural_tt_board"
-              action="yuthon_salary.action_view_hr_payroll_structure_list_form1"
-              sequence="3"/>
-    <menuitem id="hr_payroll_common_tt_board"
-              name="常用项"
-              parent="human_pay_setting_structural_tt_board"
-              action="yuthon_salary.view_yuthon_payroll_tt_common_action"
-              sequence="5"/>
-    <menuitem id="hr_payroll_insurance_tt_board"
-              name="五险一金"
-              parent="human_pay_setting_structural_tt_board"
-              action="yuthon_salary.view_yuthon_payroll_tt_insurances_action"
-              sequence="7"/>
-    <menuitem id="hr_payroll_temporary_tt_board"
-              name="临时项"
-              parent="human_pay_setting_structural_tt_board"
-              action="yuthon_salary.view_yuthon_payroll_tt_temporary_action"
               sequence="9"/>
-<!--    <menuitem id="human_pay_setting_payroll_items_tt_board"-->
-<!--              name="工资项"-->
-<!--              parent="human_pay_setting_structural_tt_board"-->
-<!--              action="yuthon_salary.action_salary_rule_form1"-->
-<!--              sequence="7"/>-->
-    <menuitem id="human_pay_setting_payroll_items_tt_setting_board"
-              name="职级类别配置"
-              parent="human_pay_setting_structural_tt_board"
-              action="yuthon_salary.yuthon_payroll_type_setting_action"
-              sequence="15"/>
-     <menuitem id="human_pay_setting_structural_lc_board"
-              name="天河粮储"
-              parent="human_resources_salary_root_board"
-              sequence="15"/>
-     <menuitem id="hr_payroll_structure_type_lc_board"
-              name="职级类型"
-              parent="human_pay_setting_structural_lc_board"
-              action="yuthon_salary.action_view_hr_payroll_structure_type_form2"
-              sequence="1"/>
-    <menuitem id="human_pay_setting_structural_lc_board1"
+    <menuitem id="human_resources_salary_root_board1"
               name="职级"
-              parent="human_pay_setting_structural_lc_board"
-              action="yuthon_salary.action_view_hr_payroll_structure_list_form2"
-              sequence="3"/>
-    <menuitem id="hr_payroll_common_lc_board"
-              name="常用项"
-              parent="human_pay_setting_structural_lc_board"
-              action="yuthon_salary.view_yuthon_payroll_lc_common_action"
-              sequence="5"/>
-    <menuitem id="hr_payroll_insurances_lc_board"
-              name="五险一金"
-              parent="human_pay_setting_structural_lc_board"
-              action="yuthon_salary.view_yuthon_payroll_lc_insurances_action"
-              sequence="7"/>
-    <menuitem id="hr_payroll_temporary_lc_board"
-              name="临时项"
-              parent="human_pay_setting_structural_lc_board"
-              action="yuthon_salary.view_yuthon_payroll_lc_temporary_action"
-              sequence="9"/>
-<!--    <menuitem id="human_pay_setting_payroll_items_lc_board"-->
-<!--              name="工资项"-->
-<!--              parent="human_pay_setting_structural_lc_board"-->
-<!--              action="yuthon_salary.action_salary_rule_form2"-->
-<!--              sequence="7"/>-->
-    <menuitem id="human_pay_setting_payroll_items_lc_setting_board"
-              name="职级类别配置"
-              parent="human_pay_setting_structural_lc_board"
-              action="yuthon_salary.yuthon_payroll_type_setting_action1"
-              sequence="15"/>
-     <menuitem id="human_pay_setting_structural_wg_board"
-              name="天河物管"
               parent="human_resources_salary_root_board"
+              action="yuthon_salary.action_view_hr_payroll_structure_list_form"
+              sequence="15"/>
+    <menuitem id="hr_payroll_common_board"
+              name="常用项"
+              parent="human_resources_salary_root_board"
+              action="yuthon_salary.view_yuthon_payroll_common_action"
               sequence="20"/>
-     <menuitem id="hr_payroll_structure_type_wg_board"
-              name="职级类型"
-              parent="human_pay_setting_structural_wg_board"
-              action="yuthon_salary.action_view_hr_payroll_structure_type_form3"
-              sequence="1"/>
-    <menuitem id="human_pay_setting_structural_wg_board1"
-              name="职级"
-              parent="human_pay_setting_structural_wg_board"
-              action="yuthon_salary.action_view_hr_payroll_structure_list_form3"
-              sequence="5"/>
-    <menuitem id="hr_payroll_common_wg_board"
-              name="常用项"
-              parent="human_pay_setting_structural_wg_board"
-              action="yuthon_salary.view_yuthon_payroll_wg_common_action"
-              sequence="7"/>
-    <menuitem id="hr_payroll_insurance_wg_board"
+    <menuitem id="hr_payroll_insurance_board"
               name="五险一金"
-              parent="human_pay_setting_structural_wg_board"
-              action="yuthon_salary.view_yuthon_payroll_wg_insurances_action"
-              sequence="9"/>
-    <menuitem id="hr_payroll_temporary_wg_board"
+              parent="human_resources_salary_root_board"
+              action="yuthon_salary.view_yuthon_payroll_insurances_action"
+              sequence="25"/>
+    <menuitem id="hr_payroll_temporary_board"
               name="临时项"
-              parent="human_pay_setting_structural_wg_board"
-              action="yuthon_salary.view_yuthon_payroll_wg_temporary_action"
-              sequence="11"/>
-<!--    <menuitem id="human_pay_setting_payroll_items_wg_board"-->
-<!--              name="工资项"-->
-<!--              parent="human_pay_setting_structural_wg_board"-->
-<!--              action="yuthon_salary.action_salary_rule_form3"-->
-<!--              sequence="7"/>-->
-    <menuitem id="human_pay_setting_payroll_items_wg_setting_board"
+              parent="human_resources_salary_root_board"
+              action="yuthon_salary.view_yuthon_payroll_temporary_action"
+              sequence="30"/>
+    <menuitem id="human_pay_setting_payroll_items_setting_board"
               name="职级类别配置"
-              parent="human_pay_setting_structural_wg_board"
-              action="yuthon_salary.yuthon_payroll_type_setting_action2"
-              sequence="15"/>
+              parent="human_resources_salary_root_board"
+              action="yuthon_salary.yuthon_payroll_type_setting_action"
+              sequence="35"/>
+<!--     <menuitem id="human_pay_setting_structural_lc_board"-->
+<!--              name="天河粮储"-->
+<!--              parent="human_resources_salary_root_board"-->
+<!--              sequence="15"/>-->
+<!--&lt;!&ndash;     <menuitem id="hr_payroll_structure_type_lc_board"&ndash;&gt;-->
+<!--&lt;!&ndash;              name="职级类型"&ndash;&gt;-->
+<!--&lt;!&ndash;              parent="human_pay_setting_structural_lc_board"&ndash;&gt;-->
+<!--&lt;!&ndash;              action="yuthon_salary.action_view_hr_payroll_structure_type_form2"&ndash;&gt;-->
+<!--&lt;!&ndash;              sequence="1"/>&ndash;&gt;-->
+<!--    <menuitem id="human_pay_setting_structural_lc_board1"-->
+<!--              name="职级"-->
+<!--              parent="human_pay_setting_structural_lc_board"-->
+<!--              action="yuthon_salary.action_view_hr_payroll_structure_list_form2"-->
+<!--              sequence="3"/>-->
+<!--    <menuitem id="hr_payroll_common_lc_board"-->
+<!--              name="常用项"-->
+<!--              parent="human_pay_setting_structural_lc_board"-->
+<!--              action="yuthon_salary.view_yuthon_payroll_lc_common_action"-->
+<!--              sequence="5"/>-->
+<!--    <menuitem id="hr_payroll_insurances_lc_board"-->
+<!--              name="五险一金"-->
+<!--              parent="human_pay_setting_structural_lc_board"-->
+<!--              action="yuthon_salary.view_yuthon_payroll_lc_insurances_action"-->
+<!--              sequence="7"/>-->
+<!--    <menuitem id="hr_payroll_temporary_lc_board"-->
+<!--              name="临时项"-->
+<!--              parent="human_pay_setting_structural_lc_board"-->
+<!--              action="yuthon_salary.view_yuthon_payroll_lc_temporary_action"-->
+<!--              sequence="9"/>-->
+<!--    <menuitem id="human_pay_setting_payroll_items_lc_setting_board"-->
+<!--              name="职级类别配置"-->
+<!--              parent="human_pay_setting_structural_lc_board"-->
+<!--              action="yuthon_salary.yuthon_payroll_type_setting_action1"-->
+<!--              sequence="15"/>-->
+<!--     <menuitem id="human_pay_setting_structural_wg_board"-->
+<!--              name="天河物管"-->
+<!--              parent="human_resources_salary_root_board"-->
+<!--              sequence="20"/>-->
+<!--&lt;!&ndash;     <menuitem id="hr_payroll_structure_type_wg_board"&ndash;&gt;-->
+<!--&lt;!&ndash;              name="职级类型"&ndash;&gt;-->
+<!--&lt;!&ndash;              parent="human_pay_setting_structural_wg_board"&ndash;&gt;-->
+<!--&lt;!&ndash;              action="yuthon_salary.action_view_hr_payroll_structure_type_form3"&ndash;&gt;-->
+<!--&lt;!&ndash;              sequence="1"/>&ndash;&gt;-->
+<!--    <menuitem id="human_pay_setting_structural_wg_board1"-->
+<!--              name="职级"-->
+<!--              parent="human_pay_setting_structural_wg_board"-->
+<!--              action="yuthon_salary.action_view_hr_payroll_structure_list_form3"-->
+<!--              sequence="5"/>-->
+<!--    <menuitem id="hr_payroll_common_wg_board"-->
+<!--              name="常用项"-->
+<!--              parent="human_pay_setting_structural_wg_board"-->
+<!--              action="yuthon_salary.view_yuthon_payroll_wg_common_action"-->
+<!--              sequence="7"/>-->
+<!--    <menuitem id="hr_payroll_insurance_wg_board"-->
+<!--              name="五险一金"-->
+<!--              parent="human_pay_setting_structural_wg_board"-->
+<!--              action="yuthon_salary.view_yuthon_payroll_wg_insurances_action"-->
+<!--              sequence="9"/>-->
+<!--    <menuitem id="hr_payroll_temporary_wg_board"-->
+<!--              name="临时项"-->
+<!--              parent="human_pay_setting_structural_wg_board"-->
+<!--              action="yuthon_salary.view_yuthon_payroll_wg_temporary_action"-->
+<!--              sequence="11"/>-->
+<!--&lt;!&ndash;    <menuitem id="human_pay_setting_payroll_items_wg_board"&ndash;&gt;-->
+<!--&lt;!&ndash;              name="工资项"&ndash;&gt;-->
+<!--&lt;!&ndash;              parent="human_pay_setting_structural_wg_board"&ndash;&gt;-->
+<!--&lt;!&ndash;              action="yuthon_salary.action_salary_rule_form3"&ndash;&gt;-->
+<!--&lt;!&ndash;              sequence="7"/>&ndash;&gt;-->
+<!--    <menuitem id="human_pay_setting_payroll_items_wg_setting_board"-->
+<!--              name="职级类别配置"-->
+<!--              parent="human_pay_setting_structural_wg_board"-->
+<!--              action="yuthon_salary.yuthon_payroll_type_setting_action2"-->
+<!--              sequence="15"/>-->
     <menuitem id="human_pay_setting_type_rule_argument_root_board"
               name="工资项参数"
               parent="human_resources_salary_root_board"
               action="hr_payroll.hr_rule_parameter_action"
-              sequence="23"/>
+              sequence="40"/>
     <menuitem id="human_pay_setting_type_rule_type_root_board"
               name="工资项类别"
               parent="human_resources_salary_root_board"
               action="hr_payroll.action_hr_salary_rule_category"
-              sequence="26"/>
+              sequence="45"/>
     <menuitem id="human_pay_setting_work_entry_root_board"
               name="工作条目类型"
               parent="human_resources_salary_root_board"
               action="hr_work_entry.hr_work_entry_type_action"
-              sequence="30"/>
+              sequence="50"/>
 
     <!--  培训管理  -->
     <menuitem id="training_manager_root_board"