!4554 Merge branch 'dev' into dev_zhou

Merge pull request !4554 from 李鹏宇/dev_zhou

yuthon_hr_attendance/controllers/applet_attendance.py

@@ -138,12 +138,11 @@ class AppletAttendance(Controller):
                 message = '可以打卡'
                 state = 'yes'
                 break
-        _logger.info(
-            f"\n人员: {employee_id.name}  {employee_id.company_id.name}  \n当前所在地址: {self_address['formatted_address']}  \n是否可以打卡: {state}\n  {wifi_name_list}\n wifi:{kw['wifi_name']}_________")
-        if self.is_workday(current_date):
-            attendance_id_class = f"{attendance_id.shift_name}  {start_time_str}-{end_time_str}"
-        else:
-            attendance_id_class = f"{attendance_id.shift_name}休息"
+        _logger.info(f"\n人员: {employee_id.name}  {employee_id.company_id.name}  \n当前所在地址: {self_address['formatted_address']}  \n是否可以打卡: {state}\n  {wifi_name_list}\n wifi:{kw['wifi_name']}_________")
+        shift_info = attendance_id.shift_name if attendance_id else (
+            "行政班次" if self.is_workday(current_date) else "")
+        time_part = f"{start_time_str}-{end_time_str}" if self.is_workday(current_date) else "休息"
+        attendance_id_class = f"{shift_info}{time_part}" if shift_info else time_part
         data = {
             'location': self_address['formatted_address'],
             'user_id': user_id.id,

yuthon_hr_attendance/views/overtime_approval.xml

@@ -58,7 +58,7 @@
                         <field name="issues_result" invisible="is_issues == False"/>
                         <field name="documents_ids" widget="preview_many2many"/>
                     </group>
-                    <group col="6">
+                    <group col="4">
                         <group>
                             <field name="start_time" options="{'rounding': 0}"/>
                             <field name="end_time" options="{'rounding': 0}"/>
@@ -72,8 +72,6 @@
                             <button name="open_record" type="object" string="考勤记录" class="oe_highlight"/>
                         </group>
                         <group/>
-                        <group/>
-                        <group/>
                     </group>
                     <group>
                         <field name="duration"/>