正在显示
1 个修改的文件
包含
24 行增加
和
20 行删除
@@ -267,7 +267,7 @@ | @@ -267,7 +267,7 @@ | ||
267 | </div> | 267 | </div> |
268 | </el-dialog> | 268 | </el-dialog> |
269 | 269 | ||
270 | - <el-dialog title="任务表单" :visible.sync="dialogTaskFormVisible" v-loading="dialogloading"> | 270 | + <el-dialog title="任务表单" :visible.sync="dialogTaskFormVisible" :loading="dialogloading1"> |
271 | <el-divider content-position="left">已提交表单</el-divider> | 271 | <el-divider content-position="left">已提交表单</el-divider> |
272 | <el-row> | 272 | <el-row> |
273 | <el-col :span="12" v-for="(item,index) in AllTaskFormInfoData" :key="item.id"> | 273 | <el-col :span="12" v-for="(item,index) in AllTaskFormInfoData" :key="item.id"> |
@@ -338,6 +338,7 @@ | @@ -338,6 +338,7 @@ | ||
338 | dialogFormVisible: false, | 338 | dialogFormVisible: false, |
339 | dialogTaskFormVisible: false, | 339 | dialogTaskFormVisible: false, |
340 | dialogloading: false, | 340 | dialogloading: false, |
341 | + dialogloading1: false, | ||
341 | sysUserName:'', | 342 | sysUserName:'', |
342 | total:0, | 343 | total:0, |
343 | tableData: [], | 344 | tableData: [], |
@@ -439,43 +440,46 @@ | @@ -439,43 +440,46 @@ | ||
439 | this.dialogloading = false; | 440 | this.dialogloading = false; |
440 | }); | 441 | }); |
441 | }, | 442 | }, |
443 | + //获取工单中已完成任务的表单数据的promise | ||
444 | + getProcessFormInfoPromise(index,row){ | ||
445 | + // this.dialogloading1 = true; | ||
446 | + this.dialogTaskFormVisible = true | ||
447 | + let _this = this; | ||
448 | + this.getProcessFormInfo(index,row).then(data =>{ | ||
449 | + _this.getFormDefine(index,row) | ||
450 | + _this.dialogloading1 = false; | ||
451 | + }).catch(err => { | ||
452 | + _this.$message.error(err) | ||
453 | + _this.dialogloading1 = false; | ||
454 | + }) | ||
455 | + }, | ||
442 | // 提交任务 | 456 | // 提交任务 |
443 | handleTask(paras){ | 457 | handleTask(paras){ |
444 | - this.dialogloading = true; | 458 | + this.dialogloading1 = true; |
445 | let _this=this | 459 | let _this=this |
446 | this.submitTaskParm.variables = paras | 460 | this.submitTaskParm.variables = paras |
447 | handleTask(this.submitTaskParm).then(response =>{ | 461 | handleTask(this.submitTaskParm).then(response =>{ |
448 | const res = response.data | 462 | const res = response.data |
449 | if (res.code != '200') { | 463 | if (res.code != '200') { |
464 | + this.dialogloading1 = false; | ||
465 | + this.dialogTaskFormVisible = false | ||
450 | return _this.$message.error('获取记录失败!') | 466 | return _this.$message.error('获取记录失败!') |
451 | } | 467 | } |
452 | - _this.$message.success("任务完成"+res.msg); | ||
453 | - _this.dialogTaskFormVisible = false | 468 | + this.$message.success("任务完成"+res.msg); |
469 | + this.dialogTaskFormVisible = false | ||
470 | + this.dialogloading1 = false; | ||
454 | _this.geMyTask() | 471 | _this.geMyTask() |
455 | - this.dialogloading = false; | ||
456 | }).catch(err=>{ | 472 | }).catch(err=>{ |
457 | _this.$message.error("失败"+err); | 473 | _this.$message.error("失败"+err); |
458 | - this.dialogTaskFormVisible = false | ||
459 | - this.dialogloading = false; | 474 | + _this.dialogTaskFormVisible = false |
475 | + _this.dialogloading1 = false; | ||
460 | }) | 476 | }) |
461 | }, | 477 | }, |
462 | //我发起的任务 | 478 | //我发起的任务 |
463 | getMyList(){ | 479 | getMyList(){ |
464 | 480 | ||
465 | }, | 481 | }, |
466 | - //获取工单中已完成任务的表单数据的promise | ||
467 | - getProcessFormInfoPromise(index,row){ | ||
468 | - this.dialogloading = true; | ||
469 | - this.dialogTaskFormVisible = true | ||
470 | - let _this = this; | ||
471 | - this.getProcessFormInfo(index,row).then(data =>{ | ||
472 | - _this.getFormDefine(index,row) | ||
473 | - _this.dialogloading = false; | ||
474 | - }).catch(err => { | ||
475 | - _this.$message.error(err) | ||
476 | - _this.dialogloading = false; | ||
477 | - }) | ||
478 | - }, | 482 | + |
479 | //获取工单中已完成任务的表单数据 | 483 | //获取工单中已完成任务的表单数据 |
480 | getProcessFormInfo(index,row){ | 484 | getProcessFormInfo(index,row){ |
481 | let _this = this; | 485 | let _this = this; |
-
请 注册 或 登录 后发表评论