添加功能

yuthon_issue/__manifest__.py

@@ -17,6 +17,8 @@
         'security/issue_security_group.xml',
         'security/ir.model.access.csv',
         'data/issue_library_code_data.xml',
+        'data/issue_meeting_code_data.xml',
+        'data/issue_role_groups_data.xml',
         'views/issue_library_views.xml',
         'views/issue_type_views.xml',
         'views/issue_approval_views.xml',

yuthon_issue/data/issue_meeting_code_data.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="issue_meeting_code_num_sequence" model="ir.sequence">
+        <field name="name">会议纪要编号</field>
+        <field name="code">issue_meeting_minutes_code</field>
+        <field name="prefix">HY%(y)s%(month)s%(day)s</field>
+        <field name="padding">3</field>
+        <field name="company_id" eval="False"/>
+    </record>
+</odoo>

yuthon_issue/data/issue_role_groups_data.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="applicant_tage_setting_sequence0" model="soong.user.role">
+        <field name="name">党支委议题</field>
+        <field name="user_type">departmental_role</field>
+    </record>
+    <record id="applicant_tage_setting_sequence1" model="soong.user.role">
+        <field name="name">班子会议题</field>
+        <field name="user_type">departmental_role</field>
+    </record>
+    <record id="applicant_tage_setting_sequence2" model="soong.user.role">
+        <field name="name">董事会议题</field>
+        <field name="user_type">departmental_role</field>
+    </record>
+    <record id="applicant_tage_setting_sequence3" model="soong.user.role">
+        <field name="name">物管议题管理员</field>
+        <field name="user_type">departmental_role</field>
+    </record>
+    <record id="applicant_tage_setting_sequence4" model="soong.user.role">
+        <field name="name">物管党支委议题</field>
+        <field name="user_type">departmental_role</field>
+    </record>
+    <record id="applicant_tage_setting_sequence5" model="soong.user.role">
+        <field name="name">物管班子会议题</field>
+        <field name="user_type">departmental_role</field>
+    </record>
+    <record id="applicant_tage_setting_sequence6" model="soong.user.role">
+        <field name="name">粮储党支委议题</field>
+        <field name="user_type">departmental_role</field>
+    </record>
+    <record id="applicant_tage_setting_sequence7" model="soong.user.role">
+        <field name="name">粮储班子会议题</field>
+        <field name="user_type">departmental_role</field>
+    </record>
+    <record id="applicant_tage_setting_sequence8" model="soong.user.role">
+        <field name="name">粮储议题管理员</field>
+        <field name="user_type">departmental_role</field>
+    </record>
+</odoo>

yuthon_issue/models/issue_approval.py

@@ -19,7 +19,7 @@ class IssueApproval(models.Model):
                                        ('thtjbb', '天河投资本部')], string="所属公司",
                                       related='employee_id.yuthon_company')
     meeting_details = fields.Char(string="会议详情")
-    job_id = fields.Many2one('employee_id.job_id', string="岗位")
+    job_id = fields.Many2one(related='employee_id.job_id', string="岗位")
     is_attend = fields.Boolean(string="是否上会", default=True)
     issue_text = fields.Html(string="正文")
     notice_documents_ids = fields.Many2many('ir.attachment', string='议题附件')
@@ -31,7 +31,7 @@ class IssueApproval(models.Model):
     issue_display = fields.Char(string="议题事项", default='{"template": "yuthon_issue.html_issue_demo"}')
     decision_display = fields.Char(string="决策清单", default='{"template": "yuthon_issue.html_decision_demo"}')
     is_parent_unit = fields.Boolean(string="上级单位")
-
+    performance_id = fields.Many2one('issue.meeting.minutes')
     def pub_meeting_minutes(self):
         pass
 

yuthon_issue/models/issue_library.py

@@ -104,7 +104,6 @@ class IssueLibrary(models.Model):
             "res_model": "room.booking",
             "views": [[form_id, "form"]],
             "context": {
-                'default_name': '',
                 'default_room_booking_library_ids': [(6, 0, issue_active_ids.ids)],
             }
         }

yuthon_issue/models/issue_meeting_minutes.py

@@ -11,10 +11,11 @@ class IssueMeetingMinutes(models.Model):
     meeting_id = fields.Many2one('room.booking',string='会议名称', required=True)
     meeting_type_id = fields.Many2one('room.meeting.type', string="会议类型")
     meeting_date = fields.Datetime(string="会议时间")
+    code = fields.Char(string='编号', required=True, copy=False,
+                       default=lambda self: self.env['ir.sequence'].next_by_code('issue_meeting_code_num_sequence'))
     meeting_minutes_ids = fields.One2many('issue.meeting.minutes.line', 'meeting_minutes_id', string="会议纪要明细")
     notice_documents_ids = fields.Many2many('documents.document', string="纪要签名附件")
 
-
 class IssueMeetingMinutesLine(models.Model):
     _name = 'issue.meeting.minutes.line'
     _description = '会议纪要明细行'

yuthon_issue/views/issue_meeting_minutes_views.xml

@@ -6,6 +6,7 @@
         <field name="arch" type="xml">
             <tree string="会议纪要">
                 <field name="meeting_id"/>
+                <field name="code"/>
                 <field name="meeting_type_id"/>
                 <field name="meeting_date"/>
             </tree>
@@ -19,6 +20,7 @@
                 <sheet>
                     <group col="2">
                         <group>
+                             <field name="code"/>
                              <field name="meeting_id"/>
                              <field name="meeting_date"/>
                              <field name="meeting_type_id"/>