1

src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html

@@ -20,6 +20,9 @@ layout("/layouts/platform.html"){
                                 value-format="yyyy">
                         </el-date-picker>
                     </search-item>
+	                <search-item label="姓名/工号">
+		                <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
+	                </search-item>
                     <search-item label="体检项目">
                         <el-select @change="doSearch();getHealthCheckupSubject();"
                                    style="width: 100%;"
@@ -28,9 +31,6 @@ layout("/layouts/platform.html"){
                                        v-for="item in projectOptions"></el-option>
                         </el-select>
                     </search-item>
-	                <search-item label="姓名/工号">
-		                <el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
-	                </search-item>
 	                <search-item label="所选套餐">
 		                <el-select placeholder="请选择套餐" v-model="pageForm.subjectId"
 		                           style="width: 100%;"
@@ -73,8 +73,8 @@ layout("/layouts/platform.html"){
                 <table-tool label="体检项目">
 	                <el-radio-group v-model="pageForm.physicalExaminationStatus" size="medium" @change="doSearch" class="pr10">
 		                <el-radio-button :label="2">全部</el-radio-button>
-		                <el-radio-button :label="1">已体检</el-radio-button>
-		                <el-radio-button :label="0">未体检</el-radio-button>
+		                <el-radio-button :label="1">已选择</el-radio-button>
+		                <el-radio-button :label="0">未选择</el-radio-button>
 	                </el-radio-group>
                     <el-button type="primary" size="small" @click="openImport"
                                v-if="$auth.hasPermissionOr(['healthCheckup.list.import'])">导入名单

src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html

@@ -57,7 +57,6 @@ layout("/layouts/platform.html"){
                             <el-button :disabled="!pageForm.projectId"
                                        @click="exportReceiveDetail(true)"
                                        icon="el-icon-printer"
-
                                        size="small"
                                        type="primary">导出教职工已选名单
                             </el-button>
@@ -78,7 +77,7 @@ layout("/layouts/platform.html"){
                                        icon="el-icon-printer"
                                        size="small"
                                        type="primary"
-                                       v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">一键选择去年数据
+                                       v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">按上年补齐未选人员
                             </el-button>
                             <el-button @click="msgNotSelect"
                                        icon="el-icon-printer"