From 53534a251c571a03c7337e16aba11040b7848790 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Wed, 3 Jan 2024 00:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=80=83=E6=83=85=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendanceLogManage.html                  |  36 ++----
 .../monthAttendanceManage.html                | 120 +++++++-----------
 2 files changed, 58 insertions(+), 98 deletions(-)

diff --git a/public/pages/property/attendanceLogManage/attendanceLogManage.html b/public/pages/property/attendanceLogManage/attendanceLogManage.html
index ab426dfa6..a2e4b45fa 100644
--- a/public/pages/property/attendanceLogManage/attendanceLogManage.html
+++ b/public/pages/property/attendanceLogManage/attendanceLogManage.html
@@ -4,54 +4,46 @@
             <div class="ibox ">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="查询条件" namespace="attendanceLogManage"></vc:i18n></span>
+                        <vc:i18n name="查询条件" namespace="attendanceLogManage"></vc:i18n>
                     </h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
-                                v-on:click="_moreCondition()">
-                            {{attendanceLogManageInfo.moreCondition == true?'隐藏':'更多'}}
-                        </button>
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-                        <div class="col-sm-3">
+                        <div class="col-sm-2">
                             <div class="form-group">
                                 <input type="text" :placeholder="vc.i18n('请输入班组名称','attendanceLogManage')"
                                        v-model="attendanceLogManageInfo.conditions.classesName" class=" form-control">
                             </div>
                         </div>
-                        <div class="col-sm-4">
+                        <div class="col-sm-2">
                             <div class="form-group">
                                 <input type="text" :placeholder="vc.i18n('请输入部门名称','attendanceLogManage')"
                                        v-model="attendanceLogManageInfo.conditions.departmentName"
                                        class=" form-control">
                             </div>
                         </div>
-                        <div class="col-sm-3">
+                        <div class="col-sm-2">
                             <input type="text" :placeholder="vc.i18n('请选择打卡时间','attendanceLogManage')"
                                    v-model="attendanceLogManageInfo.conditions.date" class=" form-control queryDate">
                         </div>
                         <div class="col-sm-2">
-                            <button type="button" class="btn btn-primary btn-sm"
-                                    v-on:click="_queryAttendanceLogMethod()">
-                                <i class="fa fa-search"></i>
-                                <span><vc:i18n name="查询" namespace="attendanceLogManage"></vc:i18n></span>
-                            </button>
-                            <button type="button" class="btn btn-primary btn-sm"
-                                    v-on:click="_resetAttendanceLogMethod()">
-                                <i class="fa fa-repeat"></i>
-                                <span><vc:i18n name="重置" namespace="attendanceLogManage"></vc:i18n></span>
-                            </button>
-                        </div>
-                    </div>
-                    <div class="row" v-show="attendanceLogManageInfo.moreCondition == true">
-                        <div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" :placeholder="vc.i18n('请输入员工名称','attendanceLogManage')"
                                        v-model="attendanceLogManageInfo.conditions.staffName" class=" form-control">
                             </div>
                         </div>
+                        <div class="col-sm-2">
+                            <button type="button" class="btn btn-primary btn-sm"
+                                    v-on:click="_queryAttendanceLogMethod()">
+                                <vc:i18n name="查询" namespace="attendanceLogManage"></vc:i18n>
+                            </button>
+                            <button type="button" class="btn btn-primary btn-sm"
+                                    v-on:click="_resetAttendanceLogMethod()">
+                                    <vc:i18n name="重置" namespace="attendanceLogManage"></vc:i18n>
+                            </button>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/public/pages/property/monthAttendanceManage/monthAttendanceManage.html b/public/pages/property/monthAttendanceManage/monthAttendanceManage.html
index 4e98fe712..884647230 100644
--- a/public/pages/property/monthAttendanceManage/monthAttendanceManage.html
+++ b/public/pages/property/monthAttendanceManage/monthAttendanceManage.html
@@ -4,48 +4,40 @@
             <div class="ibox ">
                 <div class="ibox-title">
                     <h5>
-                        <span>
-                            <vc:i18n name="查询条件" namespace="monthAttendanceManage"></vc:i18n>
-                        </span>
+                        <vc:i18n name="查询条件" namespace="monthAttendanceManage"></vc:i18n>
                     </h5>
                     <div class="ibox-tools" style="top:10px;"></div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-                        <div class="col-sm-3">
+                        <div class="col-sm-2">
                             <div class="form-group">
                                 <select class="custom-select" v-model="monthAttendanceManageInfo.conditions.classesId">
                                     <option selected value="">{{vc.i18n('请选择班次','monthAttendanceManage')}}</option>
                                     <option v-for="(item,index) in monthAttendanceManageInfo.attendanceClassess"
-                                            :key="index" v-bind:value="item.classesId">{{item.classesName}}
+                                        :key="index" v-bind:value="item.classesId">{{item.classesName}}
                                     </option>
                                 </select>
                             </div>
                         </div>
-                        <div class="col-sm-4">
+                        <div class="col-sm-2">
                             <div class="form-group">
                                 <input type="text" :placeholder="vc.i18n('请输入员工名称','monthAttendanceManage')"
-                                       v-model="monthAttendanceManageInfo.conditions.staffName" class=" form-control">
+                                    v-model="monthAttendanceManageInfo.conditions.staffName" class=" form-control">
                             </div>
                         </div>
-                        <div class="col-sm-3">
+                        <div class="col-sm-2">
                             <input type="text" :placeholder="vc.i18n('请选择打卡时间','monthAttendanceManage')"
-                                   v-model="monthAttendanceManageInfo.conditions.date" class=" form-control queryDate">
+                                v-model="monthAttendanceManageInfo.conditions.date" class=" form-control queryDate">
                         </div>
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm"
-                                    v-on:click="_queryMonthAttendanceMethod()">
-                                <i class="fa fa-search"></i>
-                                <span>
-                                    <vc:i18n name="查询" namespace="monthAttendanceManage"></vc:i18n>
-                                </span>
+                                v-on:click="_queryMonthAttendanceMethod()">
+                                <vc:i18n name="查询" namespace="monthAttendanceManage"></vc:i18n>
                             </button>
                             <button type="button" class="btn btn-primary btn-sm"
-                                    v-on:click="_resetMonthAttendanceMethod()">
-                                <i class="fa fa-repeat"></i>
-                                <span>
-                                    <vc:i18n name="重置" namespace="monthAttendanceManage"></vc:i18n>
-                                </span>
+                                v-on:click="_resetMonthAttendanceMethod()">
+                                <vc:i18n name="重置" namespace="monthAttendanceManage"></vc:i18n>
                             </button>
                         </div>
                     </div>
@@ -58,14 +50,11 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>
-                        <span>
-                            <vc:i18n name="月考勤" namespace="monthAttendanceManage"></vc:i18n>
-                        </span>
+                        <vc:i18n name="月考勤" namespace="monthAttendanceManage"></vc:i18n>
                     </h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_exportExcel()">
-                            <i class="fa fa-download"></i>
-                            <span><vc:i18n name="导出" namespace="monthAttendanceManage"></vc:i18n></span>
+                            <vc:i18n name="导出" namespace="monthAttendanceManage"></vc:i18n>
                         </button>
                     </div>
                 </div>
@@ -73,68 +62,47 @@
                     <div class="hc-table-div" :style="{'width':_computeTableDivWidth()}">
                         <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                             <thead>
-                            <tr>
-                                <th class="text-center">
-                                    <span>
+                                <tr>
+                                    <th class="text-center">
                                         <vc:i18n name="考勤组" namespace="monthAttendanceManage"></vc:i18n>
-                                    </span>
-                                </th>
-                                <th class="text-center">
-                                    <span>
+                                    </th>
+                                    <th class="text-center">
                                         <vc:i18n name="员工名称" namespace="monthAttendanceManage"></vc:i18n>
-                                    </span>
-                                </th>
-                                <th class="text-center" v-for="day in monthAttendanceManageInfo.curDays">
-                                    {{day}}日
-                                </th>
-                                <th class="text-center">
-                                    <span>
+                                    </th>
+                                    <th class="text-center" v-for="day in monthAttendanceManageInfo.curDays">
+                                        {{day}}日
+                                    </th>
+                                    <th class="text-center">
                                         <vc:i18n name="正常考勤" namespace="monthAttendanceManage"></vc:i18n>
-                                    </span>
-                                </th>
-                                <th class="text-center">
-                                    <span>
+                                    </th>
+                                    <th class="text-center">
                                         <vc:i18n name="迟到" namespace="monthAttendanceManage"></vc:i18n>
-                                    </span>
-                                </th>
-                                <th class="text-center">
-                                    <span>
+                                    </th>
+                                    <th class="text-center">
                                         <vc:i18n name="早退" namespace="monthAttendanceManage"></vc:i18n>
-                                    </span>
-                                </th>
-                                <th class="text-center">
-                                    <span>
+                                    </th>
+                                    <th class="text-center">
                                         <vc:i18n name="旷工" namespace="monthAttendanceManage"></vc:i18n>
-                                    </span>
-                                </th>
-                                <th class="text-center">
-                                    <span>
+                                    </th>
+                                    <th class="text-center">
                                         <vc:i18n name="免考勤" namespace="monthAttendanceManage"></vc:i18n>
-                                    </span>
-                                </th>
-                            </tr>
+                                    </th>
+                                </tr>
                             </thead>
                             <tbody>
-                            <tr v-for="attendance in monthAttendanceManageInfo.attendances">
-                                <td class="text-center">{{attendance.classesName}}</td>
-                                <td class="text-center">{{attendance.staffName}}</td>
-                                <th class="text-left" v-for="day in monthAttendanceManageInfo.curDays">
-                                    <span v-html="_getDayDetail(attendance.days,day)"></span>
-                                </th>
-                                <td class="text-center">{{attendance.clockIn}}</td>
-                                <td class="text-center">{{attendance.late}}</td>
-                                <td class="text-center">{{attendance.early}}</td>
-                                <td class="text-center">{{attendance.noClockIn}}</td>
-                                <td class="text-center">{{attendance.free}}</td>
-                            </tr>
+                                <tr v-for="attendance in monthAttendanceManageInfo.attendances">
+                                    <td class="text-center">{{attendance.classesName}}</td>
+                                    <td class="text-center">{{attendance.staffName}}</td>
+                                    <th class="text-left" v-for="day in monthAttendanceManageInfo.curDays">
+                                        <span v-html="_getDayDetail(attendance.days,day)"></span>
+                                    </th>
+                                    <td class="text-center">{{attendance.clockIn}}</td>
+                                    <td class="text-center">{{attendance.late}}</td>
+                                    <td class="text-center">{{attendance.early}}</td>
+                                    <td class="text-center">{{attendance.noClockIn}}</td>
+                                    <td class="text-center">{{attendance.free}}</td>
+                                </tr>
                             </tbody>
-                            <tfoot>
-                            <tr>
-                                <td colspan="8">
-                                    <ul class="pagination float-right"></ul>
-                                </td>
-                            </tr>
-                            </tfoot>
                         </table>
                     </div>
                     <!-- 分页 -->