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

This commit is contained in:
super_liu
2022-02-15 11:29:22 +08:00
@@ -424,27 +424,38 @@ export default {
},
//提交
handleSubmit(){
let comFlag = false
this.dataList.map(item => {
delete item.termsConditions
})
this.listForm.commentText = this.commentText
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
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.$router.push('/processCenter')
this.dataList.forEach(item => {
if(item.implementer){
comFlag = true
return
}
this.isSubmit = false
}, e => {
});
})
if(!comFlag){
this.$message.warning('请选择落实人')
}else{
this.listForm.commentText = this.commentText
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
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.$router.push('/processCenter')
}
this.isSubmit = false
}, e => {
});
}
},
//确认转办
checkedRole (data) {