pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!10634 !10633 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyuse…

Browse Source 
Merge pull request !10634 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-04-08 07:07:45 +00:00
committed by Gitee
parent 2d15300657 47177f7066
commit 2cf7df5707
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/go_approval.py
+8 -2
View File
@@ -39,13 +39,19 @@ class GoApprovals(models.Model):
work_end = fields.Boolean(string="结束")
is_day = fields.Boolean(string="按天")
is_hour = fields.Boolean(string="按小时")
start_day_selection = fields.Selection([('half', '上半天'),('afternoon', '下半天')], string="天", required=True)
end_day_selection = fields.Selection([('half', '上半天'), ('afternoon', '下半天')], string="天", required=True)
start_day_selection = fields.Selection([('half', '上半天'),('afternoon', '下半天')], string="天")
end_day_selection = fields.Selection([('half', '上半天'), ('afternoon', '下半天')], string="天")
start_date = fields.Date(string="开始日期", default=fields.Date.today)
end_date = fields.Date(string="结束日期", default=fields.Date.today)
is_this_department = fields.Boolean(string='是否是本部门', default=True)
department_ids = fields.Many2many('hr.department', string="多部门")
@api.constrains('is_day', 'start_day_selection', 'end_day_selection')
def _check_selection(self):
for rec in self:
if rec.is_day and (not rec.start_day_selection or not rec.end_day_selection):
raise UserError("勾选按天后，必须选择开始时段和结束时段！")
def _get_default_name_title(self):
return self._description if self._description else self._name
yuthon_hr_attendance/views/go_approval.xml
+3 -2
View File
@@ -68,8 +68,9 @@
<field name="end_date" invisible="not is_day"/>
</group>
<group>
<field name="start_day_selection" invisible="not is_day" string=" "/>
<field name="end_day_selection" invisible="not is_day" string=" "/>
<field name="is_day" />
<field name="start_day_selection" required="is_day" />
<field name="end_day_selection" required="is_day" />
</group>
<group/>
</group>