!7497 !7496 添加功能

Merge pull request !7497 from 李鹏宇/dev

yuthon_official/models/officical_type.py

@@ -15,4 +15,11 @@ class MainFlats(models.Model):
     _name = 'main.flats'
     _description = '主送单位'
 
-    name = fields.Char(string="主送单位")
+    name = fields.Char(string="主送单位")
+
+
+class CopyFlats(models.Model):
+    _name = 'copy.flats'
+    _description = '抄送单位'
+
+    name = fields.Char(string="抄送单位")

yuthon_official/models/yuthon_official.py

@@ -22,7 +22,7 @@ class YuthonOfficial(models.Model):
     come_file_id = fields.Char(string="来文编号")
     incoming_file_id = fields.Char(string="收文编号")
     main_flats_id = fields.Many2one('main.flats', string="主送单位")
-    copy_flats = fields.Char(string="抄送单位")
+    copy_flats_id = fields.Many2one('copy.flats', string="抄送单位")
     department_ids = fields.Many2many('hr.department', string='部门范围')
     employee_ids = fields.Many2many('hr.employee', string='人员范围')
     users_role_ids = fields.Many2many('soong.user.role', string='角色范围')

yuthon_official/security/ir.model.access.csv

@@ -9,4 +9,5 @@ access_yuthon_official_incoming_labor,yuthon_official_incoming_labor,model_yutho
 access_yuthon_official_incoming_normal,yuthon_official_incoming_normal,model_yuthon_official_incoming_normal,base.group_user,1,1,1,1
 access_yuthon_cross_departmental, yuthon_cross_departmental,model_yuthon_cross_departmental,base.group_user,1,1,1,1
 access_yuthon_file_processing,yuthon_file_processing,model_yuthon_file_processing,base.group_user,1,1,1,1
-access_main_flats,main_flats,model_main_flats,base.group_user,1,1,1,1
+access_main_flats,main_flats,model_main_flats,base.group_user,1,1,1,1
+access_copy_flats,copy_flats,model_copy_flats,base.group_user,1,1,1,1

yuthon_official/views/official_menus.xml

@@ -115,7 +115,17 @@
               name="发文单位"
               action="official_partner_action"
               sequence="20"/>
-   <menuitem  id="official_management_type_menu"
+   <menuitem  id="main_flats_menu"
+              parent="yuthon_official_setting"
+              name="主送单位"
+              action="main_flats_action"
+              sequence="25"/>
+    <menuitem  id="copy_flats_menu"
+              parent="yuthon_official_setting"
+              name="抄送单位"
+              action="copy_flats_action"
+              sequence="27"/>
+    <menuitem  id="official_management_type_menu"
               parent="yuthon_official_setting"
               name="公文类型"
               action="official_type_action"

yuthon_official/views/official_type_views.xml

@@ -10,11 +10,37 @@
             </tree>
         </field>
     </record>
-
     <record id="official_type_action" model="ir.actions.act_window">
         <field name="name">公文类型管理</field>
         <field name="res_model">official.type</field>
         <field name="view_mode">tree</field>
     </record>
-
+    <record id="main_flats_tree" model="ir.ui.view">
+        <field name="name">main.flats.tree</field>
+        <field name="model">main.flats</field>
+        <field name="arch" type="xml">
+            <tree string="主送单位" editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+    <record id="main_flats_action" model="ir.actions.act_window">
+        <field name="name">主送单位</field>
+        <field name="res_model">main.flats</field>
+        <field name="view_mode">tree</field>
+    </record>
+    <record id="copy_flats_tree" model="ir.ui.view">
+        <field name="name">copy.flats.tree</field>
+        <field name="model">copy.flats</field>
+        <field name="arch" type="xml">
+            <tree string="抄送单位" editable="bottom">
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+    <record id="copy_flats_action" model="ir.actions.act_window">
+        <field name="name">抄送单位</field>
+        <field name="res_model">copy.flats</field>
+        <field name="view_mode">tree</field>
+    </record>
 </odoo>

yuthon_official/views/yuthon_official_views.xml

@@ -69,8 +69,8 @@
                         </group>
                         <group>
                             <field name="reference_cold"/>
-                            <field name="main_flats_id"/>
-                            <field name="copy_flats"/>
+                            <field name="main_flats_id" options="{'no_create': True, 'no_open': True}"/>
+                            <field name="copy_flats_id" options="{'no_create': True, 'no_open': True}"/>
                             <field name="date"/>
                             <field name="issues_result" invisible="is_meet == False"/>
                         </group>