!2963 添加功能

Merge pull request !2963 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-05-29 12:25:04 +00:00
committed by Gitee
7 changed files with 53 additions and 7 deletions
+1 -1
View File
@@ -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
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_issue_library_line issue_library_line model_issue_library_line base.group_user 1 1 1 1
3 access_issue_approval_decision issue_approval_decision model_issue_approval_decision base.group_user 1 1 1 1
4 access_issue_approval_decision_type issue_approval_decision_type model_issue_approval_decision_type base.group_user 1 1 1 1
5 access_issue_library_approval_line issue_library_approval_line model_issue_library_approval_line base.group_user 1 1 1 1
@@ -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)
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)
@@ -6,6 +6,7 @@ class YuthonCareSetting(models.Model):
_description = '关怀类型配置'
name = fields.Char(string='名称')
documents_id = fields.Many2one('ir.attachment', string="附件")
class YuthonWorkSetting(models.Model):
@@ -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)
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)
@@ -17,9 +17,26 @@
<field name="arch" type="xml">
<form string="关怀慰问" create="0">
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
<widget name="web_ribbon" title="普件" bg_color="text-bg-success"
invisible="urgency_level != 'normal'"/>
<widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
invisible="urgency_level != 'urgent'"/>
<widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
invisible="urgency_level != 'emergency'"/>
<group col="3">
<group>
<field name="code" string="流水号" readonly="1"/>
</group>
<group>
<field name="urgency_level" readonly="1"/>
</group>
<group/>
</group>
<div class="col-12 text-center">
<h1>
<field name="name_title" readonly="1"/>
</h1>
</div>
<group string="审批事项">
<field name="work_end" invisible="1"/>
<field name="name"/>
@@ -39,6 +56,7 @@
<field name="born_cate_id" widget="preview_many2one"/>
<field name="discharge_summary_id" widget="preview_many2one"/>
<field name="retired_id" widget="preview_many2one"/>
<field name="documents_id" widget="preview_many2one"/>
</group>
<group>
<field name="marriage_date"/>
@@ -6,6 +6,7 @@
<field name="arch" type="xml">
<tree string="关怀类型配置" editable="bottom">
<field name="name"/>
<field name="documents_id" widget="preview_many2one"/>
</tree>
</field>
</record>
@@ -17,8 +17,20 @@
<field name="arch" type="xml">
<form string="节日慰问" create="0">
<sheet>
<group>
<field name="code" readonly="1" string="流水号:"/>
<widget name="web_ribbon" title="普件" bg_color="text-bg-success"
invisible="urgency_level != 'normal'"/>
<widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
invisible="urgency_level != 'urgent'"/>
<widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
invisible="urgency_level != 'emergency'"/>
<group col="3">
<group>
<field name="code" string="流水号" readonly="1"/>
</group>
<group>
<field name="urgency_level" readonly="1"/>
</group>
<group/>
</group>
<group string="审批事项">
<field name="name"/>