Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
super_liu
2022-04-11 16:37:50 +08:00
@@ -400,6 +400,7 @@ export default {
if(!this.commentText){ if(!this.commentText){
this.$message.warning('请填写审批意见') this.$message.warning('请填写审批意见')
}else{ }else{
this.isSubmit = true
this.listForm.approvalOpinion = "1"; this.listForm.approvalOpinion = "1";
this.saveLoading = true this.saveLoading = true
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
@@ -416,12 +417,14 @@ export default {
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.saveLoading = false this.saveLoading = false
this.isSubmit = false
}); });
}/**/ }/**/
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true;
this.listForm.approvalOpinion = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -432,8 +435,8 @@ export default {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message);
this.$router.push('/processCenter') this.$router.push("/processCenter");
} }
this.isSubmit = false this.isSubmit = false
}); });