diff --git a/yuthon_issue/security/ir.model.access.csv b/yuthon_issue/security/ir.model.access.csv index eaa9f7679..3dcbe85e2 100644 --- a/yuthon_issue/security/ir.model.access.csv +++ b/yuthon_issue/security/ir.model.access.csv @@ -1,5 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_issue_library_line,issue_library_line,model_issue_library_line,,1,1,1,1 +access_issue_library_line,issue_library_line,model_issue_library_line,base.group_user,1,1,1,1 access_issue_approval_decision,issue_approval_decision,model_issue_approval_decision,base.group_user,1,1,1,1 access_issue_approval_decision_type,issue_approval_decision_type,model_issue_approval_decision_type,base.group_user,1,1,1,1 access_issue_library_approval_line,issue_library_approval_line,model_issue_library_approval_line,base.group_user,1,1,1,1 diff --git a/yuthon_trade/models/yuthon_care_condolences.py b/yuthon_trade/models/yuthon_care_condolences.py index 93830faf1..29a3b68a1 100644 --- a/yuthon_trade/models/yuthon_care_condolences.py +++ b/yuthon_trade/models/yuthon_care_condolences.py @@ -10,6 +10,7 @@ class YuthonCareCondolences(models.Model): users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id) department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门") care_type_id = fields.Many2one('yuthon.care.setting', string='类型') + documents_id = fields.Many2one(related='care_type_id.documents_id', string='附件') code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('property_care_reward_code_sequence')) date = fields.Date(string='日期') @@ -21,5 +22,12 @@ class YuthonCareCondolences(models.Model): born_date = fields.Date(string="出生时间") discharge_summary_id = fields.Many2one('ir.attachment', string="出院小结") retired_id = fields.Many2one('ir.attachment', string="退休证明") + urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', + default='normal') work_end = fields.Boolean(string="结束") - active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file + active = fields.Boolean('Active', default=True, tracking=True) + + def _get_default_name_title(self): + return self._description if self._description else self._name + + name_title = fields.Char(default=_get_default_name_title) \ No newline at end of file diff --git a/yuthon_trade/models/yuthon_trade_setting.py b/yuthon_trade/models/yuthon_trade_setting.py index 93ca5a66d..91ee3582e 100644 --- a/yuthon_trade/models/yuthon_trade_setting.py +++ b/yuthon_trade/models/yuthon_trade_setting.py @@ -6,6 +6,7 @@ class YuthonCareSetting(models.Model): _description = '关怀类型配置' name = fields.Char(string='名称') + documents_id = fields.Many2one('ir.attachment', string="附件") class YuthonWorkSetting(models.Model): diff --git a/yuthon_trade/models/yuthon_work_condolences.py b/yuthon_trade/models/yuthon_work_condolences.py index acf6a61f8..f0f296413 100644 --- a/yuthon_trade/models/yuthon_work_condolences.py +++ b/yuthon_trade/models/yuthon_work_condolences.py @@ -18,4 +18,10 @@ class YuthonWorkCondolences(models.Model): scheme_id = fields.Many2one('ir.attachment', string="方案") meeting_id = fields.Many2one('ir.attachment', string="会议纪要") work_end = fields.Boolean(string="结束") - active = fields.Boolean('Active', default=True, tracking=True) \ No newline at end of file + urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', + default='normal') + active = fields.Boolean('Active', default=True, tracking=True) + def _get_default_name_title(self): + return self._description if self._description else self._name + + name_title = fields.Char(default=_get_default_name_title) \ No newline at end of file diff --git a/yuthon_trade/views/yuthon_care_condolences_views.xml b/yuthon_trade/views/yuthon_care_condolences_views.xml index d4b6ca211..b7d665aaa 100644 --- a/yuthon_trade/views/yuthon_care_condolences_views.xml +++ b/yuthon_trade/views/yuthon_care_condolences_views.xml @@ -17,9 +17,26 @@
- - + + + + + + + + + + + +
+

+ +

+
@@ -39,6 +56,7 @@ + diff --git a/yuthon_trade/views/yuthon_trade_setting_views.xml b/yuthon_trade/views/yuthon_trade_setting_views.xml index 27710584c..c9b4de3a2 100644 --- a/yuthon_trade/views/yuthon_trade_setting_views.xml +++ b/yuthon_trade/views/yuthon_trade_setting_views.xml @@ -6,6 +6,7 @@ + diff --git a/yuthon_trade/views/yuthon_work_condolences_views.xml b/yuthon_trade/views/yuthon_work_condolences_views.xml index a0f2e95f1..eb58648e6 100644 --- a/yuthon_trade/views/yuthon_work_condolences_views.xml +++ b/yuthon_trade/views/yuthon_work_condolences_views.xml @@ -17,8 +17,20 @@ - - + + + + + + + + + + +