From 11d87d4ba94e9a94e3bd7b21766c1d225dadd17f Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 12 May 2025 19:31:02 +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_hr_attendance/models/hr_attendance.py   | 18 ++++++++++++++++++
 .../views/hr_attendance_views.xml              |  1 +
 .../views/inherit_hr_job_views.xml             |  6 +++---
 .../views/yuthon_hr_employee_views.xml         | 18 +++++++++++-------
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance.py b/yuthon_hr_attendance/models/hr_attendance.py
index 9516e8d46..45d028808 100644
--- a/yuthon_hr_attendance/models/hr_attendance.py
+++ b/yuthon_hr_attendance/models/hr_attendance.py
@@ -777,6 +777,24 @@ class HrAttendance(models.Model):
                 else:
                     record.shift_name = '行政班次'
 
+    def labor_update(self):
+        start_date = fields.Date.to_date('2025-05-01')
+        end_date = fields.Date.to_date('2025-05-05')
+        # 搜索符合条件的考勤记录
+        attendance_records = self.search([
+            ('current_data', '>=', start_date),
+            ('current_data', '<=', end_date),
+            ('shift_id', '=', False),
+        ])
+        if attendance_records:
+            for record in attendance_records:
+                record.write({
+                'is_no_card': False,
+                'is_early_card': False,
+                'is_late_card': False,
+                'is_abnormal': False,
+            })
+
 class card_remind_form(models.Model):
     _name = 'card.remind.form'
     _description = '测试表单'
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index 20d1b6f54..162dfeb65 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -10,6 +10,7 @@
                 <header>
 <!--                    <button name="compute_company_id" string="公司更新" type="object" class="btn btn-primary"/>-->
 <!--                    <button name="button_all" string="班次更新" type="object" class="btn btn-primary"/>-->
+                        <button name="labor_update" string="考勤更新" type="object" class="btn btn-primary"/>
                 </header>
                 <field name="employee_id" class="list_current_data"/>
                 <field name="current_data" optional="show" class="list_current_data"/>
diff --git a/yuthon_hr_employee/views/inherit_hr_job_views.xml b/yuthon_hr_employee/views/inherit_hr_job_views.xml
index 4b7ee6b62..8fed581ce 100644
--- a/yuthon_hr_employee/views/inherit_hr_job_views.xml
+++ b/yuthon_hr_employee/views/inherit_hr_job_views.xml
@@ -77,6 +77,9 @@
             <xpath expr="//page[@name='job_description_page']" position="attributes">
                 <attribute name="string">任职要求</attribute>
             </xpath>
+            <xpath expr="//field[@name='contract_type_id']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
             <xpath expr="//field[@name='department_id']" position="after">
                 <field name="number"/>
                 <field name="establishment_quotas"/>
@@ -143,9 +146,6 @@
                 <field name="is_enable"/>
                 <field name="job_personnel_ids" widget="many2many_tags"/>
             </div>
-            <xpath expr="//field[@name='contract_type_id']" position="before">
-                <field name="email"/>
-            </xpath>
             <xpath expr="//field[@name='contract_type_id']" position="after">
                 <field name="function"/>
             </xpath>
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 2e273e96b..746d317b8 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -354,9 +354,14 @@
             <xpath expr="//field[@name='contract_id']" position="attributes">
                     <attribute name="column_invisible">1</attribute>
             </xpath>
+            <xpath expr="//field[@name='department_id']" position="before">
+                <field name="mobile_phone"/>
+                <field name="work_phone"/>
+            </xpath>
             <xpath expr="//field[@name='job_id']" position="after">
-                <field name="user_role_id"/>
-                <field name="use_user_type"/>
+                <field name="political_aspects"/>
+                <field name="user_role_id" column_invisible="1"/>
+                <field name="use_user_type" optional="hide"/>
                 <field name="salary_group_id" column_invisible="1"/>
                 <field name="user_number" optional="hide"/>
                 <field name="mobile_phone" optional="hide"/>
@@ -369,7 +374,6 @@
                 <field name="birthday_month" optional="hide"/>
                 <field name="user_type" optional="hide"/>
                 <!--                <field name="retire_years" optional="hide"/>-->
-                <field name="political_aspects" optional="hide"/>
                 <field name="dang_data" optional="hide"/>
                 <!--                <field name="new_start_contract_data" optional="hide"/>-->
                 <field name="open_start_time" optional="hide"/>
@@ -388,11 +392,11 @@
             <xpath expr="//field[@name='attendance_manager_id']" position="attributes">
                 <attribute name="column_invisible">1</attribute>
             </xpath>
-            <xpath expr="//field[@name='work_phone']" position="attributes">
-                <attribute name="optional">hide</attribute>
+            <xpath expr="//field[@name='parent_id']" position="attributes">
+                  <attribute name="optional">hide</attribute>
             </xpath>
-            <xpath expr="//field[@name='work_phone']" position="before">
-                <field name="number"/>
+            <xpath expr="//field[@name='work_phone']" position="attributes">
+                    <attribute name="column_invisible">1</attribute>
             </xpath>
             <xpath expr="//field[@name='company_id']" position="attributes">
                     <attribute name="optional">hide</attribute>