diff --git a/public/pages/property/oaWorkflowManage/oaWorkflowManage.html b/public/pages/property/oaWorkflowManage/oaWorkflowManage.html
index cd7537ae4..e4dcad812 100644
--- a/public/pages/property/oaWorkflowManage/oaWorkflowManage.html
+++ b/public/pages/property/oaWorkflowManage/oaWorkflowManage.html
@@ -4,58 +4,37 @@
             <div class="ibox ">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="查询条件" namespace="oaWorkflowManage"></vc:i18n></span>
+                        <vc:i18n name="查询条件" namespace="oaWorkflowManage"></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()">
-                            {{oaWorkflowManageInfo.moreCondition == true?'隐藏':'更多'}}
-                        </button>
+
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请输入工作流ID','oaWorkflowManage')"
-                                       v-model="oaWorkflowManageInfo.conditions.flowId" 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('请输入流程名称','oaWorkflowManage')"
-                                       v-model="oaWorkflowManageInfo.conditions.flowName" class=" form-control">
+                                    v-model="oaWorkflowManageInfo.conditions.flowName" class=" form-control">
                             </div>
                         </div>
-                        <div class="col-sm-3">
+                        <div class="col-sm-2">
                             <select class="custom-select" v-model="oaWorkflowManageInfo.conditions.flowType">
                                 <option selected value="">{{vc.i18n('请选择流程类型','oaWorkflowManage')}}</option>
                                 <option v-for="(item,index) in oaWorkflowManageInfo.flowTypes" :key="index"
-                                        v-bind:value="item.statusCd">{{item.name}}
+                                    v-bind:value="item.statusCd">{{item.name}}
                                 </option>
                             </select>
                         </div>
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOaWorkflowMethod()">
-                                <i class="fa fa-search"></i>
-                                <span><vc:i18n name="查询" namespace="oaWorkflowManage"></vc:i18n></span>
+                                <vc:i18n name="查询" namespace="oaWorkflowManage"></vc:i18n>
                             </button>
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_resetOaWorkflowMethod()">
-                                <i class="fa fa-repeat"></i>
-                                <span><vc:i18n name="重置" namespace="oaWorkflowManage"></vc:i18n></span>
+                                <vc:i18n name="重置" namespace="oaWorkflowManage"></vc:i18n>
                             </button>
                         </div>
                     </div>
-                    <div class="row" v-show="oaWorkflowManageInfo.moreCondition == true">
-                        <div class="col-sm-3">
-                            <select class="custom-select" v-model="oaWorkflowManageInfo.conditions.state">
-                                <option selected value="">{{vc.i18n('请选择流程状态','oaWorkflowManage')}}</option>
-                                <option v-for="(item,index) in oaWorkflowManageInfo.states" :key="index"
-                                        v-bind:value="item.statusCd">{{item.name}}
-                                </option>
-                            </select>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
@@ -65,95 +44,88 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="流程实例" namespace="oaWorkflowManage"></vc:i18n></span>
+                        <vc:i18n name="流程实例" namespace="oaWorkflowManage"></vc:i18n>
                     </h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddOaWorkflowModal()">
-                            <i class="fa fa-plus"></i>
-                            <span><vc:i18n name="新建流程" namespace="oaWorkflowManage"></vc:i18n></span>
+                            <vc:i18n name="新建流程" namespace="oaWorkflowManage"></vc:i18n>
                         </button>
                     </div>
                 </div>
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">
-                                <span><vc:i18n name="工作流ID" namespace="oaWorkflowManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="流程名称" namespace="oaWorkflowManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="流程类型" namespace="oaWorkflowManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="模型ID" namespace="oaWorkflowManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">KEY</th>
-                            <th class="text-center">
-                                <span><vc:i18n name="状态" namespace="oaWorkflowManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="描述" namespace="oaWorkflowManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="创建时间" namespace="oaWorkflowManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="操作" namespace="oaWorkflowManage"></vc:i18n></span>
-                            </th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">
+                                    <vc:i18n name="工作流ID" namespace="oaWorkflowManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="流程名称" namespace="oaWorkflowManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="流程类型" namespace="oaWorkflowManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="模型ID" namespace="oaWorkflowManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">KEY</th>
+                                <th class="text-center">
+                                    <vc:i18n name="状态" namespace="oaWorkflowManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="描述" namespace="oaWorkflowManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="创建时间" namespace="oaWorkflowManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="操作" namespace="oaWorkflowManage"></vc:i18n>
+                                </th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="oaWorkflow in oaWorkflowManageInfo.oaWorkflows">
-                            <td class="text-center">{{oaWorkflow.flowId}}</td>
-                            <td class="text-center">{{oaWorkflow.flowName}}</td>
-                            <td class="text-center">{{oaWorkflow.flowType == '1001'?'普通流程':'未知'}}</td>
-                            <td class="text-center">{{oaWorkflow.modelId}}</td>
-                            <td class="text-center">{{oaWorkflow.flowKey}}</td>
-                            <td class="text-center">{{oaWorkflow.state == 'C'?'已部署':'待部署'}}</td>
-                            <td class="text-center">{{oaWorkflow.describle}}</td>
-                            <td class="text-center">{{oaWorkflow.createTime}}</td>
-                            <td class="text-center">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
+                            <tr v-for="oaWorkflow in oaWorkflowManageInfo.oaWorkflows">
+                                <td class="text-center">{{oaWorkflow.flowId}}</td>
+                                <td class="text-center">{{oaWorkflow.flowName}}</td>
+                                <td class="text-center">{{oaWorkflow.flowType == '1001'?'普通流程':'未知'}}</td>
+                                <td class="text-center">{{oaWorkflow.modelId}}</td>
+                                <td class="text-center">{{oaWorkflow.flowKey}}</td>
+                                <td class="text-center">{{oaWorkflow.state == 'C'?'已部署':'待部署'}}</td>
+                                <td class="text-center">{{oaWorkflow.describle}}</td>
+                                <td class="text-center">{{oaWorkflow.createTime}}</td>
+                                <td class="text-center">
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs"
                                             v-on:click="_openWorkflowEditorApp(oaWorkflow)">
-                                        <span><vc:i18n name="流程" namespace="oaWorkflowManage"></vc:i18n></span>
-                                    </button>
-                                </div>
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openWorkflowForm(oaWorkflow)">
-                                        <span><vc:i18n name="设计表单" namespace="oaWorkflowManage"></vc:i18n></span>
-                                    </button>
-                                </div>
-                                <div class="btn-group" v-if="oaWorkflow.state == 'W'">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeployWorkflow(oaWorkflow)">
-                                        <span><vc:i18n name="发布" namespace="oaWorkflowManage"></vc:i18n></span>
-                                    </button>
-                                </div>
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
+                                                <vc:i18n name="流程" namespace="oaWorkflowManage"></vc:i18n>
+                                        </button>
+                                    </div>
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs" v-on:click="_openWorkflowForm(oaWorkflow)">
+                                                <vc:i18n name="设计表单" namespace="oaWorkflowManage"></vc:i18n>
+                                        </button>
+                                    </div>
+                                    <div class="btn-group" v-if="oaWorkflow.state == 'W'">
+                                        <button class="btn-white btn btn-xs"
+                                            v-on:click="_openDeployWorkflow(oaWorkflow)">
+                                                <vc:i18n name="发布" namespace="oaWorkflowManage"></vc:i18n>
+                                        </button>
+                                    </div>
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs"
                                             v-on:click="_openEditOaWorkflowModel(oaWorkflow)">
-                                        <span><vc:i18n name="修改" namespace="oaWorkflowManage"></vc:i18n></span>
-                                    </button>
-                                </div>
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
+                                                <vc:i18n name="修改" namespace="oaWorkflowManage"></vc:i18n>
+                                        </button>
+                                    </div>
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs"
                                             v-on:click="_openDeleteOaWorkflowModel(oaWorkflow)">
-                                        <span><vc:i18n name="删除" namespace="oaWorkflowManage"></vc:i18n></span>
-                                    </button>
-                                </div>
-                            </td>
-                        </tr>
+                                                <vc:i18n name="删除" namespace="oaWorkflowManage"></vc:i18n>
+                                        </button>
+                                    </div>
+                                </td>
+                            </tr>
                         </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="9">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
                     </table>
                     <!-- 分页 -->
                     <vc:create path="frame/pagination"></vc:create>
@@ -165,4 +137,4 @@
     <vc:create path="property/editOaWorkflow"></vc:create>
     <vc:create path="property/deleteOaWorkflow"></vc:create>
 
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/property/todayAttendanceManage/todayAttendanceManage.html b/public/pages/property/todayAttendanceManage/todayAttendanceManage.html
index a90b5422d..587a01fa5 100644
--- a/public/pages/property/todayAttendanceManage/todayAttendanceManage.html
+++ b/public/pages/property/todayAttendanceManage/todayAttendanceManage.html
@@ -4,55 +4,47 @@
             <div class="ibox ">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="查询条件" namespace="todayAttendanceManage"></vc:i18n></span>
+                        <vc:i18n name="查询条件" namespace="todayAttendanceManage"></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()">
-                            {{todayAttendanceManageInfo.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('请输入班组名称','todayAttendanceManage')"
-                                       v-model="todayAttendanceManageInfo.conditions.classesName" class=" form-control">
+                                    v-model="todayAttendanceManageInfo.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('请输入部门名称','todayAttendanceManage')"
-                                       v-model="todayAttendanceManageInfo.conditions.departmentName"
-                                       class=" form-control">
+                                    v-model="todayAttendanceManageInfo.conditions.departmentName" class=" form-control">
                             </div>
                         </div>
-                        <div class="col-sm-3">
+                        <div class="col-sm-2">
                             <input type="text" :placeholder="vc.i18n('请选择打卡时间','todayAttendanceManage')"
-                                   v-model="todayAttendanceManageInfo.conditions.date" class=" form-control queryDate">
+                                v-model="todayAttendanceManageInfo.conditions.date" class=" form-control queryDate">
+                        </div>
+                        <div class="col-sm-2">
+                            <div class="form-group">
+                                <input type="text" :placeholder="vc.i18n('请输入员工名称','todayAttendanceManage')"
+                                    v-model="todayAttendanceManageInfo.conditions.staffName" class=" form-control">
+                            </div>
                         </div>
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm"
-                                    v-on:click="_queryTodayAttendanceMethod()">
-                                <i class="fa fa-search"></i>
-                                <span><vc:i18n name="查询" namespace="todayAttendanceManage"></vc:i18n></span>
+                                v-on:click="_queryTodayAttendanceMethod()">
+                                <vc:i18n name="查询" namespace="todayAttendanceManage"></vc:i18n>
                             </button>
                             <button type="button" class="btn btn-primary btn-sm"
-                                    v-on:click="_resetTodayAttendanceMethod()">
-                                <i class="fa fa-repeat"></i>
-                                <span><vc:i18n name="重置" namespace="todayAttendanceManage"></vc:i18n></span>
+                                v-on:click="_resetTodayAttendanceMethod()">
+                                <vc:i18n name="重置" namespace="todayAttendanceManage"></vc:i18n>
                             </button>
                         </div>
                     </div>
-                    <div class="row" v-show="todayAttendanceManageInfo.moreCondition == true">
-                        <div class="col-sm-3">
-                            <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('请输入员工名称','todayAttendanceManage')"
-                                       v-model="todayAttendanceManageInfo.conditions.staffName" class=" form-control">
-                            </div>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
@@ -62,60 +54,50 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>
-                        <span><vc:i18n name="今日考勤" namespace="todayAttendanceManage"></vc:i18n></span>
+                        <vc:i18n name="今日考勤" namespace="todayAttendanceManage"></vc:i18n>
                     </h5>
                     <div class="ibox-tools" style="top:10px;"></div>
                 </div>
                 <div class="ibox-content">
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <!-- <th class="text-center">
-                                <span><vc:i18n name="部门名称" namespace="todayAttendanceManage"></vc:i18n></span>
-                            </th> -->
-                            <th class="text-center">
-                                <span><vc:i18n name="员工名称" namespace="todayAttendanceManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="考勤班组" namespace="todayAttendanceManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="考勤时间" namespace="todayAttendanceManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="考勤状态" namespace="todayAttendanceManage"></vc:i18n></span>
-                            </th>
-                            <th class="text-center">
-                                <span><vc:i18n name="操作" namespace="todayAttendanceManage"></vc:i18n></span>
-                            </th>
-                        </tr>
+                            <tr>
+                                <th class="text-center">
+                                    <vc:i18n name="员工名称" namespace="todayAttendanceManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="考勤班组" namespace="todayAttendanceManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="考勤时间" namespace="todayAttendanceManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="考勤状态" namespace="todayAttendanceManage"></vc:i18n>
+                                </th>
+                                <th class="text-center">
+                                    <vc:i18n name="操作" namespace="todayAttendanceManage"></vc:i18n>
+                                </th>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="attendance in todayAttendanceManageInfo.attendances">
-                            <!-- <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.taskYear+'-'+attendance.taskMonth+'-'+attendance.taskDay}}
-                            </td>
-                            <td class="text-center">{{attendance.stateName}}</td>
-                            <td class="text-center">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
+                            <tr v-for="attendance in todayAttendanceManageInfo.attendances">
+                                <!-- <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.taskYear+'-'+attendance.taskMonth+'-'+attendance.taskDay}}
+                                </td>
+                                <td class="text-center">{{attendance.stateName}}</td>
+                                <td class="text-center">
+                                    <div class="btn-group">
+                                        <button class="btn-white btn btn-xs"
                                             v-on:click="_openAttendanceDetailModel(attendance)">
-                                        <span><vc:i18n name="详情" namespace="todayAttendanceManage"></vc:i18n></span>
-                                    </button>
-                                </div>
-                            </td>
-                        </tr>
+                                                <vc:i18n name="详情" namespace="todayAttendanceManage"></vc:i18n>
+                                        </button>
+                                    </div>
+                                </td>
+                            </tr>
                         </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
                     </table>
                     <!-- 分页 -->
                     <vc:create path="frame/pagination"></vc:create>