diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 52c1ecfc6..232df3c52 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -2657,61 +2657,106 @@ this.rules.commentText[0].required = true; } }, - handleSubmit() { - // this.getRule() - // const val= this.form.country; - // if (val !== '' && val !== null && typeof (val) !== 'undefined') { - // if (val instanceof Array) { - // this.form.country = val.join(","); - // } else { - // this.form.country = val - // } - // } else if (val === '') { - // this.form.country = [] - // } - this.$refs['form'].validate((valid) => { - if (valid) { - this.$refs['formTongGuo'].validate((valid) => { - if (valid) { - this.isSubmit = true - this.saveLoading = true - - // this.summary=this.summaryList.map(item => item.id).join(",") - // this.summaryName=this.summaryList.map(item => item.name).join(",") - - this.form.commentText = this.formTongGuo.commentText - // this.form.approvalOpinion = this.formTongGuo.approvalOpinion - // 会签意见存储 - const json = JSON.stringify(this.form); - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.taskIds, - userId : this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - // 流程提交之后,应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // if(this.formTongGuo.approvalOpinion === '1'){ - // this.$message.warning("驳回成功") - // this.isSubmit = false - // // 流程提交之后,应该流转至待办任务页面 - // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // }else{ - // this.processCreateLaws(json) - // } - }else { - this.$message.success(res.message) - } - }) - }}) - } + // handleSubmit() { + // // this.getRule() + // // const val= this.form.country; + // // if (val !== '' && val !== null && typeof (val) !== 'undefined') { + // // if (val instanceof Array) { + // // this.form.country = val.join(","); + // // } else { + // // this.form.country = val + // // } + // // } else if (val === '') { + // // this.form.country = [] + // // } + // this.$refs['form'].validate((valid) => { + // if (valid) { + // this.$refs['formTongGuo'].validate((valid) => { + // if (valid) { + // this.isSubmit = true + // this.saveLoading = true + // + // // this.summary=this.summaryList.map(item => item.id).join(",") + // // this.summaryName=this.summaryList.map(item => item.name).join(",") + // + // this.form.commentText = this.formTongGuo.commentText + // // this.form.approvalOpinion = this.formTongGuo.approvalOpinion + // // 会签意见存储 + // const json = JSON.stringify(this.form); + // this.$http.post('lawss/activiti/completeTask', { + // taskIds: this.taskIds, + // userId : this.userId, + // json: json + // }, { + // _this: this + // }, res => { + // if (res.success) { + // this.$message.success(res.message) + // // 流程提交之后,应该流转至待办任务页面 + // this.isSubmit = false + // this.saveLoading = false + // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + // // if(this.formTongGuo.approvalOpinion === '1'){ + // // this.$message.warning("驳回成功") + // // this.isSubmit = false + // // // 流程提交之后,应该流转至待办任务页面 + // // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + // // }else{ + // // this.processCreateLaws(json) + // // } + // }else { + // this.$message.success(res.message) + // } + // }) + // } + // }) + // } + // }) + // }, + verifyHandle(){ + this.$refs['form'].validate((valid) => { + if (valid) { + this.$refs['formTongGuo'].validate((valid) => { + if (valid) { + this.isSubmit = true + this.saveLoading = true + this.form.commentText = this.formTongGuo.commentText + const json = JSON.stringify(this.form); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId : this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + // 流程提交之后,应该流转至待办任务页面 + this.isSubmit = false + this.saveLoading = false + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + }else { + this.$message.success(res.message) + } + }) + } }) - }, + } + }) + }, + handleSubmit() { + if(this.form.modelData.length>0){ + this.verifyHandle(); + }else{ + this.$confirm('您暂未填写意见,如有意见,请选择取消,如无意见,请选择确认', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.verifyHandle(); + }).catch(() => {}); + } + }, busVsFunc(){ this.$http.get('sarVppsTree/list', '', { _this: this