From a7ec0083db0f6ace0efbc1d1126c728e6c175e78 Mon Sep 17 00:00:00 2001
From: ONIONZHAOXI <2275333053@qq.com>
Date: Wed, 10 Jul 2024 17:57:39 +0800
Subject: [PATCH] =?UTF-8?q?7=E6=9C=8810=E6=97=A5=EF=BC=8C=E5=AF=B9?=
=?UTF-8?q?=E8=AF=B7=E5=81=87=E8=A1=A8=E5=8D=95=E8=BF=9B=E8=A1=8C=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E5=92=8C=E8=B0=83=E6=95=B4=EF=BC=8C=E5=9C=A8=E5=85=AC?=
=?UTF-8?q?=E5=85=B1=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8?=
=?UTF-8?q?=E5=92=8C=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E4=B8=A4=E4=B8=AA?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../models/inherit_approval_category.py | 3 +-
.../models/inherit_approval_request.py | 4 +--
.../wuguan_leave_registration_approval.py | 30 +++++++++----------
.../wuguan_leave_registration_approval.xml | 11 ++++---
4 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/tianhe_approvals/models/inherit_approval_category.py b/tianhe_approvals/models/inherit_approval_category.py
index c7f91527b..67db8e29b 100644
--- a/tianhe_approvals/models/inherit_approval_category.py
+++ b/tianhe_approvals/models/inherit_approval_category.py
@@ -27,7 +27,6 @@ class ApprovalCategory(models.Model):
('card_approval', '补卡审批'),
('overtime_approval', '加班审批'),
('go_approval', '外出审批'),
- ('holiday_approval', '请假审批'),
('duty_approval', '值班审批'),
('leave_approval', '调休审批'),
('remove_holiday_approval', '销假审批'),
@@ -39,7 +38,7 @@ class ApprovalCategory(models.Model):
('meeting_minutes', '会议纪要'),
('engineering', '工程立项'),
('property_right_alter', '产权变更表申请表'),
- ('leave_registration', '请假登记单'),
+ ('leave_registration', '请假'),
('tianhe_property_management_reporting', '物业经营报表管理'),
('tianhe_fire_safety_management', '消防安全管理'),
('tianhe_information_ublish_approval_form', '信息发布呈批表'),
diff --git a/tianhe_approvals/models/inherit_approval_request.py b/tianhe_approvals/models/inherit_approval_request.py
index a89d7aacd..6924ef968 100644
--- a/tianhe_approvals/models/inherit_approval_request.py
+++ b/tianhe_approvals/models/inherit_approval_request.py
@@ -52,8 +52,8 @@ class ApprovalRequest(models.Model):
('financial_chapter', '财务章'),
('other_chapter', '其他'),
], string="用章类别")
- department_id = fields.Many2one('hr.department', string="部门")
-
+ creation_time = fields.Datetime(string='创建时间', default=lambda self: fields.Datetime.now())
+ department_id = fields.Many2one('hr.department', related="request_owner_id.employee_id.department_id", string="部门")
class ApprovalRequestLine(models.Model):
_name = 'approval.request.line'
diff --git a/tianhe_approvals/models/wuguan_leave_registration_approval.py b/tianhe_approvals/models/wuguan_leave_registration_approval.py
index 01bb68a6b..a462417f9 100644
--- a/tianhe_approvals/models/wuguan_leave_registration_approval.py
+++ b/tianhe_approvals/models/wuguan_leave_registration_approval.py
@@ -5,20 +5,20 @@ from odoo.exceptions import ValidationError
class WuguanLeaveRegistrationApproval(models.Model):
_inherit = "approval.request"
- _description = '请假登记单'
+ _description = '请假'
- leave_category = fields.Selection([('annual leave', '年假'),
- ('leave in lieu', '调休假'),
- ('leave', '事假'),
- ('sick leave', '病假'),
- ('funeral leave', '丧假'),
- ('marital leave', '婚假'),
- ('maternity leave', '产假'),
- ('paternity leave', '陪产假'),
- ('nursing leave', '看护假'),
- ('parental leave', '育儿假'),
- ('nursing leave', '护理假'),
- ('family planning leave', '计生假'),
- ], string="请假类别")
- flow_mark = fields.Char(string="流程号")
+ leave_category = fields.Many2many('holiday.setting', string="请假类别")
leave_time = fields.Char(string="请假时间")
+ leave_days = fields.Float(string='请假天数', compute='_compute_leave_days', store=True)
+
+
+ @api.depends('date_start', 'date_end')
+ def _compute_leave_days(self):
+ for record in self:
+ if record.date_start and record.date_end:
+ start_date = fields.Datetime.from_string(record.date_start)
+ end_date = fields.Datetime.from_string(record.date_end)
+ duration = end_date - start_date
+ record.leave_days = duration.days
+ else:
+ record.leave_days = 0
diff --git a/tianhe_approvals/views/wuguan_leave_registration_approval.xml b/tianhe_approvals/views/wuguan_leave_registration_approval.xml
index 1f99f809b..eb35febdd 100644
--- a/tianhe_approvals/views/wuguan_leave_registration_approval.xml
+++ b/tianhe_approvals/views/wuguan_leave_registration_approval.xml
@@ -6,13 +6,16 @@
-
-
+
+
+
+
+
-
-
+
+