From 4bd2087cd6e4e8e81d19762f25bf64a2d782863f Mon Sep 17 00:00:00 2001 From: zhouzhou <123@qq.com> Date: Thu, 26 Sep 2024 09:19:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/yuthon_recruitment_approval_views.xml | 2 +- yuthon_issue/models/issue_approval_decision.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml index b7ebfb2d1..cf67d070e 100644 --- a/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml @@ -31,7 +31,7 @@ - + diff --git a/yuthon_issue/models/issue_approval_decision.py b/yuthon_issue/models/issue_approval_decision.py index 03a5966c1..13bb10bdd 100644 --- a/yuthon_issue/models/issue_approval_decision.py +++ b/yuthon_issue/models/issue_approval_decision.py @@ -14,17 +14,16 @@ class IssueApprovalDecision(models.Model): category_matter = fields.Many2one('issue.approval.decision',string='上级事项') child_ids = fields.One2many('issue.approval.decision', 'category_matter', string='下级事项') specifics = fields.Char(string='具体事项') - council = fields.Selection([('1','审'), ('2','决'), ('3',' ')], string='党总委员会') - team_meet = fields.Selection([('1','审'), ('2','决'), ('3',' ')], string='经营班子会') - board_meet = fields.Selection([('1','审'), ('2','决'), ('3',' '), ('4','授权投决会')], string='董事会') + council = fields.Selection([('1','审'), ('2','决')], string='党总委员会') + team_meet = fields.Selection([('1','审'), ('2','决')], string='经营班子会') + board_meet = fields.Selection([('1','审'), ('2','决'), ('4','授权投决会')], string='董事会') district_bureau = fields.Char(string='区政府、区财政局') remarks = fields.Char(string='备注') - # + @api.onchange('ordinal', 'category_matter') def _onchange_department_code(self): for code in self: - if code.category_matter.ordinal: code.ordinal = code.category_matter.ordinal +'.'+ code.ordinal if code.ordinal else '' else: