diff --git a/public/pages/.DS_Store b/public/pages/.DS_Store
index d9e1f9670..b50e79889 100755
Binary files a/public/pages/.DS_Store and b/public/pages/.DS_Store differ
diff --git a/public/pages/property/.DS_Store b/public/pages/property/.DS_Store
index acd7a0053..160341d56 100755
Binary files a/public/pages/property/.DS_Store and b/public/pages/property/.DS_Store differ
diff --git a/public/pages/property/scheduleClassesPage/scheduleClassesPage.html b/public/pages/property/scheduleClassesPage/scheduleClassesPage.html
index e469abf3f..7ea2756d4 100755
--- a/public/pages/property/scheduleClassesPage/scheduleClassesPage.html
+++ b/public/pages/property/scheduleClassesPage/scheduleClassesPage.html
@@ -20,10 +20,10 @@
                             </div>
                         </div>
                         <div class="col-sm-3">
-                            <select class="custom-select" v-model="scheduleClassesPageInfo.conditions.state">
-                                <option selected value="">{{vc.i18n('请选择状态','scheduleClassesPage')}}</option>
-                                <option v-for="(item,index) in scheduleClassesPageInfo.states" :key="index"
-                                    v-bind:value="item.statusCd">{{item.name}}
+                            <select class="custom-select" v-model="scheduleClassesPageInfo.conditions.scheduleId">
+                                <option selected value="">{{vc.i18n('请选择班次','scheduleClassesPage')}}</option>
+                                <option v-for="(item,index) in scheduleClassesPageInfo.scheduleClassess" :key="index"
+                                    v-bind:value="item.scheduleId">{{item.name}}
                                 </option>
                             </select>
                         </div>
@@ -42,6 +42,12 @@
                                     <vc:i18n name="查询" namespace="scheduleClassesPage"></vc:i18n>
                                 </span>
                             </button>
+                            <button type="button" class="btn btn-white btn-sm"
+                                v-on:click="_exportScheduleClasses()">
+                                <span>
+                                    <vc:i18n name="导出" namespace="scheduleClassesPage"></vc:i18n>
+                                </span>
+                            </button>
                         </div>
                     </div>
                 </div>
diff --git a/public/pages/property/scheduleClassesPage/scheduleClassesPage.js b/public/pages/property/scheduleClassesPage/scheduleClassesPage.js
index b8e807e64..5af2a9a07 100755
--- a/public/pages/property/scheduleClassesPage/scheduleClassesPage.js
+++ b/public/pages/property/scheduleClassesPage/scheduleClassesPage.js
@@ -8,6 +8,7 @@
         data: {
             scheduleClassesPageInfo: {
                 staffs: [],
+                scheduleClassess:[],
                 maxDay:30,
                 curMonth:'',
                 curYear:'',
@@ -17,7 +18,7 @@
                 states: '',
                 conditions: {
                     staffNameLike: '',
-                    staffName: '',
+                    scheduleId: '',
                     curDate: ''
                 }
             }
@@ -25,7 +26,8 @@
         _initMethod: function () {
             $that.initStaffDate();
             vc.component._listStaffScheduleClassess(DEFAULT_PAGE, DEFAULT_ROWS);
-            
+            vc.component._listScheduleClassess(DEFAULT_PAGE, DEFAULT_ROWS);
+
         },
         _initEvent: function () {
             vc.on('scheduleClassesPage', 'listScheduleClasses', function (_param) {
@@ -90,6 +92,47 @@
                     vc.component.scheduleClassesPageInfo.moreCondition = true;
                 }
             },
+            _listScheduleClassess: function (_page, _rows) {
+              
+                let param = {
+                    params: {
+                        page:1,
+                        row:100
+                    }
+                };
+                //发送get请求
+                vc.http.apiGet('/scheduleClasses.listScheduleClasses',
+                    param,
+                    function (json, res) {
+                        let _scheduleClassesInfo = JSON.parse(json);
+                        $that.scheduleClassesPageInfo.scheduleClassess = _scheduleClassesInfo.data;
+                        
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
+            },
+            _exportScheduleClasses: function () {
+                //vc.jumpToPage('/callComponent/exportReportFee/exportData?pagePath=reportPayFeeDetail&' + vc.objToGetParam($that.reportPayFeeDetailInfo.conditions));
+                vc.component.scheduleClassesPageInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
+                vc.component.scheduleClassesPageInfo.conditions.pagePath = 'reportStaffMonthScheduleClasses';
+                let param = {
+                    params: vc.component.scheduleClassesPageInfo.conditions
+                };
+                //发送get请求
+                vc.http.apiGet('/export.exportData', param,
+                    function (json, res) {
+                        let _json = JSON.parse(json);
+                        vc.toast(_json.msg);
+                        if(_json.code == 0){
+                            vc.jumpToPage('/#/pages/property/downloadTempFile?tab=下载中心')
+                        }
+                    },
+                    function (errInfo, error) {
+                        console.log('请求失败处理');
+                    });
+            }
             
         }
     });