diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py index be2058db2..e78fcba2e 100644 --- a/tianhe_approvals/__manifest__.py +++ b/tianhe_approvals/__manifest__.py @@ -13,6 +13,12 @@ 'security/ir.model.access.csv', 'data/approval_category_type_data.xml', 'views/tianhe_purchase_work_approval.xml', + 'views/tianhe_process_change_approval.xml', + 'views/tianhe_construction_business_approval.xml', + 'views/tianhe_management_declare_approval.xml', + 'views/tianhe_business_statement_approval.xml', + 'views/tianhe_contentious_matter_approval.xml', + ], 'application': True, diff --git a/tianhe_approvals/data/approval_category_type_data.xml b/tianhe_approvals/data/approval_category_type_data.xml index 7fce8e0a6..79e6006da 100644 --- a/tianhe_approvals/data/approval_category_type_data.xml +++ b/tianhe_approvals/data/approval_category_type_data.xml @@ -19,5 +19,99 @@ 1 approver + + + + 建设工程业务呈批表 + construction_business + 1 + no + no + no + no + no + no + no + no + no + optional + 1 + approver + + + + + 经营班子申报表 + management_declare + 1 + no + no + no + no + no + no + no + no + no + optional + 1 + approver + + + + 科创中小企业服务中心业务呈批表 + business_statement + 1 + no + no + no + no + no + no + no + no + no + optional + 1 + approver + + + + + 流程变更申请 + process_change + 1 + no + no + no + no + no + no + no + no + no + optional + 1 + approver + + + + + 诉讼事项录入表 + contentious_matter + 1 + no + no + no + no + no + no + no + no + no + optional + 1 + approver + diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py index fb9c266be..9eff8d494 100644 --- a/tianhe_approvals/models/__init__.py +++ b/tianhe_approvals/models/__init__.py @@ -3,3 +3,8 @@ from . import tianhe_purchase_work_approval from . import inherit_approval_category +from . import tianhe_construction_business_approval +from . import tianhe_management_declare_approval +from . import tianhe_business_statement_approval +from . import tianhe_process_change_approval +from . import tianhe_contentious_matter_approval diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py index eb31e5a2b..5abc04da3 100644 --- a/tianhe_approvals/models/inherit_approval_category.py +++ b/tianhe_approvals/models/inherit_approval_category.py @@ -9,4 +9,9 @@ class ApprovalCategory(models.Model): approval_category_type = fields.Selection([ ('demo', 'demo测试'), ('purchase_work', '采购审批单'), + ('construction_business','建设工程业务呈批表'), + ('management_declare','经营班子申报表'), + ('business_statement','科创中小企业服务中心业务呈批表'), + ('process_change','流程变更申请'), + ('contentious_matter','诉讼事项录入表'), ]) \ No newline at end of file diff --git a/tianhe_approvals/models/tianhe_business_statement_approval.py b/tianhe_approvals/models/tianhe_business_statement_approval.py new file mode 100644 index 000000000..6323002fc --- /dev/null +++ b/tianhe_approvals/models/tianhe_business_statement_approval.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools, _ +from odoo.exceptions import ValidationError + + +class TianHeManagementDeclareApproval(models.Model): + _inherit = "approval.request" + _description = '科创中小企业服务中心业务呈批表' + + approval_message = fields.Char(string="呈批信息") + business_type_kc = fields.Selection([ + ('agreement', '协议(合同)'), + ('staff administration', '人事行政'), + ('finance','人事行政'), + ('other','其他'), + ],string="业务类型") + urgency = fields.Selection([ + ('ordinary', '一般'), + ('none', '无'), + ], string="紧急度") + main_body = fields.Char(string="正文") \ No newline at end of file diff --git a/tianhe_approvals/models/tianhe_construction_business_approval.py b/tianhe_approvals/models/tianhe_construction_business_approval.py new file mode 100644 index 000000000..f178ed5a3 --- /dev/null +++ b/tianhe_approvals/models/tianhe_construction_business_approval.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools, _ +from odoo.exceptions import ValidationError + + +class TianHeConstructionBusinessApproval(models.Model): + _inherit = "approval.request" + _description = '天河建设工程业务呈批表' + + approval_message = fields.Char(string="呈批信息") + project_contract_number = fields.Char(string="工程合同编号") + contract_place = fields.Char(string="工程地点") + business_type_jg = fields.Char(string="业务类型") + money = fields.Float(string="金额") + descr = fields.Text(string="备注") \ No newline at end of file diff --git a/tianhe_approvals/models/tianhe_contentious_matter_approval.py b/tianhe_approvals/models/tianhe_contentious_matter_approval.py new file mode 100644 index 000000000..e36753ebb --- /dev/null +++ b/tianhe_approvals/models/tianhe_contentious_matter_approval.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools, _ +from odoo.exceptions import ValidationError + + +class TianHeContentiousMatterApproval(models.Model): + _inherit = "approval.request" + _description = '诉讼事项录入表' + + matters = fields.Char(string="事项") + office_meeting = fields.Char(string="办公例会") + board_meeting = fields.Char(string="懂事会会议") + committee_meeting = fields.Char(string="党支委会议") + bureau_record = fields.Char(string="区财局备案") + remark = fields.Text(string="备注") diff --git a/tianhe_approvals/models/tianhe_management_declare_approval.py b/tianhe_approvals/models/tianhe_management_declare_approval.py new file mode 100644 index 000000000..8a452020e --- /dev/null +++ b/tianhe_approvals/models/tianhe_management_declare_approval.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools, _ +from odoo.exceptions import ValidationError + + +class TianHeManagementDeclareApproval(models.Model): + _inherit = "approval.request" + _description = '经营班子申报表' + + + incoming_dispatches_message = fields.Char(string="收文信息") + topic = fields.Char(string='议题') diff --git a/tianhe_approvals/models/tianhe_process_change_approval.py b/tianhe_approvals/models/tianhe_process_change_approval.py new file mode 100644 index 000000000..a80d98fd9 --- /dev/null +++ b/tianhe_approvals/models/tianhe_process_change_approval.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, tools, _ +from odoo.exceptions import ValidationError + + +class TianHeProcessChangeApproval(models.Model): + _inherit = "approval.request" + _description = '流程变更申请' + + current_account = fields.Integer(string="流水号") + modification_reason = fields.Char(string="修改原因") + has_update_text = fields.Selection([('yes','是'),('no','否')],string="是否更新标题") + has_update_body = fields.Selection([('yes','是'),('no','否')],string="是否更新正文") + new_text = fields.Char(string="新标题") + new_body = fields.Text(string="新正文") \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_business_statement_approval.xml b/tianhe_approvals/views/tianhe_business_statement_approval.xml new file mode 100644 index 000000000..7c6636bc1 --- /dev/null +++ b/tianhe_approvals/views/tianhe_business_statement_approval.xml @@ -0,0 +1,22 @@ + + + + approvals.category.type.code.management.declare.approval + approval.request + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_construction_business_approval.xml b/tianhe_approvals/views/tianhe_construction_business_approval.xml new file mode 100644 index 000000000..d5ab2cd67 --- /dev/null +++ b/tianhe_approvals/views/tianhe_construction_business_approval.xml @@ -0,0 +1,23 @@ + + + + approvals.category.type.code.construction.business.approval + approval.request + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_contentious_matter_approval.xml b/tianhe_approvals/views/tianhe_contentious_matter_approval.xml new file mode 100644 index 000000000..23d369bb3 --- /dev/null +++ b/tianhe_approvals/views/tianhe_contentious_matter_approval.xml @@ -0,0 +1,20 @@ + + + + approvals.category.type.code.construction.business.approval + approval.request + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_management_declare_approval.xml b/tianhe_approvals/views/tianhe_management_declare_approval.xml new file mode 100644 index 000000000..a2b702b5b --- /dev/null +++ b/tianhe_approvals/views/tianhe_management_declare_approval.xml @@ -0,0 +1,16 @@ + + + + approvals.category.type.code.management.declare.approval + approval.request + + + + + + + + + + + \ No newline at end of file diff --git a/tianhe_approvals/views/tianhe_process_change_approval.xml b/tianhe_approvals/views/tianhe_process_change_approval.xml new file mode 100644 index 000000000..3a63592f5 --- /dev/null +++ b/tianhe_approvals/views/tianhe_process_change_approval.xml @@ -0,0 +1,20 @@ + + + + approvals.category.type.code.management.declare.approval + approval.request + + + + + + + + + + + + + + + \ No newline at end of file