个人信息页调整和入职登记功能调整

src/api/human/enrollment/EnrollmentRegistrationService.js

@@ -4,193 +4,200 @@ import { REGISTER_PATH as prefix } from "../../AppPath";
 export default {
 	list: function (params) {
 		return request({
-			url: prefix + '/enrollmentRegistration/list',
-			method: 'get',
-			params: params
-		})
+			url: prefix + "/enrollmentRegistration/list",
+			method: "get",
+			params: params,
+		});
 	},
-	save (inputForm) {
+	save(inputForm) {
 		return request({
-			url: prefix +  `/enrollmentRegistration/save`,
-			method: 'post',
-			data: inputForm
-		})
+			url: prefix + `/enrollmentRegistration/save`,
+			method: "post",
+			data: inputForm,
+		});
 	},
-	saveInfo (inputForm) {
+	saveInfo(inputForm) {
 		return request({
-			url: prefix +  `/enrollmentRegistration/saveInfo`,
-			method: 'post',
-			data: inputForm
-		})
+			url: prefix + `/enrollmentRegistration/saveInfo`,
+			method: "post",
+			data: inputForm,
+		});
 	},
-	save2 (inputForm) {
+	save2(inputForm) {
 		return request({
-			url: prefix +  `/enrollmentRegistration/save2`,
-			method: 'post',
-			data: inputForm
-		})
+			url: prefix + `/enrollmentRegistration/save2`,
+			method: "post",
+			data: inputForm,
+		});
 	},
-	updateInfo (inputForm) {
+	updateInfo(inputForm) {
 		return request({
-			url: prefix +  `/enrollmentRegistration/updateInfo`,
-			method: 'post',
-			data: inputForm
-		})
+			url: prefix + `/enrollmentRegistration/updateInfo`,
+			method: "post",
+			data: inputForm,
+		});
+	},
+	saveWageCard(inputForm) {
+		return request({
+			url: prefix + `/enrollmentRegistration/saveWageCard`,
+			method: "post",
+			data: inputForm,
+		});
 	},
-	saveWageCard (inputForm) {
+	saveSocialCard(inputForm) {
 		return request({
-			url: prefix +  `/enrollmentRegistration/saveWageCard`,
-			method: 'post',
-			data: inputForm
-		})
+			url: prefix + `/enrollmentRegistration/saveSocialCard`,
+			method: "post",
+			data: inputForm,
+		});
 	},
-	saveSocialCard (inputForm) {
+	saveKeyCard(inputForm) {
 		return request({
-			url: prefix +  `/enrollmentRegistration/saveSocialCard`,
-			method: 'post',
-			data: inputForm
-		})
+			url: prefix + `/enrollmentRegistration/saveKeyCard`,
+			method: "post",
+			data: inputForm,
+		});
 	},
-	saveKeyCard (inputForm) {
+	saveRiceCard(inputForm) {
 		return request({
-			url: prefix +  `/enrollmentRegistration/saveKeyCard`,
-			method: 'post',
-			data: inputForm
-		})
+			url: prefix + `/enrollmentRegistration/saveRiceCard`,
+			method: "post",
+			data: inputForm,
+		});
 	},
-	saveRiceCard (inputForm) {
+	findById(id) {
 		return request({
-			url: prefix +  `/enrollmentRegistration/saveRiceCard`,
-			method: 'post',
-			data: inputForm
-		})
+			url: prefix + "/enrollmentRegistration/findById",
+			method: "get",
+			params: { id: id },
+		});
 	},
-	findById (id) {
+	findWageCardById(id) {
 		return request({
-			url: prefix + '/enrollmentRegistration/findById',
-			method: 'get',
-			params: {id: id}
-		})
+			url: prefix + "/enrollmentRegistration/findWageCardById",
+			method: "get",
+			params: { id: id },
+		});
 	},
-	findWageCardById (id) {
+	findSocialCardById(id) {
 		return request({
-			url: prefix + '/enrollmentRegistration/findWageCardById',
-			method: 'get',
-			params: {id: id}
-		})
+			url: prefix + "/enrollmentRegistration/findSocialCardById",
+			method: "get",
+			params: { id: id },
+		});
 	},
-	findSocialCardById (id) {
+	findKeyCardById(id) {
 		return request({
-			url: prefix + '/enrollmentRegistration/findSocialCardById',
-			method: 'get',
-			params: {id: id}
-		})
+			url: prefix + "/enrollmentRegistration/findKeyCardById",
+			method: "get",
+			params: { id: id },
+		});
 	},
-	findKeyCardById (id) {
+	findRiceCardById(id) {
 		return request({
-			url: prefix + '/enrollmentRegistration/findKeyCardById',
-			method: 'get',
-			params: {id: id}
-		})
+			url: prefix + "/enrollmentRegistration/findRiceCardById",
+			method: "get",
+			params: { id: id },
+		});
 	},
-	findRiceCardById (id) {
+	updateStatusById(param) {
 		return request({
-			url: prefix + '/enrollmentRegistration/findRiceCardById',
-			method: 'get',
-			params: {id: id}
-		})
+			url: prefix + "/enrollmentRegistration/updateStatusById",
+			method: "post",
+			data: param,
+		});
 	},
-	updateStatusById (param) {
+	updateWageCardStatusById(param) {
 		return request({
-			url: prefix + '/enrollmentRegistration/updateStatusById',
-			method: 'post',
-			data: param
-		})
+			url: prefix + "/enrollmentRegistration/updateWageCardStatusById",
+			method: "post",
+			data: param,
+		});
 	},
-	updateWageCardStatusById (param) {
+	updateSocialCardStatusById(param) {
 		return request({
-			url: prefix + '/enrollmentRegistration/updateWageCardStatusById',
-			method: 'post',
-			data: param
-		})
+			url: prefix + "/enrollmentRegistration/updateSocialCardStatusById",
+			method: "post",
+			data: param,
+		});
 	},
-	updateSocialCardStatusById (param) {
+	updateKeyCardStatusById(param) {
 		return request({
-			url: prefix + '/enrollmentRegistration/updateSocialCardStatusById',
-			method: 'post',
-			data: param
-		})
+			url: prefix + "/enrollmentRegistration/updateKeyCardStatusById",
+			method: "post",
+			data: param,
+		});
 	},
-	updateKeyCardStatusById (param) {
+	updateRiceCardStatusById(param) {
 		return request({
-			url: prefix + '/enrollmentRegistration/updateKeyCardStatusById',
-			method: 'post',
-			data: param
-		})
+			url: prefix + "/enrollmentRegistration/updateRiceCardStatusById",
+			method: "post",
+			data: param,
+		});
 	},
-	updateRiceCardStatusById (param) {
+	remove(id) {
 		return request({
-			url: prefix + '/enrollmentRegistration/updateRiceCardStatusById',
-			method: 'post',
-			data: param
-		})
+			url: prefix + "/enrollmentRegistration/remove",
+			method: "get",
+			params: { id: id },
+		});
 	},
-	remove (id) {
+	delByUserId(id) {
 		return request({
-			url: prefix + '/enrollmentRegistration/remove',
-			method: 'get',
-			params: {id: id}
-		})
+			url: prefix + "/enrollmentRegistration/delByUserId",
+			method: "get",
+			params: { id: id },
+		});
 	},
-	delByUserId (id) {
+	findIdCardOnly(idCard) {
 		return request({
-			url: prefix + '/enrollmentRegistration/delByUserId',
-			method: 'get',
-			params: {id: id}
-		})
+			url: prefix + "/enrollmentRegistration/findIdCardOnly",
+			method: "get",
+			params: { idCard: idCard },
+		});
 	},
-	findIdCardOnly (idCard) {
+	findMobilePhoneOnly(mobilePhone) {
 		return request({
-			url: prefix + '/enrollmentRegistration/findIdCardOnly',
-			method: 'get',
-			params: {idCard: idCard}
-		})
+			url: prefix + "/enrollmentRegistration/findMobilePhoneOnly",
+			method: "get",
+			params: { mobilePhone: mobilePhone },
+		});
 	},
-	findMobilePhoneOnly (mobilePhone) {
+	findByUserId(userId) {
 		return request({
-			url: prefix + '/enrollmentRegistration/findMobilePhoneOnly',
-			method: 'get',
-			params: {mobilePhone: mobilePhone}
-		})
+			url: prefix + "/enrollmentRegistration/findByUserId",
+			method: "get",
+			params: { userId: userId },
+		});
 	},
-	findByUserId (userId) {
+	findInfoByUserId(userId) {
 		return request({
-			url: prefix + '/enrollmentRegistration/findByUserId',
-			method: 'get',
-			params: {userId: userId}
-		})
+			url: prefix + "/enrollmentRegistration/findInfoByUserId",
+			method: "get",
+			params: { userId: userId },
+		});
 	},
-	downloadFile () {
+	downloadFile() {
 		return request({
-			url: prefix + '/enrollmentRegistration/downloadFile',
-			method: 'get',
+			url: prefix + "/enrollmentRegistration/downloadFile",
+			method: "get",
 			params: {},
-			responseType: 'blob'
-		})
+			responseType: "blob",
+		});
 	},
-	downloadDepartFile (handoverId) {
+	downloadDepartFile(handoverId) {
 		return request({
-			url: prefix + '/enrollmentRegistration/downloadDepartFile',
-			method: 'get',
-			params: {handoverId: handoverId},
-			responseType: 'blob'
-		})
+			url: prefix + "/enrollmentRegistration/downloadDepartFile",
+			method: "get",
+			params: { handoverId: handoverId },
+			responseType: "blob",
+		});
 	},
 	exportTemplate() {
 		return request({
 			url: prefix + "/enrollmentRegistration/import/template",
 			method: "get",
-			responseType: "blob"
+			responseType: "blob",
 		});
 	},
 	importExcel(data) {
@@ -208,4 +215,4 @@ export default {
 			responseType: "blob",
 		});
 	},
-}
+};

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

@@ -1130,15 +1130,18 @@ export default {
 							this.gsFileList2.push(file)
 						})
 					}
-					roleService.list2(this.inputForm.department).then((data) => {
-						this.roleList = data
-					})
-					console.log('123', this.inputForm.department)
-					postService.list2(this.inputForm.department).then((data) => {
-						this.postList = data
-						console.log('this.postList', this.postList)
+					if (this.inputForm.type == 5) {
+						roleService.list2(this.inputForm.department).then((data) => {
+							this.roleList = data
+						})
+						postService.list2(this.inputForm.department).then((data) => {
+							this.postList = data
+							console.log('this.postList', this.postList)
+
+						})
+					}
+
 
-					})
 					this.loading = false
 				})
 

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

@@ -166,6 +166,10 @@
 
 								<vxe-column title="操作" width="300px" fixed="right" align="center">
 									<template #default="scope">
+										<el-button
+											v-if="hasPermission('enrollmentRegistration:edit') && (scope.row.type === '2')"
+											text type="primary" @click="reback(scope.row)">撤回</el-button>
+
 										<el-button v-if="(hasPermission('enrollmentRegistration:editPw')) &&
 											(scope.row.type === '5' || scope.row.type === '4' || scope.row.type === '3')" text type="primary" @click="
 												editPw(scope.row)">修改密码</el-button>
@@ -558,6 +562,21 @@ export default {
 				})
 			})
 		},
+		// 撤回流程
+		reback(row) {
+			this.$confirm(`确定撤回流程吗?`, '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then(() => {
+				processService.deleteProcIns(row.procInsId).then(async () => {
+					let param = { type: '3', id: row.id }
+					await enrollmentRegistrationService.updateStatusById(param)
+					this.$message.success('撤回成功')
+					this.refreshList()
+				})
+			})
+		},
 	}
 }
 </script>