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

!8777 !8776 添加功能

Browse Source 
Merge pull request !8777 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-02-07 12:56:13 +00:00
committed by Gitee
parent 01cdde4645 b482779d32
commit 7fc1e799cd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/models/yuthon_vacation_reports.py
+4 -3
View File
@@ -1649,9 +1649,9 @@ class VacationOverline(models.Model):
is_initial_number = fields.Boolean(string="初始额度")
overtime_name = fields.Char(string="标题", compute="_compute_overtime", store=True)
reason_application = fields.Text(string="事由", compute="_compute_overtime", default=None, store=True)
meal = fields.Selection([('yes', '是'), ('no', '否')], string="误餐费", compute="_compute_overtime", default=None, store=True)
workflow_id = fields.Many2one(relate = 'workflow_record_id.workflow_id', string = '审批类型', store=True)
reason_application = fields.Text(string="事由", compute="_compute_overtime", store=True)
meal = fields.Selection([('yes', '是'), ('no', '否')], string="误餐费", compute="_compute_overtime", store=True)
workflow_id = fields.Many2one('soong.workflow', compute="_compute_overtime", string='审批类型', store=True)
start_time = fields.Datetime(string="开始时间", compute="_compute_overtime", store=True)
end_time = fields.Datetime(string="结束时间", compute="_compute_overtime", store=True)
carry_forward_date = fields.Date(string="结转日期")
@@ -1795,6 +1795,7 @@ class VacationOverline(models.Model):
rec.start_time = overtime_id.start_time or ''
rec.end_time = overtime_id.end_time or ''
rec.duration = overtime_id.duration or 0
rec.workflow_id = rec.workflow_record_id.workflow_id.id or False
def action_void(self):
self.is_void = True
yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+3 -3
View File
@@ -633,9 +633,9 @@
<field name="arch" type="xml">
<tree string="加班明细" editable="bottom">
<field name="overtime_name"/>
<field name="meal" invisible="1"/>
<field name="reason_application" invisible="1"/>
<!-- <field name="workflow_id"/>-->
<field name="meal" column_invisible="1"/>
<field name="reason_application" column_invisible="1"/>
<field name="workflow_id" column_invisible="1"/>
<field name="employee_id"/>
<field name="department_id"/>
<field name="start_time"/>