修改

src/components/headerDetail.vue

@@ -32,7 +32,7 @@
 				</div>
 			</li>
 			<li class="tip">
-				<img src="../assets/images/tishi.png">
+				<img style="margin-top: 5px;" src="../assets/images/tishi.png">
 				<span style="vertical-align: sub;color: #ec3321">涉密信息请勿上传或进行脱密处理!</span>
 			</li>
 		</ul>

src/views/AddTask.vue

@@ -260,7 +260,7 @@
 				})
 			},
 			change(val) {
-				console.log(val)
+				// console.log(val)
 			},
 			submitForm(formName, sta) {
 				// alert(this.content);

src/views/ConsumerDetails.vue

@@ -177,13 +177,13 @@
 				this.$axios.getRole().then((res) => {
 					console.log(res.data)
 					if (res.request.status === 200) {
-						// let obj = {authorities:[],
-						// 	departmentId: '',
-						// 	description: "",
-						// 	id: "",
-						// 	isLeader: "",
-						// 	name: "无"}
-						// res.data.push(obj)
+						let obj = {authorities:[],
+							departmentId: '',
+							description: "",
+							id: "无",
+							isLeader: "",
+							name: "无"}
+						res.data.push(obj)
 						this.roleList = res.data;
 					}
 				})
@@ -223,6 +223,7 @@
 						obj.roles = newArr;
 						obj.phone1 = obj.phone1 + '';
 						obj.phone2 = obj.phone2 + '';
+						console.log(obj)
 						this.$refs[formName].validate((valid) => {
 							if (valid) {
 								this.$axios.putUsers(obj).then((res) => {
@@ -277,6 +278,9 @@
 				data.roles.forEach((v, i) => {
 					roles.push(v.id);
 				})
+				if (roles.length === 0) {
+					roles = ['无']
+				}
 				that.userForm.roles = roles;
 			}, 300)
 		},

src/views/CreateConsumer.vue

@@ -82,7 +82,7 @@
 								<el-form-item class="first" label="岗位" prop="jobs">
 									<el-input v-model="createForm.jobs"></el-input>
 								</el-form-item>
-								<el-form-item label="角色" prop="role">
+								<el-form-item label="角色" prop="roles">
 									<el-select v-model="createForm.roles" @change="roleChange" multiple placeholder="请选择角色">
 										<el-option
 														v-for="item in roleList"
@@ -122,7 +122,7 @@
 					if (phoneReg.test(value)) {
 						callback()
 					} else {
-						callback(new Error('电话2号码格式不正确'))
+						callback(new Error('电话1号码格式不正确'))
 					}
 				} else {
 					return callback(new Error('电话1号码不能为空'))
@@ -139,7 +139,7 @@
 						callback(new Error('电话2号码格式不正确'))
 					}
 				} else {
-					callback()
+					return callback(new Error('电话2号码不能为空'))
 				}
 			};
 //这里存放数据
@@ -201,9 +201,9 @@
 					entryTime: [
 						{ required: true, message: '请选择入职时间', trigger: 'change' }
 					],
-					// roles: [
-					// 	{ type: 'array', required: true, message: '请选择角色', trigger: 'change' },
-					// ],
+					roles: [
+						{ type: 'array', required: true, message: '请选择角色', trigger: 'change' },
+					],
 				},
 				roleList: [
 					{label: '研发总部经理', value: 1},

src/views/TaskDetails.vue

@@ -129,6 +129,27 @@
 				</div>
 			</el-dialog>
 		</div>
+		<div>
+			<el-dialog title="审核不通过" :show-close="false" :append-to-body="true" :close-on-click-modal="false" :close-on-press-escape="false" :lock-scroll="true" :visible.sync="dialogTaskFailVisible">
+				<div slot="title" class="header-title">
+					<span class="dialogHeader">审核不通过</span>
+					<img @click="closeFailTaskDialog()" class="dialogHeaderClose" src="../assets/images/modal-gb.png" />
+				</div>
+				<div style="text-align: left;margin-top: 80px;">
+					<span >审核不通过说明：</span>
+					<el-input
+									type="textarea"
+									:rows="2"
+									style="margin-top: 30px;"
+									placeholder="请输入审核不通过说明"
+									v-model="failTaskTextarea">
+					</el-input>
+				</div>
+				<div class="btnStyle">
+					<el-button type="primary" @click="failTaskSubmit('ongoing')">确定</el-button>
+				</div>
+			</el-dialog>
+		</div>
 		<div>
 			<el-dialog title="任务提交" :show-close="false" :append-to-body="true" :close-on-click-modal="false" :close-on-press-escape="false" :lock-scroll="true" :visible.sync="dialogTaskSubmitVisible">
 				<div slot="title" class="header-title">
@@ -365,6 +386,7 @@
 				dialogViewTaskEvaVisible: false,  // 查看考评弹框
 				dialogViewTaskFileVisible: false,  // 查看附件弹框
 				dialogDeleteTaskVisible: false, // 删除任务弹框
+				dialogTaskFailVisible: false, // 审核不通过弹框
 				taskForm: {
 					attachment: [],
 					completeTime: '',
@@ -405,6 +427,7 @@
 				changeTaskTextarea: '',
 				submitTaskTextarea: '',
 				withdrawTaskTextarea: '',
+				failTaskTextarea: '', // 审核不通过
 				evaForm:{
 					score1: '',
 					score2: '',
@@ -856,23 +879,47 @@
 					}
 				})
 			},
+			closeFailTaskDialog() {
+				this.dialogTaskFailVisible = false;
+			},
+			failTaskSubmit(val) {
+				let obj = {
+					msg: this.failTaskTextarea,
+					status: val,
+					workId: this.taskListData.workId,
+					userId: this.userDetail.id
+				}
+				this.$axios.putTaskStatus(obj).then((res) => {
+					console.log(res)
+					this.$message({
+						message: '审核不通过!',
+						type: 'success'
+					});
+					this.getDetailsTask(this.taskListData.workId);
+					this.failTaskTextarea = '';
+				})
+			},
 			reviewBtnClick(val, formName) {
 				this.$refs[formName].validate((valid) => {
 					if (valid) {
-						let obj = {
-							msg: '',
-							status: val,
-							workId: this.taskListData.workId,
-							userId: this.userDetail.id
+						if (val === 'ongoing') {
+							this.dialogTaskFailVisible = true;
+						} else {
+							let obj = {
+								msg: '',
+								status: val,
+								workId: this.taskListData.workId,
+								userId: this.userDetail.id
+							}
+							this.$axios.putTaskStatus(obj).then((res) => {
+								console.log(res)
+								this.$message({
+									message: '审核通过!',
+									type: 'success'
+								});
+								this.getDetailsTask(this.taskListData.workId);
+							})
 						}
-						this.$axios.putTaskStatus(obj).then((res) => {
-							console.log(res)
-							this.$message({
-								message: '审核任务成功!',
-								type: 'success'
-							});
-							this.getDetailsTask(this.taskListData.workId);
-						})
 					} else {
 						console.log('error submit!!');
 						return false;