From 9a7c4252ab5446e15b681c93441a35e39e115568 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Sat, 12 Oct 2024 11:52:39 +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

---
 yuthon_trade/views/yuthon_trade_menu.xml     | 56 ++++++--------------
 yuthon_work_brand/views/executive_manage.xml | 20 +++----
 2 files changed, 27 insertions(+), 49 deletions(-)

diff --git a/yuthon_trade/views/yuthon_trade_menu.xml b/yuthon_trade/views/yuthon_trade_menu.xml
index d0cb3af9c..a8ab43d85 100644
--- a/yuthon_trade/views/yuthon_trade_menu.xml
+++ b/yuthon_trade/views/yuthon_trade_menu.xml
@@ -4,96 +4,74 @@
          <field name="active">False</field>
     </record>
 
-    <menuitem id="executive_manage_menu_root"
-              name="行政管理"
-              web_icon="yuthon_work_brand,static/description/manage.png"
-              sequence="1"/>
-    <menuitem id="executive_manage_union_root"
-              name="工会"
-              parent="executive_manage_menu_root"
-              sequence="1"/>
-
-    <menuitem id="executive_manage_welfare"
-              name="福利"
-              parent="executive_manage_union_root"
-              sequence="1"/>
-
-    <menuitem id="executive_manage_activities"
-              name="活动"
-              parent="executive_manage_union_root"
-              action="yuthon_trade_none_tree_action"
-              sequence="3"/>
-
-    <menuitem id="executive_manage_insurance"
-              name="保险"
-              parent="executive_manage_union_root"
-              action="yuthon_trade_none_tree_action"
-              sequence="5"/>
-
+    <menuitem id="executive_manage_approval"
+              name="审批"
+              parent="yuthon_work_brand.executive_manage_union_root_board"
+              sequence="7"/>
     <menuitem id="executive_manage_expenses"
               name="费用"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="yuthon_trade_none_tree_action"
               sequence="7"/>
 
     <menuitem id="executive_personal_condolences"
               name="个人慰问"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_personal_condolences"
               sequence="9"/>
     <menuitem id="executive_work_condolences"
               name="节日慰问"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_work_condolences"
               sequence="11"/>
     <menuitem id="executive_trade_activities"
               name="工会活动"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_trade_activities"
               sequence="13"/>
     <menuitem id="executive_trade_borrowing"
               name="借支"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_trade_borrowing"
               sequence="15"/>
     <menuitem id="executive_trade_contract"
               name="合同审批"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_trade_contract"
               sequence="17"/>
     <menuitem id="executive_trade_pay"
               name="付款"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_trade_pay"
               sequence="19"/>
     <menuitem id="executive_trade_policy"
               name="保单列表"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_trade_policy"
               sequence="21"/>
     <menuitem id="executive_trade_premium"
               name="缴保申请表"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_trade_premium"
               sequence="23"/>
     <menuitem id="executive_trade_purchase"
               name="采购"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_trade_purchase"
               sequence="25"/>
     <menuitem id="executive_trade_refund"
               name="退款"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_trade_refund"
               sequence="27"/>
     <menuitem id="executive_trade_supportive"
               name="互助申请表"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_trade_supportive"
               sequence="29"/>
     <menuitem id="executive_trade_reimbursed"
               name="报销"
-              parent="executive_manage_union_root"
+              parent="executive_manage_approval"
               action="action_yuthon_trade_reimbursed"
               sequence="31"/>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_work_brand/views/executive_manage.xml b/yuthon_work_brand/views/executive_manage.xml
index 83feb9fe6..bfb88b1e4 100644
--- a/yuthon_work_brand/views/executive_manage.xml
+++ b/yuthon_work_brand/views/executive_manage.xml
@@ -19,17 +19,17 @@
               parent="executive_manage_union_root_board"
               sequence="1"/>
 
-    <menuitem id="executive_manage_holiday_condolences_board"
-              name="节日慰问"
-              parent="executive_manage_welfare_board"
-              action="yuthon_none_action"
-              sequence="1"/>
+<!--    <menuitem id="executive_manage_holiday_condolences_board"-->
+<!--              name="节日慰问"-->
+<!--              parent="executive_manage_welfare_board"-->
+<!--              action="yuthon_none_action"-->
+<!--              sequence="1"/>-->
 
-    <menuitem id="executive_manage_personal_condolences_board"
-              name="个人慰问"
-              parent="executive_manage_welfare_board"
-              action="yuthon_none_action"
-              sequence="3"/>
+<!--    <menuitem id="executive_manage_personal_condolences_board"-->
+<!--              name="个人慰问"-->
+<!--              parent="executive_manage_welfare_board"-->
+<!--              action="yuthon_none_action"-->
+<!--              sequence="3"/>-->
 
     <menuitem id="executive_manage_activities_board"
               name="活动"