diff --git a/yuthon_maintain/views/property_device_repair_views.xml b/yuthon_maintain/views/property_device_repair_views.xml index 72c1179e8..986d55751 100644 --- a/yuthon_maintain/views/property_device_repair_views.xml +++ b/yuthon_maintain/views/property_device_repair_views.xml @@ -48,7 +48,7 @@ - + diff --git a/yuthon_maintain/views/property_report_repair.xml b/yuthon_maintain/views/property_report_repair.xml index d8034e1fc..f2b66d09a 100644 --- a/yuthon_maintain/views/property_report_repair.xml +++ b/yuthon_maintain/views/property_report_repair.xml @@ -47,6 +47,7 @@ + diff --git a/yuthon_trade/models/yuthon_business_approval.py b/yuthon_trade/models/yuthon_business_approval.py index cf06d5a76..3d3a945d9 100644 --- a/yuthon_trade/models/yuthon_business_approval.py +++ b/yuthon_trade/models/yuthon_business_approval.py @@ -19,6 +19,7 @@ class YuthonBusinessApproval(models.Model): is_issues = fields.Boolean(string='是否上会') issues_result = fields.Html(string="会议结果") related_issues_id = fields.Many2one('issue.library', string="关联议题") + information_categories_ids = fields.Many2many('yuthon.information.categories', string='信息分类') reason = fields.Text(string="正文") document_ids = fields.Many2many('ir.attachment', string="附件") active = fields.Boolean('Active', default=True, tracking=True) diff --git a/yuthon_trade/models/yuthon_trade_setting.py b/yuthon_trade/models/yuthon_trade_setting.py index ffdaccc37..4955bb556 100644 --- a/yuthon_trade/models/yuthon_trade_setting.py +++ b/yuthon_trade/models/yuthon_trade_setting.py @@ -8,6 +8,12 @@ class YuthonCareSetting(models.Model): name = fields.Char(string='名称') documents_ids = fields.Many2many('ir.attachment', string="附件") +class YuthonInformationCategories(models.Model): + _name = 'yuthon.information.categories' + _description = '信息分类' + + name = fields.Char(string='名称') + class YuthonWorkSetting(models.Model): _name = 'yuthon.work.setting' diff --git a/yuthon_trade/security/ir.model.access.csv b/yuthon_trade/security/ir.model.access.csv index 85114e8ec..73e0ef97e 100644 --- a/yuthon_trade/security/ir.model.access.csv +++ b/yuthon_trade/security/ir.model.access.csv @@ -38,5 +38,6 @@ access_project_classify_setting,project_classify_setting,model_project_classify_ access_yuthon_social_transfer,yuthon_social_transfer,model_yuthon_social_transfer,base.group_user,1,1,1,1 access_yuthon_contract_addition,yuthon_contract_addition,model_yuthon_contract_addition,base.group_user,1,1,1,1 +access_yuthon_information_categories,yuthon_information_categories,model_yuthon_information_categories,base.group_user,1,1,1,1 diff --git a/yuthon_trade/views/yuthon_business_approval_viwes.xml b/yuthon_trade/views/yuthon_business_approval_viwes.xml index 5a3c784a8..08c8aa92f 100644 --- a/yuthon_trade/views/yuthon_business_approval_viwes.xml +++ b/yuthon_trade/views/yuthon_business_approval_viwes.xml @@ -44,6 +44,7 @@ + diff --git a/yuthon_trade/views/yuthon_task_setting_views.xml b/yuthon_trade/views/yuthon_task_setting_views.xml index 1ac0e580f..d06a102f1 100644 --- a/yuthon_trade/views/yuthon_task_setting_views.xml +++ b/yuthon_trade/views/yuthon_task_setting_views.xml @@ -34,4 +34,13 @@ yuthon.stack.position tree + + yuthon.information.categories.tree + yuthon.information.categories + + + + + + \ No newline at end of file