From b59cbbccb339c18874d3dbde61ea1689f136a7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Fri, 21 Feb 2025 16:38:40 +0800
Subject: [PATCH] 1

---
 .../data/notice_role_groups_data.xml          | 12 -----
 yuthon_notice/models/yuthon_confirm_users.py  |  3 --
 yuthon_notice/models/yuthon_notice.py         |  2 +-
 .../security/yuthon_notice_group.xml          | 21 +-------
 .../views/yuthon_confirm_users_views.xml      |  5 +-
 .../views/yuthon_notice_type_views.xml        | 10 +++-
 yuthon_notice/views/yuthon_notice_views.xml   | 50 ++-----------------
 7 files changed, 15 insertions(+), 88 deletions(-)

diff --git a/yuthon_notice/data/notice_role_groups_data.xml b/yuthon_notice/data/notice_role_groups_data.xml
index 697610433..71e8e8365 100644
--- a/yuthon_notice/data/notice_role_groups_data.xml
+++ b/yuthon_notice/data/notice_role_groups_data.xml
@@ -4,16 +4,4 @@
         <field name="name">信息发布管理员</field>
         <field name="user_type">departmental_role</field>
     </record>
-    <record id="yuthon_notice_setting_sequence2" model="soong.user.role">
-        <field name="name">天河投资信息发布员</field>
-        <field name="user_type">departmental_role</field>
-    </record>
-    <record id="yuthon_notice_setting_sequence3" model="soong.user.role">
-        <field name="name">天河粮储信息发布员</field>
-        <field name="user_type">departmental_role</field>
-    </record>
-    <record id="yuthon_notice_setting_sequence4" model="soong.user.role">
-        <field name="name">天河物管信息发布员</field>
-        <field name="user_type">departmental_role</field>
-    </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_notice/models/yuthon_confirm_users.py b/yuthon_notice/models/yuthon_confirm_users.py
index 1be2b763d..e95cf4a8c 100644
--- a/yuthon_notice/models/yuthon_confirm_users.py
+++ b/yuthon_notice/models/yuthon_confirm_users.py
@@ -6,7 +6,6 @@ from odoo.exceptions import UserError, ValidationError
 class YuthonConfirmUsers(models.Model):
     _name = "yuthon.confirm.users"
     _description = "公告确认信息"
-    _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin']
 
     employee_id = fields.Many2one('hr.employee', string='员工')
     notice_id = fields.Many2one('yuthon.notice', string="公告名称")
@@ -34,8 +33,6 @@ class YuthonConfirmUsers(models.Model):
         confirm_noice_ids = self.env["yuthon.confirm.users"].browse(self._context.get('active_ids', self._context.get('active_id')))
         for rec in confirm_noice_ids:
             menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的通知公告')])
-            action_id = self.env['ir.ui.menu'].search([('name', '=', '我的通知公告')])
-            # action=2032&model=hr.attendance&view_type=list&cids=1&menu_id=6335
             str = 'https://oa.thtzjt.com/web#id={}&cids=1&menu_id={}&action={}&model=yuthon.notice&view_type=form'.format(
                 rec.notice_id.id, menu_id.id, menu_id.action.id)
             self.sudo().env["wecom.apps"].sync_send_message_textcard(category='notice',
diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py
index 9d0364984..7fa4abff4 100644
--- a/yuthon_notice/models/yuthon_notice.py
+++ b/yuthon_notice/models/yuthon_notice.py
@@ -6,7 +6,7 @@ from odoo.exceptions import ValidationError, UserError
 class YuthonNotice(models.Model):
     _name = "yuthon.notice"
     _description = '通知公告'
-    _inherit = ['soong.workflow.mixin', 'mail.thread.main.attachment', 'mail.activity.mixin']
+    _inherit = ['soong.workflow.mixin']
     _rec_name = 'name'
     _order = "sequence desc"
 
diff --git a/yuthon_notice/security/yuthon_notice_group.xml b/yuthon_notice/security/yuthon_notice_group.xml
index 3837b8211..cda031c20 100644
--- a/yuthon_notice/security/yuthon_notice_group.xml
+++ b/yuthon_notice/security/yuthon_notice_group.xml
@@ -9,29 +9,10 @@
         <field name="category_id" ref="module_category_yuthon_notice"/>
     </record>
 
-    <record id="group_tz_notice_topic" model="res.groups">
-        <field name="name">天河投资通知权限</field>
-        <field name="category_id" ref="module_category_yuthon_notice"/>
-        <field name="implied_ids" eval="[(4, ref('module_category_yuthon_notice_user'))]"/>
-    </record>
-
-    <record id="group_lc_notice_topic" model="res.groups">
-        <field name="name">天河粮储通知权限</field>
-        <field name="category_id" ref="module_category_yuthon_notice"/>
-        <field name="implied_ids" eval="[(4, ref('module_category_yuthon_notice_user'))]"/>
-    </record>
-
-    <record id="group_wg_notice_topic" model="res.groups">
-        <field name="name">天河物管通知权限</field>
-        <field name="category_id" ref="module_category_yuthon_notice"/>
-        <field name="implied_ids" eval="[(4, ref('module_category_yuthon_notice_user'))]"/>
-    </record>
-
     <record id="group_notice_admin" model="res.groups">
         <field name="name">通知管理员</field>
         <field name="category_id" ref="module_category_yuthon_notice"/>
-        <field name="implied_ids" eval="[(4, ref('module_category_yuthon_notice_user')),(4, ref('group_tz_notice_topic')),
-        (4, ref('group_lc_notice_topic')), (4, ref('group_wg_notice_topic'))]"/>
+        <field name="implied_ids" eval="[(4, ref('module_category_yuthon_notice_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_admin'))]"/>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_notice/views/yuthon_confirm_users_views.xml b/yuthon_notice/views/yuthon_confirm_users_views.xml
index 5f8aa7438..1b1496468 100644
--- a/yuthon_notice/views/yuthon_confirm_users_views.xml
+++ b/yuthon_notice/views/yuthon_confirm_users_views.xml
@@ -6,8 +6,7 @@
         <field name="arch" type="xml">
             <tree create="false" edit="false" string="公告确认信息" editable="bottom">
                 <header>
-                    <button class="oe_stat_button" name="reminders_notice" string="批量催办" type="object"
-                            icon="fa-bars"/>
+                    <button class="oe_stat_button" name="reminders_notice" string="批量催办" type="object" icon="fa-bars"/>
                 </header>
                 <field name="employee_id"/>
                 <field name="notice_id"/>
@@ -34,6 +33,6 @@
         <field name="name">公告确认信息</field>
         <field name="res_model">yuthon.confirm.users</field>
         <field name="view_mode">tree</field>
-        <field name="search_view_id" ref="yuthon_confirm_users_filter"/>
+        <field name="context">{'search_group_notice':1}</field>
     </record>
 </odoo>
\ No newline at end of file
diff --git a/yuthon_notice/views/yuthon_notice_type_views.xml b/yuthon_notice/views/yuthon_notice_type_views.xml
index b9bd0109f..64ef5ad9d 100644
--- a/yuthon_notice/views/yuthon_notice_type_views.xml
+++ b/yuthon_notice/views/yuthon_notice_type_views.xml
@@ -24,11 +24,17 @@
             name="配置"
             groups="yuthon_notice.group_notice_admin"
             sequence="7"/>
-    <menuitem
-            id="yuthon_notice_type_menu"
+
+    <menuitem id="yuthon_notice_type_menu"
             parent="yuthon_notice_type_setting"
             name="公告类型"
             action="approval_notice_type_action"
             sequence="1"/>
 
+    <menuitem id="yuthon_confirm_users_menu"
+            parent="yuthon_notice_type_setting"
+            name="公告确认信息"
+            action="yuthon_confirm_users_action"
+            sequence="2"/>
+
 </odoo>
\ No newline at end of file
diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml
index e6ae1dc20..ce919b1c5 100644
--- a/yuthon_notice/views/yuthon_notice_views.xml
+++ b/yuthon_notice/views/yuthon_notice_views.xml
@@ -4,9 +4,8 @@
         <field name="name">yuthon.notice.tree</field>
         <field name="model">yuthon.notice</field>
         <field name="arch" type="xml">
-            <tree string="公告管理"
-                decoration-success="notice_state == 'yes' "
-                decoration-info="notice_state == 'no' "
+            <tree string="公告管理" decoration-success="notice_state == 'yes'"
+                decoration-info="notice_state == 'no'"
                 decoration-muted="notice_state == 'stop'">
                 <field name="users_id" string="发布人"/>
                 <field name="notice_type_id" string="类型"/>
@@ -18,8 +17,7 @@
                 <field name="end_date"/>
                 <field name="notice_state"/>
                 <button name="on_sequence" string="置顶" invisible="sequence != 0" type="object" class="btn-primary"/>
-                <button name="no_sequence" string="取消置顶" invisible="sequence != 1" type="object"
-                        class="btn-primary"/>
+                <button name="no_sequence" string="取消置顶" invisible="sequence != 1" type="object" class="btn-primary"/>
                 <button name="look_up_notice_users" string="查阅情况" type="object" class="btn-primary"/>
                 <button name="stop_notice" string="终止" type="object" class="btn-primary"/>
                 <field name="sequence" column_invisible="1"/>
@@ -153,27 +151,6 @@
          (0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_notice.view_yuthon_notice_tree2')}),
          (0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_notice.view_yuthon_notice_form2')})]"/>
     </record>
-    <record id="approval_notice_action3" model="ir.actions.act_window">
-        <field name="name">天河投资通知公告</field>
-        <field name="res_model">yuthon.notice</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_yuthon_notice_filter"/>
-        <field name="domain">[('yuthon_company', '=', 'thtz')]</field>
-    </record>
-    <record id="approval_notice_action4" model="ir.actions.act_window">
-        <field name="name">天河粮储通知公告</field>
-        <field name="res_model">yuthon.notice</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_yuthon_notice_filter"/>
-        <field name="domain">[('yuthon_company', '=', 'thlc')]</field>
-    </record>
-    <record id="approval_notice_action5" model="ir.actions.act_window">
-        <field name="name">天河物管通知公告</field>
-        <field name="res_model">yuthon.notice</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_yuthon_notice_filter"/>
-        <field name="domain">[('yuthon_company', '=', 'thwg')]</field>
-    </record>
 
     <menuitem
             id="yuthon_notice_menu_config_root"
@@ -197,25 +174,4 @@
             action="approval_notice_action"
             groups="yuthon_notice.group_notice_admin"
             sequence="1"/>
-    <menuitem
-            id="yuthon_notice_menu2"
-            parent="yuthon_notice_menu_config_root"
-            name="领导公告(集团本部)"
-            action="approval_notice_action3"
-            groups="yuthon_notice.group_tz_notice_topic"
-            sequence="3"/>
-    <menuitem
-            id="yuthon_notice_menu3"
-            parent="yuthon_notice_menu_config_root"
-            name="领导公告(粮储公司)"
-            action="approval_notice_action4"
-            groups="yuthon_notice.group_lc_notice_topic"
-            sequence="5"/>
-    <menuitem
-            id="yuthon_notice_menu4"
-            parent="yuthon_notice_menu_config_root"
-            name="领导公告(物管公司)"
-            action="approval_notice_action5"
-            groups="yuthon_notice.group_wg_notice_topic"
-            sequence="7"/>
 </odoo>
\ No newline at end of file