1

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

@@ -65,7 +65,16 @@ layout("/layouts/platform.html"){
                                        :key="item.id"></el-option>
                         </el-select>
                     </search-item>
-	                
+	                <search-item label="是否自聘">
+		                <el-select v-model="pageForm.isEmployed" placeholder="请选择" clearable>
+			                <el-option
+					                v-for="item in isEmployedOptions"
+					                :key="item.value"
+					                :label="item.label"
+					                :value="item.value">
+			                </el-option>
+		                </el-select>
+	                </search-item>
                 </search>
             </el-card>
 
@@ -167,10 +176,10 @@ layout("/layouts/platform.html"){
                :close-on-click-modal="false">
         <el-form :model="editHealthCheckupData" label-width="120px" ref="editHealthCheckupForm">
             <el-form-item label="姓名">
-                <el-input :value="editHealthCheckupData.userName"></el-input>
+                <el-input :value="editHealthCheckupData.userName" readonly></el-input>
             </el-form-item>
             <el-form-item label="工号">
-                <el-input :value="editHealthCheckupData.loginName"></el-input>
+                <el-input :value="editHealthCheckupData.loginName" readonly></el-input>
             </el-form-item>
             <el-form-item label="套餐"
                           prop="subjectId"
@@ -180,6 +189,16 @@ layout("/layouts/platform.html"){
                                :label="item.optionName"></el-option>
                 </el-select>
             </el-form-item>
+	        <el-form-item label="是否自聘">
+		        <el-select v-model="editHealthCheckupData.isEmployed" placeholder="请选择" style="width: 100%" clearable>
+			        <el-option
+					        v-for="item in isEmployedOptions"
+					        :key="item.value"
+					        :label="item.label"
+					        :value="item.value">
+			        </el-option>
+		        </el-select>
+	        </el-form-item>
             <el-form-item label="备注"
                           prop="bz">
                 <el-input v-model="editHealthCheckupData.bz" type="textarea" rows="5"
@@ -263,6 +282,7 @@ layout("/layouts/platform.html"){
                     {prop: 'selectTime', label: '选择时间', width: "160px"},
                     {prop: 'isAudit', label: '是否确认'},
                     {prop: 'auditTime', label: '确认时间'},
+                    {prop: 'isEmployed', label: '是否自聘'},
                     {prop: 'bz', label: '备注',width: "200px"},
                 ],
                 exportHealthCheckupDialog: false,
@@ -278,6 +298,10 @@ layout("/layouts/platform.html"){
 		            remarks: "",
 	            },
                 campusOptions: [],
+	            isEmployedOptions: [
+		            {value: '是', label: '是'},
+		            {value: '否', label: '否'},
+	            ],
             }
         },
         components: {
@@ -336,7 +360,8 @@ layout("/layouts/platform.html"){
                     subjectId: row.subjectId,
                     campus: row.campus,
                     projectId: this.pageForm.projectId,
-                    userId: row.id
+                    userId: row.id,
+	                isEmployed: row.isEmployed
                 }
                 this.exportHealthCheckupDialog = true
 
@@ -447,6 +472,7 @@ layout("/layouts/platform.html"){
 	        },
 	        openEditRemarks(row){
 				this.doEditRemarks.userId = row.id;
+				this.doEditRemarks.remarks = row.bz;
 		        this.doEditRemarks.projectId = this.pageForm.projectId;
 				this.doEditRemarksDialog = true;
 	        },
@@ -459,6 +485,11 @@ layout("/layouts/platform.html"){
 				        if (resp.code === 0) {
 					        this.notifySuccess(resp.msg)
 					        this.doSearch()
+					        this.doEditRemarks = {
+						        userId: '',
+						        projectId: '',
+						        remarks: ''
+					        }
 				        } else {
 					        this.notifyWarning(resp.msg)
 				        }

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

@@ -37,6 +37,16 @@ layout("/layouts/platform.html"){
                                        :value="item.id" :key="item.id"></el-option>
                         </el-select>
                     </search-item>
+	                <search-item label="是否自聘" clearable>
+		                <el-select v-model="pageForm.isEmployed" placeholder="请选择">
+			                <el-option
+					                v-for="item in isEmployedOptions"
+					                :key="item.value"
+					                :label="item.label"
+					                :value="item.value">
+			                </el-option>
+		                </el-select>
+	                </search-item>
                     <!-- <search-item label="所属单位">
                          <el-select placeholder="请选择所属单位" v-model="pageForm.unitId"
                                     style="width: 100%;"
@@ -286,7 +296,11 @@ layout("/layouts/platform.html"){
                 loading: false,
 	            selectLastYearProject: false,
 	            lastYearProjectId: null,
-	            lastYearProjectSubjectOptions: []
+	            lastYearProjectSubjectOptions: [],
+	            isEmployedOptions: [
+		            {value: '是', label: '是'},
+		            {value: '否', label: '否'},
+	            ],
             }
         },
         methods: {