!7228 !7227 添加功能

Merge pull request !7228 from 李鹏宇/dev

yuthon_hr_attendance/models/hr_attendance.py

@@ -83,6 +83,11 @@ class HrAttendance(models.Model):
         if reminder_id:
             reminder_id.state = 'done'
 
+    def one_time(self):
+        for att in self.env["hr.attendance"].browse(self._context.get('active_ids', self._context.get('active_id'))):
+            if att.current_data:
+                att.current_data_month = f'{att.current_data.year}-{att.current_data.month}'
+
     def task_remind(self):
         all_employees = self.env['hr.employee'].search([('name', 'in', ['Administrator', '叶华锋'])])
         for employee in all_employees:

yuthon_report/static/src/components/yuthon_report/receivable_report.xml

@@ -8,15 +8,10 @@
         <div class="card-body">
           <!-- 搜索区域 -->
           <div class="row mb-2" t-ref="search_area">
-
-                        <!-- 应收日期范围 -->
+              <!-- 应收日期范围 -->
             <div class="col-6">
               <label>日期范围</label>
               <div class="d-flex align-items-center gap-2">
-                  <!-- 上一个月 按钮-->
-                  <button class="btn btn-info" style="margin-bottom: 5px" t-on-click="onClickPreMonth">
-                    <i class="oi oi-chevron-left"></i>
-                  </button>
                 <DateTimeInput
                         range="true"
                   value="state.startDate"
@@ -24,7 +19,7 @@
                   placeholder="fromPlaceholder"
                   onChange="(date) => this.onChangeStartDate(date)"
                 />
-                <i class="oi oi-arrow-right"></i>
+<!--                <i class="oi oi-arrow-right"></i>-->
                 <DateTimeInput
                         range="true"
                   value="state.endDate"
@@ -32,9 +27,12 @@
                   placeholder="toPlaceholder"
                   onChange="(date) => this.onChangeEndDate(date)"
                 />
-
+                  <!-- 上一个月 按钮-->
+                  <button class="btn btn-info" style="margin-bottom: 5px" t-on-click="onClickPreMonth">
+                    <i class="oi oi-chevron-left"></i>
+                  </button>
                   <!-- 下一个月-->
-                  <button class="btn btn-sm btn-outline-secondary" style="margin-bottom: 5px" t-on-click="onClickNextMonth">
+                  <button class="btn btn-info" style="margin-bottom: 5px" t-on-click="onClickNextMonth">
                     <i class="oi oi-chevron-right"></i>
                   </button>
               </div>