入职人员查询调整

src/views/human/enrollment/registration/EnrollmentRegistrationEditForm.vue

@@ -56,7 +56,7 @@
 							{ required: true, message: '性别不能为空', trigger: 'change' }
 						]">
 							<el-radio-group v-model="inputForm.sex">
-								<el-radio v-for="item in $dictUtils.getDictList('sex')" :label="item.value"
+								<el-radio v-for="item in $dictUtils.getDictList('sex')" :label="item.value" :disabled="true"
 									:key="item.value">{{ item.label }}</el-radio>
 							</el-radio-group>
 						</el-form-item>
@@ -64,14 +64,14 @@
 					<el-col :span="12">
 						<el-form-item label="年龄" prop="age"
 							:rules="[{ required: true, message: '年龄不能为空', trigger: 'change' }]">
-							<el-input v-model="inputForm.age" type="number"></el-input>
+							<el-input v-model="inputForm.age" type="number"  :disabled="true"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="出生日期" prop="birthday" :rules="[
 							{ required: true, message: '请填写出生日期', trigger: 'blur' }
 						]">
-							<el-date-picker style="width: 100%" v-model="inputForm.birthday" value-format="YYYY-MM-DD"
+							<el-date-picker style="width: 100%" v-model="inputForm.birthday" value-format="YYYY-MM-DD" :disabled="true"
 								placeholder="选择日期">
 							</el-date-picker>
 						</el-form-item>
@@ -79,9 +79,9 @@
 					<el-col :span="12">
 						<el-form-item label="政治面貌" prop="politicalOutlook" :rules="[]">
 							<!--						<el-input v-model="inputForm.politicalOutlook"></el-input>-->
-							<el-select v-model="inputForm.politicalOutlook" placeholder="请选择政治面貌" style="width:100%;">
+							<el-select v-model="inputForm.politicalOutlook" placeholder="请选择政治面貌" style="width:100%;" clearable>
 								<el-option v-for="item in $dictUtils.getDictList('political_outlook')" :key="item.value"
-									:label="item.label" :value="item.value">
+									:label="item.label" :value="item.value" >
 								</el-option>
 							</el-select>
 						</el-form-item>
@@ -213,7 +213,7 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-				</el-row> 
+				</el-row>
 				<el-row :gutter="26">
 					<el-col :span="12">
 						<el-form-item label="个人简介" prop="remarks" :rules="[]">
@@ -2543,4 +2543,4 @@ export default {
 .card-info {
 	margin-bottom: 20px;
 }
-</style>
+</style>

src/views/human/enrollment/registration/EnrollmentRegistrationList.vue

@@ -74,6 +74,34 @@
 							<el-form-item label="联系电话" prop="mobilePhone">
 								<el-input v-model="searchForm.mobilePhone" placeholder="请输入联系电话" clearable></el-input>
 							</el-form-item>
+							<el-form-item label="政治面貌" prop="politicalOutlook" :rules="[]">
+								<el-select v-model="searchForm.politicalOutlook" placeholder="请选择政治面貌" style="width:100%;" clearable>
+									<el-option v-for="item in $dictUtils.getDictList('political_outlook')" :key="item.value"
+											   :label="item.label" :value="item.value">
+									</el-option>
+								</el-select>
+							</el-form-item>
+							<el-form-item label="账号状态" prop="loginFlag" :rules="[]">
+								<el-select v-model="searchForm.loginFlag" placeholder="请选择账号状态" style="width:100%;" clearable>
+									<el-option v-for="item in $dictUtils.getDictList('login_flag')" :key="item.value"
+											   :label="item.label" :value="item.value">
+									</el-option>
+								</el-select>
+							</el-form-item>
+
+							<el-form-item label="入所日期" prop="createDates">
+								<el-date-picker
+									style = "width: 300px"
+									placement="bottom-start"
+									format="YYYY-MM-DD"
+									value-format="YYYY-MM-DD"
+									v-model="searchForm.createDates"
+									type="daterange"
+									range-separator="至"
+									start-placeholder="开始日期"
+									end-placeholder="结束日期">
+								</el-date-picker>
+							</el-form-item>
 
 						</el-form>
 					</div>
@@ -136,8 +164,8 @@
 									field="departmentName"></vxe-column>
 								<vxe-column min-width="160" align="center" title="联系电话"
 									field="mobilePhone"></vxe-column>
-								<vxe-column min-width="160" align="center" title="毕业院校"
-									field="graduatedFrom"></vxe-column>
+								<vxe-column min-width="160" align="center" title="进所日期"
+									field="entryDate"></vxe-column>
 								<!--								<vxe-column min-width="160" fixed="right" align="center" title="是否已加入钉钉" field="ddType">
 									<template #default="scope">
 										<el-button v-if="scope.row.ddType === '1'" @click="detail(scope.row)"
@@ -238,8 +266,11 @@ export default {
 			searchForm: {
 				name: '',
 				mobilePhone: '',
+				politicalOutlook: '',
+				loginFlag: '',
 				department: '',
 				companyId: '',
+				createDates: [],
 			},
 			dataList: [],
 			tablePage: {

src/views/sys/user/UserInfo.vue

@@ -31,14 +31,7 @@
 								</template>
 								{{ userInfo.mobile }}
 							</el-descriptions-item>
-							<el-descriptions-item>
-								<template #label>
-									<el-icon :size="14">
-										<phone />
-									</el-icon>
-								</template>
-								{{ userInfo.phone }}
-							</el-descriptions-item>
+
 							<el-descriptions-item>
 								<template #label>
 									<el-icon :size="14">