diff --git a/tianhe_approvals/data/approval_category_type_data.xml b/tianhe_approvals/data/approval_category_type_data.xml
index adf89afab..bf09500a5 100644
--- a/tianhe_approvals/data/approval_category_type_data.xml
+++ b/tianhe_approvals/data/approval_category_type_data.xml
@@ -4,90 +4,88 @@
采购办公用品
- purchase_work
+ purchase_work
党总支发文
- general_party_branch_post
+ general_party_branch_post
建设工程业务呈批表
- construction_business
- 1
+ construction_business
董事会议题申报表
- tianhe_dsh_issues_declarations
+ tianhe_dsh_issues_declarations
经营班子申报表
- management_declare
+ management_declare
1
公文发文(子企业)
- official_issues_for_son
- 1
+ official_issues_for_son
公文发文
- official_issues
+ official_issues
科创中小企业服务中心业务呈批表
- business_statement
+ business_statement
公文收文
- official_receipt
+ official_receipt
流程变更申请
- process_change
+ process_change
会议文档
- meeting_file
+ meeting_file
诉讼事项录入表
- contentious_matter
+ contentious_matter
投融资发文
- financing_post
+ financing_post
业务呈批表
- business
+ business
文件处理表
- document_processing
+ document_processing
物业部业务呈批表
- property_submission
+ property_submission
天河投资租赁合同收款单
- rental_receipt
+ rental_receipt
diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py
index c1ea19290..c356b5b8a 100644
--- a/tianhe_approvals/models/inherit_approval_category.py
+++ b/tianhe_approvals/models/inherit_approval_category.py
@@ -6,7 +6,7 @@ class ApprovalCategory(models.Model):
_inherit = 'approval.category'
_description = 'tian he 审批框架拓展'
- approval_category_type = fields.Selection([
+ approval_type = fields.Selection(selection_add=[
('purchase_work', '采购审批单'),
('construction_business', '建设工程业务呈批表'),
('management_declare', '经营班子申报表'),
@@ -29,4 +29,4 @@ class ApprovalCategory(models.Model):
('document_processing', '文件处理表'),
('property_submission', '物业部业务呈批表'),
('rental_receipt', '租赁合同收款单'),
- ], string="审批类别")
+ ])
diff --git a/yuthon_approval/models/inherit_approval_category.py b/yuthon_approval/models/inherit_approval_category.py
index a4be81c10..790da623c 100644
--- a/yuthon_approval/models/inherit_approval_category.py
+++ b/yuthon_approval/models/inherit_approval_category.py
@@ -8,9 +8,6 @@ class ApprovalCategory(models.Model):
approval_department_ids = fields.Many2many('hr.department', string="审批所属部门")
approval_process_id = fields.Many2one('approval.process', string="审批流程")
- approval_category_type = fields.Selection([
- ('demo', 'demo测试')
- ], string="审批类别", help="后台计算")
is_enable = fields.Boolean(string="启用", default=True)
category_start_date = fields.Date(string="开始日期", default=fields.Date.today())
category_end_date = fields.Date(string="结束日期")
diff --git a/yuthon_approval/models/inherit_approval_request.py b/yuthon_approval/models/inherit_approval_request.py
index 029b8d757..d6be34ef1 100644
--- a/yuthon_approval/models/inherit_approval_request.py
+++ b/yuthon_approval/models/inherit_approval_request.py
@@ -6,7 +6,7 @@ from odoo.exceptions import ValidationError
class ApprovalRequest(models.Model):
_inherit = "approval.request"
- approval_category_name = fields.Selection(string="类别名称", related='category_id.approval_category_type')
+ approval_category_name = fields.Selection(string="类别名称", related='category_id.approval_type')
def print_approval_report(self):
return self.env.ref('yuthon_approval.all_demo_report_actions').report_action(self)
diff --git a/yuthon_approval/views/inherit_approval_category_views.xml b/yuthon_approval/views/inherit_approval_category_views.xml
index 10664cf01..f21361a71 100644
--- a/yuthon_approval/views/inherit_approval_category_views.xml
+++ b/yuthon_approval/views/inherit_approval_category_views.xml
@@ -20,7 +20,6 @@
-