From 9b8f69c7b3196cad3631c1636b9261110a96e83d Mon Sep 17 00:00:00 2001 From: ONIONZHAOXI <2275333053@qq.com> Date: Fri, 2 Aug 2024 10:09:19 +0800 Subject: [PATCH] =?UTF-8?q?8=E6=9C=882=E6=97=A5=EF=BC=8C=E5=AF=B9yuthon=5F?= =?UTF-8?q?official=E6=A8=A1=E5=9D=97=E6=B7=BB=E5=8A=A0=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A8=A1=E5=9E=8B=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=94=B6=E6=96=87=E6=96=87=E4=BB=B6=E5=92=8C=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=E5=85=AC=E6=96=87=E7=AE=A1=E7=90=86=E8=8F=9C=E5=8D=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_official/__manifest__.py | 5 +- yuthon_official/models/__init__.py | 5 +- .../models/yuthon_offficial_incoming_party.py | 34 +++++++ .../models/yuthon_official_incoming_labor.py | 34 +++++++ .../models/yuthon_official_incoming_normal.py | 34 +++++++ .../models/yuthon_official_labor.py | 2 +- .../models/yuthon_official_normal.py | 2 +- ...cial_party.py => yuthon_official_party.py} | 2 +- yuthon_official/security/ir.model.access.csv | 7 +- .../yuthon_official_incoming_labor_views.xml | 91 +++++++++++++++++++ .../yuthon_official_incoming_normal_views.xml | 91 +++++++++++++++++++ .../yuthon_official_incoming_party_views.xml | 91 +++++++++++++++++++ .../views/yuthon_official_labor_views.xml | 10 +- .../views/yuthon_official_normal_views.xml | 8 +- ...ws.xml => yuthon_official_party_views.xml} | 18 ++-- .../views/yuthon_official_views.xml | 18 ++++ 16 files changed, 427 insertions(+), 25 deletions(-) create mode 100644 yuthon_official/models/yuthon_offficial_incoming_party.py create mode 100644 yuthon_official/models/yuthon_official_incoming_labor.py create mode 100644 yuthon_official/models/yuthon_official_incoming_normal.py rename yuthon_official/models/{yuthon_offficial_party.py => yuthon_official_party.py} (94%) create mode 100644 yuthon_official/views/yuthon_official_incoming_labor_views.xml create mode 100644 yuthon_official/views/yuthon_official_incoming_normal_views.xml create mode 100644 yuthon_official/views/yuthon_official_incoming_party_views.xml rename yuthon_official/views/{yuthon_offficial_party_views.xml => yuthon_official_party_views.xml} (84%) diff --git a/yuthon_official/__manifest__.py b/yuthon_official/__manifest__.py index 99e933796..8a3e3ee55 100644 --- a/yuthon_official/__manifest__.py +++ b/yuthon_official/__manifest__.py @@ -18,8 +18,11 @@ 'views/official_partner_views.xml', 'views/official_type_views.xml', 'views/yuthon_official_labor_views.xml', - 'views/yuthon_offficial_party_views.xml', + 'views/yuthon_official_party_views.xml', 'views/yuthon_official_normal_views.xml', + 'views/yuthon_official_incoming_party_views.xml', + 'views/yuthon_official_incoming_labor_views.xml', + 'views/yuthon_official_incoming_normal_views.xml', ], 'installable': True, 'application': True, diff --git a/yuthon_official/models/__init__.py b/yuthon_official/models/__init__.py index 0eefff2ea..4768c74e6 100644 --- a/yuthon_official/models/__init__.py +++ b/yuthon_official/models/__init__.py @@ -4,5 +4,8 @@ from . import yuthon_official from . import official_partner from . import officical_type from . import yuthon_official_labor -from . import yuthon_offficial_party +from . import yuthon_official_party from . import yuthon_official_normal +from . import yuthon_offficial_incoming_party +from . import yuthon_official_incoming_labor +from . import yuthon_official_incoming_normal diff --git a/yuthon_official/models/yuthon_offficial_incoming_party.py b/yuthon_official/models/yuthon_offficial_incoming_party.py new file mode 100644 index 000000000..8c2f646c9 --- /dev/null +++ b/yuthon_official/models/yuthon_offficial_incoming_party.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools +from odoo.exceptions import ValidationError, UserError + + +class YuthonOfficialIncomingParty(models.Model): + _name = 'yuthon.official.incoming.party' + _description = '党总支收文' + _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin'] + _rec_name = 'name' + + name = fields.Char(string="名称") + code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('official_code')) + official_type_id = fields.Many2one('official.type', string="公文种类") + # official_type = fields.Selection([('go', '发文'), ('come', '收文')], string="公文类型") + reference_cold = fields.Integer(string="公文字号") + major_event_category = fields.Integer(string="重大事项所属类别") + official_partner_id = fields.Many2one('official.partner', string="来文单位") + remarks = fields.Char(string="备注事项") + main_text = fields.Html(string='正文') + come_file_id = fields.Char(string="来文编号") + incoming_file_id = fields.Char(string="收文编号") + main_flats = fields.Char(string="主送") + copy_flats = fields.Char(string="抄送") + servings_number = fields.Integer(string="份数") + urgency = fields.Selection([('normal', '一般'), ('urgent', '紧急'), ('extra_urgent', '特急')], string="紧急程度") + secret_level = fields.Selection([('normal', '一般'), ('urgent', '秘密'), ('secret', '机密'), ('so_secret', '绝密')], + string="密级") + date = fields.Datetime(string="日期", default=fields.Datetime.now) + department_id = fields.Many2one('hr.department', string="申请人部门") + statu = fields.Selection([('drft', '草稿'), ('going', '执行中'), ('cancel', '已取消'), ('done', '已完成')], + string="状态", default='drft') + deadline = fields.Date(string="办理期限") + red_suit = fields.Char(string="套红") diff --git a/yuthon_official/models/yuthon_official_incoming_labor.py b/yuthon_official/models/yuthon_official_incoming_labor.py new file mode 100644 index 000000000..246dd3233 --- /dev/null +++ b/yuthon_official/models/yuthon_official_incoming_labor.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools +from odoo.exceptions import ValidationError, UserError + + +class YuthonOfficialIncomingLabor(models.Model): + _name = 'yuthon.official.incoming.labor' + _description = '工会收文' + _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin'] + _rec_name = 'name' + + name = fields.Char(string="名称") + code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('official_code')) + official_type_id = fields.Many2one('official.type', string="公文种类") + # official_type = fields.Selection([('go', '发文'), ('come', '收文')], string="公文类型") + reference_cold = fields.Integer(string="公文字号") + major_event_category = fields.Integer(string="重大事项所属类别") + official_partner_id = fields.Many2one('official.partner', string="来文单位") + remarks = fields.Char(string="备注事项") + main_text = fields.Html(string='正文') + come_file_id = fields.Char(string="来文编号") + incoming_file_id = fields.Char(string="收文编号") + main_flats = fields.Char(string="主送") + copy_flats = fields.Char(string="抄送") + servings_number = fields.Integer(string="份数") + urgency = fields.Selection([('normal', '一般'), ('urgent', '紧急'), ('extra_urgent', '特急')], string="紧急程度") + secret_level = fields.Selection([('normal', '一般'), ('urgent', '秘密'), ('secret', '机密'), ('so_secret', '绝密')], + string="密级") + date = fields.Datetime(string="日期", default=fields.Datetime.now) + department_id = fields.Many2one('hr.department', string="申请人部门") + statu = fields.Selection([('drft', '草稿'), ('going', '执行中'), ('cancel', '已取消'), ('done', '已完成')], + string="状态", default='drft') + deadline = fields.Date(string="办理期限") + red_suit = fields.Char(string="套红") diff --git a/yuthon_official/models/yuthon_official_incoming_normal.py b/yuthon_official/models/yuthon_official_incoming_normal.py new file mode 100644 index 000000000..963a81dbf --- /dev/null +++ b/yuthon_official/models/yuthon_official_incoming_normal.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools +from odoo.exceptions import ValidationError, UserError + + +class YuthonOfficialIncomingNormal(models.Model): + _name = 'yuthon.official.incoming.normal' + _description = '行政收文' + _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin'] + _rec_name = 'name' + + name = fields.Char(string="名称") + code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('official_code')) + official_type_id = fields.Many2one('official.type', string="公文种类") + # official_type = fields.Selection([('go', '发文'), ('come', '收文')], string="公文类型") + reference_cold = fields.Integer(string="公文字号") + major_event_category = fields.Integer(string="重大事项所属类别") + official_partner_id = fields.Many2one('official.partner', string="来文单位") + remarks = fields.Char(string="备注事项") + main_text = fields.Html(string='正文') + come_file_id = fields.Char(string="来文编号") + incoming_file_id = fields.Char(string="收文编号") + main_flats = fields.Char(string="主送") + copy_flats = fields.Char(string="抄送") + servings_number = fields.Integer(string="份数") + urgency = fields.Selection([('normal', '一般'), ('urgent', '紧急'), ('extra_urgent', '特急')], string="紧急程度") + secret_level = fields.Selection([('normal', '一般'), ('urgent', '秘密'), ('secret', '机密'), ('so_secret', '绝密')], + string="密级") + date = fields.Datetime(string="日期", default=fields.Datetime.now) + department_id = fields.Many2one('hr.department', string="申请人部门") + statu = fields.Selection([('drft', '草稿'), ('going', '执行中'), ('cancel', '已取消'), ('done', '已完成')], + string="状态", default='drft') + deadline = fields.Date(string="办理期限") + red_suit = fields.Char(string="套红") diff --git a/yuthon_official/models/yuthon_official_labor.py b/yuthon_official/models/yuthon_official_labor.py index b951a5468..47405976c 100644 --- a/yuthon_official/models/yuthon_official_labor.py +++ b/yuthon_official/models/yuthon_official_labor.py @@ -12,7 +12,7 @@ class YuthonOfficialLabor(models.Model): name = fields.Char(string="名称") code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('official_code')) official_type_id = fields.Many2one('official.type', string="公文种类") - official_type = fields.Selection([('go', '发文'), ('come', '收文')], string="公文类型") + # official_type = fields.Selection([('go', '发文'), ('come', '收文')], string="公文类型") reference_cold = fields.Integer(string="公文字号") major_event_category = fields.Integer(string="重大事项所属类别") # official_partner_id = fields.Many2one('official.partner', string="来文单位") diff --git a/yuthon_official/models/yuthon_official_normal.py b/yuthon_official/models/yuthon_official_normal.py index a9beb7e6b..9b93e02d6 100644 --- a/yuthon_official/models/yuthon_official_normal.py +++ b/yuthon_official/models/yuthon_official_normal.py @@ -12,7 +12,7 @@ class YuthonOfficialNormal(models.Model): name = fields.Char(string="名称") code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('official_code')) official_type_id = fields.Many2one('official.type', string="公文种类") - official_type = fields.Selection([('go', '发文'), ('come', '收文')], string="公文类型") + # official_type = fields.Selection([('go', '发文'), ('come', '收文')], string="公文类型") reference_cold = fields.Integer(string="公文字号") major_event_category = fields.Integer(string="重大事项所属类别") remarks = fields.Char(string="备注事项") diff --git a/yuthon_official/models/yuthon_offficial_party.py b/yuthon_official/models/yuthon_official_party.py similarity index 94% rename from yuthon_official/models/yuthon_offficial_party.py rename to yuthon_official/models/yuthon_official_party.py index f6cef357d..403e46d7a 100644 --- a/yuthon_official/models/yuthon_offficial_party.py +++ b/yuthon_official/models/yuthon_official_party.py @@ -12,7 +12,7 @@ class YuthonOfficialParty(models.Model): name = fields.Char(string="名称") code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('official_code')) official_type_id = fields.Many2one('official.type', string="公文种类") - official_type = fields.Selection([('go', '发文'), ('come', '收文')], string="公文类型") + # official_type = fields.Selection([('go', '发文'), ('come', '收文')], string="公文类型") reference_cold = fields.Integer(string="公文字号") major_event_category = fields.Integer(string="重大事项所属类别") # official_partner_id = fields.Many2one('official.partner', string="来文单位") diff --git a/yuthon_official/security/ir.model.access.csv b/yuthon_official/security/ir.model.access.csv index 62c0a2b0d..bb97c21d3 100644 --- a/yuthon_official/security/ir.model.access.csv +++ b/yuthon_official/security/ir.model.access.csv @@ -3,5 +3,8 @@ access_yuthon_official,yuthon_official,model_yuthon_official,base.group_user,1,1 access_official_partner,official_partner,model_official_partner,base.group_user,1,1,1,1 access_official_type,official_type,model_official_type,base.group_user,1,1,1,1 access_yuthon_official_labor,yuthon_official_labor,model_yuthon_official_labor,base.group_user,1,1,1,1 -access_yuthon_offficial_party,yuthon_offficial_party,model_yuthon_official_party,base.group_user,1,1,1,1 -access_yuthon_official_normal,yuthon_official_normal,model_yuthon_official_normal,base.group_user,1,1,1,1 \ No newline at end of file +access_yuthon_official_party,yuthon_official_party,model_yuthon_official_party,base.group_user,1,1,1,1 +access_yuthon_official_normal,yuthon_official_normal,model_yuthon_official_normal,base.group_user,1,1,1,1 +access_yuthon_official_incoming_party,yuthon_official_incoming_party,model_yuthon_official_incoming_party,base.group_user,1,1,1,1 +access_yuthon_official_incoming_labor,yuthon_official_incoming_labor,model_yuthon_official_incoming_labor,base.group_user,1,1,1,1 +access_yuthon_official_incoming_normal,yuthon_official_incoming_normal,model_yuthon_official_incoming_normal,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/yuthon_official/views/yuthon_official_incoming_labor_views.xml b/yuthon_official/views/yuthon_official_incoming_labor_views.xml new file mode 100644 index 000000000..c66790b0f --- /dev/null +++ b/yuthon_official/views/yuthon_official_incoming_labor_views.xml @@ -0,0 +1,91 @@ + + + + yuthon.official.incoming.labor.tree + yuthon.official.incoming.labor + + + + + + + + + + + + yuthon.official.incoming.labor.form + yuthon.official.incoming.labor + +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+ + + + + + yuthon.official.incoming.labor.search + yuthon.official.incoming.labor + + + + + + + + + + + + 工会收文 + yuthon.official.incoming.labor + tree,form + + + + + + \ No newline at end of file diff --git a/yuthon_official/views/yuthon_official_incoming_normal_views.xml b/yuthon_official/views/yuthon_official_incoming_normal_views.xml new file mode 100644 index 000000000..2a23b07ae --- /dev/null +++ b/yuthon_official/views/yuthon_official_incoming_normal_views.xml @@ -0,0 +1,91 @@ + + + + yuthon.official.incoming.normal.tree + yuthon.official.incoming.normal + + + + + + + + + + + + yuthon.official.incoming.normal.form + yuthon.official.incoming.normal + +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+ + + + + + yuthon.official.incoming.normal.search + yuthon.official.incoming.normal + + + + + + + + + + + + 行政收文 + yuthon.official.incoming.normal + tree,form + + + + + + \ No newline at end of file diff --git a/yuthon_official/views/yuthon_official_incoming_party_views.xml b/yuthon_official/views/yuthon_official_incoming_party_views.xml new file mode 100644 index 000000000..41b0e8071 --- /dev/null +++ b/yuthon_official/views/yuthon_official_incoming_party_views.xml @@ -0,0 +1,91 @@ + + + + yuthon.official.incoming.party.tree + yuthon.official.incoming.party + + + + + + + + + + + + yuthon.official.incoming.party.form + yuthon.official.incoming.party + +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + +
+ + + + + + yuthon.official.incoming.party.search + yuthon.official.incoming.party + + + + + + + + + + + + 党总支收文 + yuthon.official.incoming.party + tree,form + + + + + + \ No newline at end of file diff --git a/yuthon_official/views/yuthon_official_labor_views.xml b/yuthon_official/views/yuthon_official_labor_views.xml index 2830f058d..a0a19ed51 100644 --- a/yuthon_official/views/yuthon_official_labor_views.xml +++ b/yuthon_official/views/yuthon_official_labor_views.xml @@ -59,9 +59,9 @@ - - send.receive.messages.management.search - yuthon.official + + yuthon.official.labor.search + yuthon.official.labor @@ -80,8 +80,8 @@ diff --git a/yuthon_official/views/yuthon_official_normal_views.xml b/yuthon_official/views/yuthon_official_normal_views.xml index 4b0368e65..8ee1e8f20 100644 --- a/yuthon_official/views/yuthon_official_normal_views.xml +++ b/yuthon_official/views/yuthon_official_normal_views.xml @@ -61,9 +61,9 @@ - - send.receive.messages.management.search - yuthon.official + + yuthon.official.normal.search + yuthon.official.normal @@ -83,7 +83,7 @@ diff --git a/yuthon_official/views/yuthon_offficial_party_views.xml b/yuthon_official/views/yuthon_official_party_views.xml similarity index 84% rename from yuthon_official/views/yuthon_offficial_party_views.xml rename to yuthon_official/views/yuthon_official_party_views.xml index 0c9b5bdd4..dc9739d79 100644 --- a/yuthon_official/views/yuthon_offficial_party_views.xml +++ b/yuthon_official/views/yuthon_official_party_views.xml @@ -1,6 +1,6 @@ - + yuthon.official.party.tree yuthon.official.party @@ -13,7 +13,7 @@ - + yuthon.official.party.form yuthon.official.party @@ -61,9 +61,9 @@ - - send.receive.messages.management.search - yuthon.official + + yuthon.official.party.search + yuthon.official.party @@ -74,7 +74,7 @@ - + 党总支发文 yuthon.official.party tree,form @@ -82,10 +82,10 @@ \ No newline at end of file diff --git a/yuthon_official/views/yuthon_official_views.xml b/yuthon_official/views/yuthon_official_views.xml index caaa92329..9a7e5549f 100644 --- a/yuthon_official/views/yuthon_official_views.xml +++ b/yuthon_official/views/yuthon_official_views.xml @@ -97,4 +97,22 @@ name="公文管理" action="send_receive_messages_management_action" sequence="8"/> + + + \ No newline at end of file