diff --git a/public/pages/property/todayAttendanceManage/todayAttendanceManage.html b/public/pages/property/todayAttendanceManage/todayAttendanceManage.html
index 03a53780f..5dad5ad92 100644
--- a/public/pages/property/todayAttendanceManage/todayAttendanceManage.html
+++ b/public/pages/property/todayAttendanceManage/todayAttendanceManage.html
@@ -18,17 +18,13 @@
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" placeholder="请输入班组ID"
-                                    v-model="todayAttendanceManageInfo.conditions.classesId" class=" form-control">
+                                <input type="text" placeholder="请输入部门名称"
+                                    v-model="todayAttendanceManageInfo.conditions.departmentName" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-3">
-                            <select class="custom-select" v-model="todayAttendanceManageInfo.conditions.clockType">
-                                <option selected value="">请选择打卡类型</option>
-                                <option value="1001">每天打卡</option>
-                                <option value="1002">隔天打卡</option>
-                                <option value="1003">自定义</option>
-                            </select>
+                            <input type="text" placeholder="请选择打卡时间"
+                                    v-model="todayAttendanceManageInfo.conditions.date" class=" form-control queryDate">
                         </div>
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm"
@@ -67,10 +63,10 @@
                         </thead>
                         <tbody>
                             <tr v-for="attendance in todayAttendanceManageInfo.attendances">
-                                <td class="text-center">{{attendance.departmentName}}</td>
+                                <td class="text-center">{{attendance.classObjName}}</td>
                                 <td class="text-center">{{attendance.staffName}}</td>
                                 <td class="text-center">{{attendance.classesName}}</td>
-                                <td class="text-center">{{attendance.clockCount}}</td>
+                                <td class="text-center">{{attendance.taskYear+'-'+attendance.taskMonth+'-'+attendance.taskDay}}</td>
                                 <td class="text-center">{{attendance.stateName}}</td>
                                 <td class="text-center">
                                     <div class="btn-group">
diff --git a/public/pages/property/todayAttendanceManage/todayAttendanceManage.js b/public/pages/property/todayAttendanceManage/todayAttendanceManage.js
index 28e1ecbf7..d644396fa 100644
--- a/public/pages/property/todayAttendanceManage/todayAttendanceManage.js
+++ b/public/pages/property/todayAttendanceManage/todayAttendanceManage.js
@@ -14,14 +14,17 @@
                 classesId: '',
                 conditions: {
                     classesName: '',
-                    classesId: '',
-                    clockType: '',
-
+                    departmentName: '',
+                    date: vc.dateFormat(new Date())
                 }
             }
         },
         _initMethod: function () {
             vc.component._listTodayAttendances(DEFAULT_PAGE, DEFAULT_ROWS);
+
+            vc.initDate('queryDate',function(value){
+                $that.todayAttendanceManageInfo.conditions.date = value;
+            });
         },
         _initEvent: function () {