Merge branch 'develop' into FOTON
This commit is contained in:
@@ -2733,29 +2733,22 @@
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
if (res) {
|
||||
const processForm = JSON.parse(res.mesg)
|
||||
if (processForm.form === undefined) {
|
||||
this.getFormFieldList(processForm)
|
||||
} else {
|
||||
//表单文件处理
|
||||
this.getTaskId(processForm)
|
||||
if(res.nowTaskInfo && res.nowTaskInfo === '发布'){
|
||||
const processForm = JSON.parse(res.mesg)
|
||||
if (processForm.form === undefined) {
|
||||
this.getFormFieldList(processForm)
|
||||
} else {
|
||||
//表单文件处理
|
||||
this.getTaskId(processForm)
|
||||
}
|
||||
}else {
|
||||
this.$alert('当前任务'+(res.nowTaskInfo ?res.nowTaskInfo:"")+'不是发布节点,禁止跨路由访问当前页面', '', {
|
||||
confirmButtonText: '确定',
|
||||
callback: action => {
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
}
|
||||
});
|
||||
}
|
||||
// if(res.nowTaskInfo && res.nowTaskInfo === '发布'){
|
||||
// const processForm = JSON.parse(res.mesg)
|
||||
// if (processForm.form === undefined) {
|
||||
// this.getFormFieldList(processForm)
|
||||
// } else {
|
||||
// //表单文件处理
|
||||
// this.getTaskId(processForm)
|
||||
// }
|
||||
// }else {
|
||||
// this.$alert('当前任务'+(res.nowTaskInfo ?res.nowTaskInfo:"")+'不是发布节点,禁止跨路由访问当前页面', '', {
|
||||
// confirmButtonText: '确定',
|
||||
// callback: action => {
|
||||
// this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
}
|
||||
}).catch(e => {
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user