From 4b073c2fca5ab3732920a70ba9d82530b0c64fa2 Mon Sep 17 00:00:00 2001 From: ONION <2275333053@qq.com> Date: Tue, 4 Jun 2024 15:06:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E7=AB=8B=E9=A1=B9,=E7=AD=89?= =?UTF-8?q?=E4=B8=89=E4=B8=AA=E8=A1=A8=EF=BC=8C=E4=B8=80=E4=B8=AApy?= =?UTF-8?q?=E6=B2=A1=E6=96=B0=E5=AD=97=E6=AE=B5=E6=B2=A1=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tianhe_approvals/__manifest__.py | 4 +++ .../data/approval_category_type_data.xml | 36 +++++++++++++++++++ tianhe_approvals/models/__init__.py | 7 ++++ .../models/inherit_approval_category.py | 4 +++ .../models/inherit_approval_request.py | 9 +++++ .../models/tianhe_engineering_approval.py | 11 ++++++ .../models/tianhe_meeting_minutes_approval.py | 15 ++++++++ .../models/tianhe_shift_registration_form.py | 12 +++++++ .../views/tianhe_engineering_approval.xml | 29 +++++++++++++++ .../views/tianhe_meeting_minutes_approval.xml | 21 +++++++++++ .../tianhe_party_branch_committee_post.xml | 23 ++++++++++++ .../views/tianhe_shift_registration_form.xml | 20 +++++++++++ 12 files changed, 191 insertions(+) create mode 100644 tianhe_approvals/models/tianhe_engineering_approval.py create mode 100644 tianhe_approvals/models/tianhe_meeting_minutes_approval.py create mode 100644 tianhe_approvals/models/tianhe_shift_registration_form.py create mode 100644 tianhe_approvals/views/tianhe_engineering_approval.xml create mode 100644 tianhe_approvals/views/tianhe_meeting_minutes_approval.xml create mode 100644 tianhe_approvals/views/tianhe_party_branch_committee_post.xml create mode 100644 tianhe_approvals/views/tianhe_shift_registration_form.xml diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py index 44c256984..22b124efe 100644 --- a/tianhe_approvals/__manifest__.py +++ b/tianhe_approvals/__manifest__.py @@ -37,6 +37,10 @@ 'views/tianhe_tryout_official_approval.xml', 'views/tianhe_exercitation_tryout_approval.xml', 'views/generic_forms_reassignment.xml', + 'views/tianhe_meeting_minutes_approval.xml', + 'views/tianhe_party_branch_committee_post.xml', + 'views/tianhe_shift_registration_form.xml', + 'views/tianhe_engineering_approval.xml', ], 'application': True, 'installable': True, diff --git a/tianhe_approvals/data/approval_category_type_data.xml b/tianhe_approvals/data/approval_category_type_data.xml index 6d0bcb81f..f19deb13b 100644 --- a/tianhe_approvals/data/approval_category_type_data.xml +++ b/tianhe_approvals/data/approval_category_type_data.xml @@ -132,5 +132,41 @@ 调岗 generic_forms_reassignment + + + + 离职表 + dimission + + + + 试用期转正式员工 + tryout_official + + + + 实习期转试用期 + exercitation_tryout + + + + 党支委发文 + party_branch_committee_post + + + + 调班登记表 + shift_registration_form + + + + 会议纪要 + meeting_minutes + + + + 工程立项 + engineering + diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py index d467dc1ba..2fdf10336 100644 --- a/tianhe_approvals/models/__init__.py +++ b/tianhe_approvals/models/__init__.py @@ -10,6 +10,12 @@ from . import tianhe_document_processing_approval from . import tianhe_property_submission_approval from . import tianhe_rental_receipt_approval from . import generic_forms_replacement_card +from . import tianhe_dimission_approval +from . import tianhe_tryout_official_approval +from . import tianhe_exercitation_tryout_approval +from . import tianhe_shift_registration_form +from . import tianhe_meeting_minutes_approval +from . import generic_forms_replacement_card from . import generic_forms_overtime from . import generic_forms_outing from . import generic_forms_remove_holiday @@ -17,3 +23,4 @@ from . import tianhe_dimission_approval from . import tianhe_tryout_official_approval from . import tianhe_exercitation_tryout_approval from . import generic_forms_reassignment +from . import tianhe_engineering_approval diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py index 7afd27e7a..67a21bc84 100644 --- a/tianhe_approvals/models/inherit_approval_category.py +++ b/tianhe_approvals/models/inherit_approval_category.py @@ -33,4 +33,8 @@ class ApprovalCategory(models.Model): ('tryout_official', '试用期转正式员工'), ('exercitation_tryout', '实习期转试用期'), ('generic_forms_reassignment', '公司通用表单——调岗'), + ('party_branch_committee_post', '党支委发文'), + ('shift_registration_form', '调班登记表'), + ('meeting_minutes', '会议纪要'), + ('engineering', '工程立项'), ]) diff --git a/tianhe_approvals/models/inherit_approval_request.py b/tianhe_approvals/models/inherit_approval_request.py index a5bb5c948..f6fa58929 100644 --- a/tianhe_approvals/models/inherit_approval_request.py +++ b/tianhe_approvals/models/inherit_approval_request.py @@ -52,5 +52,14 @@ class ApprovalRequestLine(models.Model): _description = '明细行' approval_request_id = fields.Many2one('approval.request') + + # 董事会议题申报表 topic = fields.Char(string='议题') + # 工程立项 + property_name = fields.Char(string='物业名称') + area = fields.Char(string='面积') + property_id = fields.Char(string='物业ID') + project_flow = fields.Char(string='项目流水号') + + diff --git a/tianhe_approvals/models/tianhe_engineering_approval.py b/tianhe_approvals/models/tianhe_engineering_approval.py new file mode 100644 index 000000000..283a9a5ad --- /dev/null +++ b/tianhe_approvals/models/tianhe_engineering_approval.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools, _ +from odoo.exceptions import ValidationError + + +class TianHeEngineeringApproval(models.Model): + _inherit = "approval.request" + _description = '工程立项' + + engineering_type = fields.Char(string="工程类型") + engineering_place = fields.Char(string="项目地址") diff --git a/tianhe_approvals/models/tianhe_meeting_minutes_approval.py b/tianhe_approvals/models/tianhe_meeting_minutes_approval.py new file mode 100644 index 000000000..a1407ea66 --- /dev/null +++ b/tianhe_approvals/models/tianhe_meeting_minutes_approval.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools, _ +from odoo.exceptions import ValidationError + + +class TianHeMeetingMinutesApproval(models.Model): + _inherit = "approval.request" + _description = '会议纪要' + + # 不会写 + attend_users = fields.Char(string="出席人员") + attend_persons = fields.Char(string="列席人员") + compere = fields.Char(string="主持人") + meeting_place = fields.Char(string="会议地点") + meeting_subject = fields.Char(string="会议主题") diff --git a/tianhe_approvals/models/tianhe_shift_registration_form.py b/tianhe_approvals/models/tianhe_shift_registration_form.py new file mode 100644 index 000000000..f4ef43beb --- /dev/null +++ b/tianhe_approvals/models/tianhe_shift_registration_form.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools, _ +from odoo.exceptions import ValidationError + + +class TianHeShiftRegistrationFormApproval(models.Model): + _inherit = "approval.request" + _description = '调班登记表' + + transferees = fields.Many2one('res.users', string="调班人") + accept_transferred = fields.Many2one('res.users', string="被调班人") + time_transferred = fields.Datetime(string="调班时间") diff --git a/tianhe_approvals/views/tianhe_engineering_approval.xml b/tianhe_approvals/views/tianhe_engineering_approval.xml new file mode 100644 index 000000000..dece53701 --- /dev/null +++ b/tianhe_approvals/views/tianhe_engineering_approval.xml @@ -0,0 +1,29 @@ + + + + approvals.category.type.code.engineering.approval + approval.request + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_meeting_minutes_approval.xml b/tianhe_approvals/views/tianhe_meeting_minutes_approval.xml new file mode 100644 index 000000000..853e199f9 --- /dev/null +++ b/tianhe_approvals/views/tianhe_meeting_minutes_approval.xml @@ -0,0 +1,21 @@ + + + + approvals.category.type.code.meeting.minutes.approval + approval.request + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_party_branch_committee_post.xml b/tianhe_approvals/views/tianhe_party_branch_committee_post.xml new file mode 100644 index 000000000..11ad516e0 --- /dev/null +++ b/tianhe_approvals/views/tianhe_party_branch_committee_post.xml @@ -0,0 +1,23 @@ + + + + approvals.category.type.code.party.branch.committee.post.approval + approval.request + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_shift_registration_form.xml b/tianhe_approvals/views/tianhe_shift_registration_form.xml new file mode 100644 index 000000000..46294594f --- /dev/null +++ b/tianhe_approvals/views/tianhe_shift_registration_form.xml @@ -0,0 +1,20 @@ + + + + approvals.category.type.code.shift.registration.form.approval + approval.request + + + + + + + + + + + + + + + \ No newline at end of file