diff --git a/yuthon_issue/models/issue_approval_decision.py b/yuthon_issue/models/issue_approval_decision.py index 5d6654454..24e0085af 100644 --- a/yuthon_issue/models/issue_approval_decision.py +++ b/yuthon_issue/models/issue_approval_decision.py @@ -18,7 +18,7 @@ class IssueApprovalDecision(models.Model): district_government_id = fields.Many2one('issue.library.type', string="区政府",) district_party_id= fields.Many2one('issue.library.type', string="区委组织部") department_id = fields.Many2one('hr.department', string="部门") - management_matters = fields.Char(string='管理事项') + management_matters_id = fields.Many2one('issue.approval.decision.type', string='管理事项') company_id = fields.Many2one('res.company', string="公司", default=lambda self: self._get_default_company()) scope = fields.Selection([('one', '一级区属国有企业'), ('two', '二级区属国有企业'), ('one_two', '一级、二级区属国有企业')], string='适用范围', default='one') start_date = fields.Date(string="生效日期") diff --git a/yuthon_issue/models/issue_library_type.py b/yuthon_issue/models/issue_library_type.py index 4b1fd46c2..beb3b00cf 100644 --- a/yuthon_issue/models/issue_library_type.py +++ b/yuthon_issue/models/issue_library_type.py @@ -8,6 +8,6 @@ class IssueLibraryType(models.Model): _description = '决策类型配置' _rec_name = 'name' - name = fields.Char(string="事项类别") + name = fields.Char(string="决策类别") diff --git a/yuthon_issue/views/issue_approval_decision_views.xml b/yuthon_issue/views/issue_approval_decision_views.xml index e52408b37..90b5b21b6 100644 --- a/yuthon_issue/views/issue_approval_decision_views.xml +++ b/yuthon_issue/views/issue_approval_decision_views.xml @@ -5,11 +5,11 @@ issue.approval.decision - + - + @@ -81,6 +81,7 @@ + @@ -101,6 +102,7 @@ 决策清单 issue.approval.decision tree,form + {'group_decision_type_id': 1, 'group_management_matters_id': 1} 更新公司和适用范围