From 954553f7e15c976d6635b3bb4abfefec65e57b9c Mon Sep 17 00:00:00 2001 From: ONIONZHAOXI <2275333053@qq.com> Date: Mon, 5 Aug 2024 17:03:41 +0800 Subject: [PATCH] =?UTF-8?q?8=E6=9C=885=E6=97=A5=EF=BC=8C=E5=AF=B9yuthon=5F?= =?UTF-8?q?issue=E6=A8=A1=E5=9D=97=E6=B7=BB=E4=B8=80=E4=B8=AA=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E8=AE=AE=E9=A2=98=E5=AE=A1=E6=89=B9=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E6=94=B9=E9=80=9A=E7=9F=A5=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF=E5=8D=95=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_issue/__manifest__.py | 3 +- yuthon_issue/models/__init__.py | 3 + yuthon_issue/models/issue_approval.py | 26 ++++++++ yuthon_issue/security/ir.model.access.csv | 2 + yuthon_issue/views/issue_approval_views.xml | 59 +++++++++++++++++++ yuthon_notice/__manifest__.py | 4 +- ...views.xml => yuthon_notice_type_views.xml} | 0 ...tice_views.xml => yuthon_notice_views.xml} | 0 8 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 yuthon_issue/models/issue_approval.py create mode 100644 yuthon_issue/views/issue_approval_views.xml rename yuthon_notice/views/{yuthon_ntice_type_views.xml => yuthon_notice_type_views.xml} (100%) rename yuthon_notice/views/{yuthon_ntice_views.xml => yuthon_notice_views.xml} (100%) diff --git a/yuthon_issue/__manifest__.py b/yuthon_issue/__manifest__.py index e68c58055..e27c64d17 100644 --- a/yuthon_issue/__manifest__.py +++ b/yuthon_issue/__manifest__.py @@ -10,11 +10,12 @@ 'category': 'Human Resources/Attendances', 'version': '0.1', 'license': 'LGPL-3', - 'depends': ['mail', 'documents'], + 'depends': ['approvals', 'documents','yuthon_approval', 'mail'], 'data': [ 'security/ir.model.access.csv', 'data/issue_library_code_data.xml', 'views/issue_library_views.xml', + 'views/issue_approval_views.xml', ], 'installable': True, 'application': True, diff --git a/yuthon_issue/models/__init__.py b/yuthon_issue/models/__init__.py index 13c0590eb..ce3b2f3af 100644 --- a/yuthon_issue/models/__init__.py +++ b/yuthon_issue/models/__init__.py @@ -1,4 +1,7 @@ # -*- coding: utf-8 -*- + from . import issue_library +from . import issue_approval + from . import issue_lv diff --git a/yuthon_issue/models/issue_approval.py b/yuthon_issue/models/issue_approval.py new file mode 100644 index 000000000..1f218eded --- /dev/null +++ b/yuthon_issue/models/issue_approval.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools +from odoo.exceptions import ValidationError + + +class IssueApproval(models.Model): + _name = "issue.approval" + _description = '议题审批' + _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin'] + _rec_name = 'name' + + name = fields.Char(string='议题名称') + issue_creation_time = fields.Datetime(string='议题创建时间', default=lambda self: fields.Datetime.now()) + issue_approval_type = fields.Selection([('ready_meeting', '党总支'), ('party_branch_committee', '党支委'), + ('management_team', '经营班子'), ('board_directors', '董事会')], + string="议题审批类型") + company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company) + issue_documents_ids = fields.Many2many('documents.document', string="附件") + issue_text = fields.Html(string="正文") + issue_request_ids = fields.One2many('issue.line', 'issue_name_id', string="议题列表") + +class IssueLine(models.Model): + _name = 'issue.line' + _description = '议题列表' + + issue_name_id = fields.Many2one('issue.library', string="关联议题") diff --git a/yuthon_issue/security/ir.model.access.csv b/yuthon_issue/security/ir.model.access.csv index 53f414ef6..24c8520ff 100644 --- a/yuthon_issue/security/ir.model.access.csv +++ b/yuthon_issue/security/ir.model.access.csv @@ -1,2 +1,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_issue_library,issue_library,model_issue_library,base.group_user,1,1,1,1 +access_issue_approval,issue_approval,model_issue_approval,base.group_user,1,1,1,1 +access_issue_line,issue_line,model_issue_line,base.group_user,1,1,1,1 diff --git a/yuthon_issue/views/issue_approval_views.xml b/yuthon_issue/views/issue_approval_views.xml new file mode 100644 index 000000000..13a07d997 --- /dev/null +++ b/yuthon_issue/views/issue_approval_views.xml @@ -0,0 +1,59 @@ + + + + issue.approval.tree + issue.approval + + + + + + + + + + + + issue.approval.form + issue.approval + +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + 议题审批 + issue.approval + tree,form + + + + + \ No newline at end of file diff --git a/yuthon_notice/__manifest__.py b/yuthon_notice/__manifest__.py index 25cd1a91c..ada3bbbee 100644 --- a/yuthon_notice/__manifest__.py +++ b/yuthon_notice/__manifest__.py @@ -14,8 +14,8 @@ 'data': [ 'security/ir.model.access.csv', 'data/notice_code_data.xml', - 'views/yuthon_ntice_views.xml', - 'views/yuthon_ntice_type_views.xml', + 'views/yuthon_notice_views.xml', + 'views/yuthon_notice_type_views.xml', 'views/yuthon_confirm_users_views.xml', 'report/notice_report.xml', ], diff --git a/yuthon_notice/views/yuthon_ntice_type_views.xml b/yuthon_notice/views/yuthon_notice_type_views.xml similarity index 100% rename from yuthon_notice/views/yuthon_ntice_type_views.xml rename to yuthon_notice/views/yuthon_notice_type_views.xml diff --git a/yuthon_notice/views/yuthon_ntice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml similarity index 100% rename from yuthon_notice/views/yuthon_ntice_views.xml rename to yuthon_notice/views/yuthon_notice_views.xml