From 0cc8558d8cd42ade46a630080544a818d8250194 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Sun, 23 Feb 2025 19:21:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_holiday/models/inherit_hr_leave.py | 7 ++++++ .../models/yuthon_fixes_approval.py | 7 ++++++ yuthon_holiday/views/hr_leave_batch.xml | 21 +++++++++++++++-- .../views/yuthon_fixes_approval_views.xml | 23 ++++++++++++++++--- yuthon_hr_attendance/models/card_approval.py | 7 ++++++ yuthon_hr_attendance/models/duty_approval.py | 7 ++++++ yuthon_hr_attendance/models/go_approval.py | 7 ++++++ yuthon_hr_attendance/models/leave_approval.py | 7 ++++++ .../models/overtime_approval.py | 7 ++++++ .../models/remove_holiday_approval.py | 7 ++++++ .../models/yuthon_abnormal_approval.py | 7 ++++++ .../models/yuthon_adjustments_approval.py | 7 ++++++ .../models/yuthon_customer_approval.py | 7 ++++++ .../models/yuthon_shift_approval.py | 7 ++++++ .../models/yuthon_special_approval.py | 7 ++++++ yuthon_hr_attendance/views/card_approval.xml | 21 +++++++++++++++-- yuthon_hr_attendance/views/duty_approval.xml | 21 +++++++++++++++-- yuthon_hr_attendance/views/go_approval.xml | 21 +++++++++++++++-- yuthon_hr_attendance/views/leave_approval.xml | 23 ++++++++++++++++--- .../views/overtime_approval.xml | 21 +++++++++++++++-- .../views/remove_holiday_approval.xml | 21 +++++++++++++++-- .../views/yuthon_abnormal_approval_views.xml | 21 +++++++++++++++-- .../yuthon_adjustments_approval_views.xml | 21 +++++++++++++++-- .../views/yuthon_customer_approval_views.xml | 21 +++++++++++++++-- .../views/yuthon_shift_approval_views.xml | 21 +++++++++++++++-- .../views/yuthon_special_approval_views.xml | 21 +++++++++++++++-- .../data/process_code_data.xml | 7 ++++++ .../models/yuthon_appointment_approval.py | 5 ++++ .../models/yuthon_interview_approval.py | 6 +++++ .../models/yuthon_leaving_approval.py | 4 ++++ .../models/yuthon_message_login.py | 7 ++++++ .../models/yuthon_onboard_approval.py | 7 ++++++ .../models/yuthon_prepare_approval.py | 7 ++++++ .../models/yuthon_reassignment_approval.py | 9 +++++++- .../models/yuthon_recruitment_approval.py | 7 ++++++ .../models/yuthon_regularization_approval.py | 8 +++++++ .../models/yuthon_retired_approval.py | 7 ++++++ .../models/yuthon_reward_approval.py | 7 ++++++ .../models/yuthon_service_approval.py | 7 ++++++ .../models/yuthon_social_files_approval.py | 11 +++++++++ .../models/yuthon_transfer_approval.py | 7 ++++++ .../yuthon_appointment_approval_views.xml | 21 +++++++++++++++-- .../views/yuthon_interview_approval_views.xml | 21 +++++++++++++++-- .../views/yuthon_leaving_approval_views.xml | 22 ++++++++++++++---- .../views/yuthon_message_login_views.xml | 21 +++++++++++++++-- .../views/yuthon_onboard_approval_views.xml | 21 +++++++++++++++-- .../views/yuthon_prepare_approval_views.xml | 21 +++++++++++++++-- .../yuthon_reassignment_approval_views.xml | 23 ++++++++++++++++--- .../yuthon_recruitment_approval_views.xml | 21 +++++++++++++++-- .../yuthon_regularization_approval_views.xml | 21 +++++++++++++++-- .../views/yuthon_retired_approval_views.xml | 21 +++++++++++++++-- .../views/yuthon_reward_approval_views.xml | 21 +++++++++++++++-- .../views/yuthon_service_approval_views.xml | 21 +++++++++++++++-- .../yuthon_social_files_approval_view.xml | 18 ++++++++++++++- .../views/yuthon_transfer_approval_views.xml | 21 +++++++++++++++-- .../models/property_accounting_approval.py | 7 ++++++ .../models/property_approval.py | 7 ++++++ .../models/property_capacity.py | 7 ++++++ .../models/property_construction_approval.py | 7 ++++++ .../models/property_delegated_agent.py | 7 ++++++ .../models/property_design_approval.py | 7 ++++++ .../models/property_early_quitting.py | 7 ++++++ .../models/property_eligibility.py | 7 ++++++ .../models/property_equity.py | 7 ++++++ .../models/property_evaluate_application.py | 7 ++++++ .../models/property_fitment.py | 9 +++++++- .../models/property_handover.py | 7 ++++++ .../models/property_information.py | 7 ++++++ .../models/property_intention_approval.py | 7 ++++++ .../models/property_lease_contract.py | 7 ++++++ .../models/property_lease_extension.py | 7 ++++++ .../models/property_management.py | 7 ++++++ .../models/property_management_fee.py | 7 ++++++ .../models/property_merge_approval.py | 7 ++++++ .../models/property_offline_registration.py | 7 ++++++ .../models/property_open_rent.py | 7 ++++++ .../models/property_penalty_proportion.py | 9 +++++++- .../models/property_penalty_relief.py | 7 ++++++ .../models/property_project_approval.py | 9 +++++++- .../models/property_project_works.py | 9 +++++++- .../models/property_record.py | 7 ++++++ .../models/property_reimbursement_form.py | 7 ++++++ .../models/property_renamed.py | 9 +++++++- .../models/property_rent_relief.py | 7 ++++++ .../models/property_rental_conditions.py | 7 ++++++ .../models/property_rental_form.py | 7 ++++++ .../models/property_split_approval.py | 7 ++++++ .../models/property_sporadic_works.py | 6 +++++ .../models/property_supervising_approval.py | 6 +++++ .../models/property_transaction_confirmed.py | 7 ++++++ .../models/property_transfer_approval.py | 7 ++++++ .../property_accounting_approval_views.xml | 21 +++++++++++++++-- .../views/property_approval_views.xml | 21 +++++++++++++++-- .../views/property_capacity.xml | 21 +++++++++++++++-- .../property_construction_approval_views.xml | 21 +++++++++++++++-- .../views/property_delegated_agent_views.xml | 21 +++++++++++++++-- .../views/property_design_approval_views.xml | 21 +++++++++++++++-- .../views/property_early_quitting.xml | 21 +++++++++++++++-- .../views/property_eligibility.xml | 21 +++++++++++++++-- .../views/property_handover_views.xml | 21 +++++++++++++++-- .../views/property_intention_views.xml | 21 +++++++++++++++-- .../views/property_lease_extension.xml | 21 +++++++++++++++-- .../views/property_management_fee.xml | 21 +++++++++++++++-- .../views/property_merge_approval_views.xml | 21 +++++++++++++++-- .../views/property_offline_registration.xml | 21 +++++++++++++++-- .../views/property_penalty_proportion.xml | 21 +++++++++++++++-- .../views/property_penalty_relief.xml | 21 +++++++++++++++-- .../views/property_project_approval_views.xml | 21 +++++++++++++++-- .../views/property_project_works_viwes.xml | 21 +++++++++++++++-- .../views/property_record_views.xml | 21 +++++++++++++++-- .../property_reimbursement_form_views.xml | 23 ++++++++++++++++--- .../views/property_rent_relief.xml | 21 +++++++++++++++-- .../views/property_rental_conditions.xml | 21 +++++++++++++++-- .../views/property_rental_form_views.xml | 21 +++++++++++++++-- .../views/property_split_approval_views.xml | 21 +++++++++++++++-- .../views/property_sporadic_works_views.xml | 21 +++++++++++++++-- .../property_supervising_approval_views.xml | 21 +++++++++++++++-- .../views/property_transaction_confirmed.xml | 21 +++++++++++++++-- 118 files changed, 1477 insertions(+), 120 deletions(-) diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 87c4c723b..ab8de5f52 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -141,6 +141,13 @@ class HolidaysRequestBatch(models.Model): is_issues = fields.Boolean(string='是否上会') leave_by_hour = fields.Boolean(string='请假单位(小时)', default=False) leave_by_day = fields.Boolean(string='请假单位(天)', default=True) + urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', + default='normal') + + def _get_default_name_title(self): + return self._description if self._description else self._name + + name_title = fields.Char(default=_get_default_name_title) @api.depends("users_id") def _compute_details(self): diff --git a/yuthon_holiday/models/yuthon_fixes_approval.py b/yuthon_holiday/models/yuthon_fixes_approval.py index 59c2a0ba4..63263ce03 100644 --- a/yuthon_holiday/models/yuthon_fixes_approval.py +++ b/yuthon_holiday/models/yuthon_fixes_approval.py @@ -25,6 +25,13 @@ class YuthonFixesApproval(models.Model): leave_id = fields.Many2one('hr.leave.allocation') active = fields.Boolean('Active', default=True, tracking=True) remarks = fields.Text(string="备注") + urgency_level = fields.Selection([('normal', '普件'), ('urgent', '急件'), ('emergency', '特急件')], string='紧急度', + default='normal') + + def _get_default_name_title(self): + return self._description if self._description else self._name + + name_title = fields.Char(default=_get_default_name_title) def bottom_allocation(self): for record in self: diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml index 9a29678ee..6e0f62d87 100644 --- a/yuthon_holiday/views/hr_leave_batch.xml +++ b/yuthon_holiday/views/hr_leave_batch.xml @@ -19,9 +19,26 @@
- - + + + + + + + + + + + +
+

+ +

+