个人信息调整

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

@@ -56,30 +56,31 @@
 							{ required: true, message: '性别不能为空', trigger: 'change' }
 						]">
 							<el-radio-group v-model="inputForm.sex">
-								<el-radio v-for="item in $dictUtils.getDictList('sex')" :label="item.value" :disabled="true"
-									:key="item.value">{{ item.label }}</el-radio>
+								<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>
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="年龄" prop="age"
 							:rules="[{ required: true, message: '年龄不能为空', trigger: 'change' }]">
-							<el-input v-model="inputForm.age" type="number"  :disabled="true"></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" :disabled="true"
-								placeholder="选择日期">
+							<el-date-picker style="width: 100%" v-model="inputForm.birthday" value-format="YYYY-MM-DD"
+								:disabled="true" placeholder="选择日期">
 							</el-date-picker>
 						</el-form-item>
 					</el-col>
 					<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%;" clearable>
+							<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">
 								</el-option>
@@ -339,7 +340,7 @@
 									// { required: true, message: '请输入试用期时长（月）', trigger: 'blur' },
 									{ pattern: /^\d+(\.\d{1,2})?$/, message: '请输入数字', trigger: 'blur' }
 								]">
-									<el-input :disabled="!isAdmin" v-model="inputForm.trialDuration"
+									<el-input v-model="inputForm.trialDuration"
 										oninput="this.value = this.value.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{0,2}).*$/, '$1').replace(/\.{2,}/g, '.').replace(/^0+(\d)/, '$1')"
 										placeholder="请输入试用期时长（月）"></el-input>
 								</el-form-item>
@@ -348,9 +349,8 @@
 								<el-form-item label="试用期结束日期" prop="trialEndDate" :rules="[
 									// { required: true, message: '请选择试用期结束日期', trigger: 'blur' }
 								]">
-									<el-date-picker :disabled="!isAdmin" style="width: 100%"
-										v-model="inputForm.trialEndDate" value-format="YYYY-MM-DD"
-										placeholder="选择试用期结束日期">
+									<el-date-picker style="width: 100%" v-model="inputForm.trialEndDate"
+										value-format="x" placeholder="选择试用期结束日期">
 									</el-date-picker>
 								</el-form-item>
 							</el-col>
@@ -988,6 +988,10 @@
 												}}</el-descriptions-item>
 												<el-descriptions-item label="培训成绩：">{{ item.trainingResult
 												}}</el-descriptions-item>
+												<el-descriptions-item label="附件：">
+													<AttachmentView :fileList="item.files">
+													</AttachmentView>
+												</el-descriptions-item>
 											</el-descriptions>
 										</el-collapse-item>
 									</div>
@@ -1049,6 +1053,10 @@
 												<el-descriptions-item label="有效期至：">{{
 													handleDateFormatter(item.validUntil)
 												}}</el-descriptions-item>
+												<el-descriptions-item label="附件：">
+													<AttachmentView :fileList="item.certificateAttachment">
+													</AttachmentView>
+												</el-descriptions-item>
 
 											</el-descriptions>
 										</el-collapse-item>
@@ -1101,6 +1109,10 @@
 												}}</el-descriptions-item>
 												<el-descriptions-item label="使用时间（月）：">{{ item.usageTime
 												}}</el-descriptions-item>
+												<el-descriptions-item label="附件：">
+													<AttachmentView :fileList="item.files">
+													</AttachmentView>
+												</el-descriptions-item>
 											</el-descriptions>
 										</el-collapse-item>
 									</div>
@@ -1156,6 +1168,10 @@
 												}}</el-descriptions-item>
 												<el-descriptions-item label="口语能力：">{{ item.speakingAbility
 												}}</el-descriptions-item>
+												<el-descriptions-item label="附件：">
+													<AttachmentView :fileList="item.files">
+													</AttachmentView>
+												</el-descriptions-item>
 											</el-descriptions>
 										</el-collapse-item>
 									</div>
@@ -1265,6 +1281,10 @@
 												}}</el-descriptions-item>
 												<el-descriptions-item :span="2" label="简述：">{{ item.description
 												}}</el-descriptions-item>
+												<el-descriptions-item label="附件：">
+													<AttachmentView :fileList="item.files">
+													</AttachmentView>
+												</el-descriptions-item>
 											</el-descriptions>
 										</el-collapse-item>
 									</div>
@@ -1325,7 +1345,6 @@ import FamilyInfo from "./components/FamilyInfo";
 import RewardInfo from "./components/RewardInfo";
 import AttachmentView from './components/AttachmentView'
 
-import userService from "@/api/sys/userService";
 import postService from "@/api/sys/postService";
 import roleService from "@/api/sys/roleService";
 export default {
@@ -1345,7 +1364,6 @@ export default {
 	},
 	data() {
 		return {
-			isAdmin: false,
 			trialFlag: false,
 			bankHideUploadEdit: false, //控制上传点击
 			bankHideUploadEdit2: false, //控制上传点击
@@ -1546,7 +1564,6 @@ export default {
 	},
 	created() {
 		this.ossService = new OSSSerivce()
-		this.checkIsAdmin()
 	},
 	components: {
 		SelectTree,
@@ -2565,12 +2582,6 @@ export default {
 		changeInfoList(index) {
 			this.changeFlag[index] = !this.changeFlag[index]
 		},
-		// 查询当前用户是否是管理员用户
-		checkIsAdmin() {
-			userService.is().then((data) => {
-				this.isAdmin = data
-			})
-		},
 	}
 }
 </script>

src/views/human/enrollment/registration/components/AttachmentView.vue

@@ -8,12 +8,14 @@
                         <el-image ref="imageViewer" :hide-on-click-modal="true"
                             style="width: 30px; height: 30px;padding-top: 4px; margin-right: 8px;" :src="item.lsUrl"
                             :preview-src-list="[item.lsUrl]" :preview-teleported="true"></el-image>
+                        <!-- <el-icon size="28" style="cursor: pointer;">
+                            <Picture @click="showFile(item)" />
+                        </el-icon> -->
                     </template>
                     <template v-else>
                         <el-icon size="28" style="cursor: pointer;">
                             <Document @click="showFile(item)" />
                         </el-icon>
-                        <!-- <el-link type="primary" :underline="false" @click="showFile(item)">{{ item.name }}</el-link> -->
                     </template>
                 </div>
 

src/views/sys/user/UserInfo.vue

@@ -198,7 +198,8 @@
 											trigger: 'blur',
 										},
 									]" prop="email">
-										<el-input v-model="concatForm.email"></el-input>
+										<el-input @blur="checkEmail(concatForm.email)"
+											v-model="concatForm.email"></el-input>
 									</el-form-item>
 								</el-col>
 
@@ -224,7 +225,7 @@
 
 									]">
 										<el-date-picker style="width: 100%" v-model="generalForm.joinWorkDate"
-											value-format="YYYY-MM-DD" placeholder="">
+											value-format="x" placeholder="">
 										</el-date-picker>
 									</el-form-item>
 								</el-col>
@@ -233,7 +234,7 @@
 
 									]">
 										<el-date-picker style="width: 100%" v-model="generalForm.joinIndustryDate"
-											value-format="YYYY-MM-DD" placeholder="">
+											value-format="x" placeholder="">
 										</el-date-picker>
 									</el-form-item>
 								</el-col>
@@ -1044,6 +1045,10 @@
 														}}</el-descriptions-item>
 														<el-descriptions-item label="培训成绩：">{{ item.trainingResult
 														}}</el-descriptions-item>
+														<el-descriptions-item label="附件：">
+															<AttachmentView :fileList="item.files">
+															</AttachmentView>
+														</el-descriptions-item>
 													</el-descriptions>
 												</el-collapse-item>
 											</div>
@@ -1109,7 +1114,10 @@
 														<el-descriptions-item label="有效期至：">{{
 															handleDateFormatter(item.validUntil)
 														}}</el-descriptions-item>
-
+														<el-descriptions-item label="附件：">
+															<AttachmentView :fileList="item.certificateAttachment">
+															</AttachmentView>
+														</el-descriptions-item>
 													</el-descriptions>
 												</el-collapse-item>
 											</div>
@@ -1166,6 +1174,10 @@
 														}}</el-descriptions-item>
 														<el-descriptions-item label="使用时间（月）：">{{ item.usageTime
 														}}</el-descriptions-item>
+														<el-descriptions-item label="附件：">
+															<AttachmentView :fileList="item.files">
+															</AttachmentView>
+														</el-descriptions-item>
 													</el-descriptions>
 												</el-collapse-item>
 											</div>
@@ -1226,6 +1238,10 @@
 														}}</el-descriptions-item>
 														<el-descriptions-item label="口语能力：">{{ item.speakingAbility
 														}}</el-descriptions-item>
+														<el-descriptions-item label="附件：">
+															<AttachmentView :fileList="item.files">
+															</AttachmentView>
+														</el-descriptions-item>
 													</el-descriptions>
 												</el-collapse-item>
 											</div>
@@ -1344,6 +1360,10 @@
 														}}</el-descriptions-item>
 														<el-descriptions-item :span="2" label="简述：">{{ item.description
 														}}</el-descriptions-item>
+														<el-descriptions-item label="附件：">
+															<AttachmentView :fileList="item.files">
+															</AttachmentView>
+														</el-descriptions-item>
 													</el-descriptions>
 												</el-collapse-item>
 											</div>
@@ -1856,7 +1876,7 @@ export default {
 				this.recover(this.photoForm, data);
 			});
 			this.init(userId)
-			this.refreshList(userId);
+			// this.refreshList(userId);
 
 		}
 
@@ -2211,6 +2231,16 @@ export default {
 				}
 			})
 		},
+		//邮箱验证
+		checkEmail(email) {
+			if (!this.validateXG.isEmail(email)) {
+				this.$message.error('邮箱格式不正确，请重新填写')
+				this.loading = false
+				this.concatForm.email = ''
+				throw new Error('邮箱格式不正确，请重新填写')
+			}
+
+		},
 		checkBankNumber(bankNumber, type) {
 			if (!this.validateXG.isBankNum(bankNumber)) {
 				if (type === 'zx') {