入职登记修改新增岗位和角色,中审项目登记项目经理查询项调整

src/api/sys/postService.js

@@ -33,4 +33,11 @@ export default {
 			params: params,
 		});
 	},
+	list2: function (department) {
+		return request({
+			url: prefix + "/sys/post/list2",
+			method: "get",
+			params: {department:department},
+		});
+	},
 };

src/api/sys/roleService.js

@@ -41,6 +41,13 @@ export default {
 			params: params,
 		});
 	},
+	list2: function (department) {
+		return request({
+			url: prefix + "/sys/role/list2",
+			method: "get",
+			params:{department:department},
+		});
+	},
 	assign: function (params) {
 		return request({
 			url: prefix + "/sys/role/assign",

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

@@ -203,7 +203,7 @@
 						</el-row>
 						<el-divider content-position="left"><i class="el-icon-document"></i> 部门信息</el-divider>
 						<el-row :gutter="26">
-							<el-form v-if="status === 'audit'" style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
+							<el-form v-if="status === 'audit'" style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'"
 									 label-width="110px" @submit.native.prevent>
 								<el-row :gutter="26">
 									<el-col :span="12">
@@ -240,6 +240,46 @@
 										</el-form-item>
 									</el-col>
 									<el-col :span="12">
+										<el-form-item label="岗位" prop="postIdList" :rules="[]">
+											<el-select
+												v-model="inputForm.postIdList"
+												style="width: 100%"
+												multiple
+												placeholder="请选择"
+											>
+												<el-option
+													v-for="item in postList"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												>
+												</el-option>
+											</el-select>
+										</el-form-item>
+									</el-col>
+									<el-col :span="12">
+										<el-form-item
+											label="角色"
+											prop="roleIdList"
+											:rules="[{required: true, message: '角色不能为空', trigger: 'change'}]"
+										>
+											<el-select
+												v-model="inputForm.roleIdList"
+												style="width: 100%"
+												multiple
+												placeholder="请选择"
+											>
+												<el-option
+													v-for="role in roleList"
+													:key="role.id"
+													:label="role.name"
+													:value="role.id"
+												>
+												</el-option>
+											</el-select>
+										</el-form-item>
+									</el-col>
+									<el-col :span="12">
 										<el-form-item label="进所日期" prop="entryDate" :rules="[
                   {required: true, message:'请填写进所日期', trigger: 'blur'}
                ]">
@@ -280,7 +320,7 @@
 									</el-col>
 								</el-row>
 							</el-form>
-							<el-form v-else-if="inputForm.type !== '0'" style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
+							<el-form v-else-if="inputForm.type !== '0'" style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''" :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'"
 
 									 label-width="110px" @submit.native.prevent>
 								<el-row :gutter="26">
@@ -316,6 +356,46 @@
 										</el-form-item>
 									</el-col>
 									<el-col :span="12">
+										<el-form-item label="岗位" prop="postIdList" :rules="[]">
+											<el-select
+												v-model="inputForm.postIdList"
+												style="width: 100%"
+												multiple
+												placeholder="请选择"
+											>
+												<el-option
+													v-for="item in postList"
+													:key="item.id"
+													:label="item.name"
+													:value="item.id"
+												>
+												</el-option>
+											</el-select>
+										</el-form-item>
+									</el-col>
+									<el-col :span="12">
+										<el-form-item
+											label="角色"
+											prop="roleIdList"
+											:rules="[{required: true, message: '角色不能为空', trigger: 'change'}]"
+										>
+											<el-select
+												v-model="inputForm.roleIdList"
+												style="width: 100%"
+												multiple
+												placeholder="请选择"
+											>
+												<el-option
+													v-for="role in roleList"
+													:key="role.id"
+													:label="role.name"
+													:value="role.id"
+												>
+												</el-option>
+											</el-select>
+										</el-form-item>
+									</el-col>
+									<el-col :span="12">
 										<el-form-item label="进所日期" prop="entryDate" :rules="[
                ]">
 											<el-date-picker
@@ -667,10 +747,10 @@
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-divider content-position="left"><i class="el-icon-document"></i> 工商银行卡信息</el-divider>
+						<el-divider content-position="left"><i class="el-icon-document"></i> 招商银行卡信息</el-divider>
 						<el-row :gutter="26">
 							<el-col :span="12">
-								<el-form-item label="工商银行卡号" prop="gsBankCardNumber">
+								<el-form-item label="招商银行卡号" prop="gsBankCardNumber">
 									<el-input v-model="inputForm.gsBankCardNumber" @change="checkBankNumber(inputForm.gsBankCardNumber,'gs')" maxlength="19"></el-input>
 								</el-form-item>
 							</el-col>
@@ -791,7 +871,8 @@
 		fileName,
 		toHref,
 	} from '@/api/sys/OSSService'
-
+	import postService from "@/api/sys/postService";
+	import roleService from "@/api/sys/roleService";
 	export default {
 		props: {
 			businessId: {
@@ -837,6 +918,7 @@
 				loading: false,
 				showViewer: false,
 				inputForm: {
+					wageCardId: '',//银行卡信息id
 					zxBankCardNumber: '',//银行卡信息
 					zxAccountHolder: '',
 					accountHolderFront: '',
@@ -886,8 +968,12 @@
 					socialSecurityPictureFrontUrl: '',
 					socialSecurityPictureOpposite: '',
 					socialSecurityPictureOppositeUrl: '',
+					roleIdList: [],
+					postIdList: [],
 				},
 				keyWatch: '',
+				roleList:[],
+				postList:[],
 			}
 		},
 		created () {
@@ -990,6 +1076,7 @@
 			init (method, id) {
 				this.method = method
 				this.inputForm = {
+					wageCardId: '',//银行卡信息id
 					zxBankCardNumber: '',//银行卡信息
 					zxAccountHolder: '',
 					accountHolderFront: '',
@@ -1038,6 +1125,8 @@
 					socialSecurityPictureFrontUrl: '',
 					socialSecurityPictureOpposite: '',
 					socialSecurityPictureOppositeUrl: '',
+					roleIdList: [],
+					postIdList: [],
 				}
 				if (method === 'add') {
 					this.title = `新建入职登记`
@@ -1058,7 +1147,14 @@
 							method = 'view'
 						}
 						this.inputForm = this.recover(this.inputForm, data)
+						console.log('this.inputForm',this.inputForm)
 						this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+						if (this.commonJS.isEmpty(this.inputForm.roleIdList)){
+							this.inputForm.roleIdList = []
+						}
+						if (this.commonJS.isEmpty(this.inputForm.postIdList)){
+							this.inputForm.postIdList = []
+						}
 						if (this.commonJS.isNotEmpty(this.inputForm.socialSecurityPictureFront)){
 							await this.ossService.getTemporaryUrl(this.inputForm.socialSecurityPictureFront).then((data) => {
 								let file = {
@@ -1110,8 +1206,18 @@
 								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)
+
+						})
 						this.loading = false
 					})
+
 				})
 			},
 			// 表单提交
@@ -1393,6 +1499,7 @@
 				const fileIndex = this.bankFileList.indexOf(file);
 				if (fileIndex !== -1) {
 					this.bankFileList.splice(fileIndex, 1); // 从fileList中删除该图片信息
+					this.inputForm.accountHolderFront = ""
 				}
 			},
 			bankHandleUploadSuccess2(response, file,fileList) {
@@ -1422,6 +1529,7 @@
 				const fileIndex = this.bankFileList2.indexOf(file);
 				if (fileIndex !== -1) {
 					this.bankFileList2.splice(fileIndex, 1); // 从fileList中删除该图片信息
+					this.inputForm.accountHolderOpposite = ""
 				}
 			},
 			gsHandleUploadSuccess(response, file,fileList) {
@@ -1473,6 +1581,7 @@
 				const fileIndex = this.gsFileList.indexOf(file);
 				if (fileIndex !== -1) {
 					this.gsFileList.splice(fileIndex, 1); // 从fileList中删除该图片信息
+					this.inputForm.gsAccountHolderFront = ""
 				}
 			},
 			gsHandleRemove2(file, fileList) {
@@ -1481,6 +1590,7 @@
 				const fileIndex = this.gsFileList2.indexOf(file);
 				if (fileIndex !== -1) {
 					this.gsFileList2.splice(fileIndex, 1); // 从fileList中删除该图片信息
+					this.inputForm.gsAccountHolderOpposite = ""
 				}
 			},
 		}

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

@@ -126,10 +126,10 @@
 					</el-form-item>
 				</el-col>
 			</el-row>
-			<el-divider content-position="left"><i class="el-icon-document"></i> 工商银行卡信息</el-divider>
+			<el-divider content-position="left"><i class="el-icon-document"></i> 招商银行卡信息</el-divider>
 			<el-row :gutter="26">
 				<el-col :span="12">
-					<el-form-item label="工商银行卡号" prop="gsBankCardNumber" :rules="[{required: true, message: '工商银行卡号不能为空', trigger: 'blur'}]">
+					<el-form-item label="招商银行卡号" prop="gsBankCardNumber" :rules="[{required: true, message: '招商银行卡号不能为空', trigger: 'blur'}]">
 						<el-input v-model="inputForm.gsBankCardNumber" @change="checkBankNumber(inputForm.gsBankCardNumber,'gs')" maxlength="19"></el-input>
 					</el-form-item>
 				</el-col>