Browse Source

catch

master
蔡玲玲 2 weeks ago
parent
commit
c9fd1b032c
  1. 2
      base-vue/src/views/modules/car/car.vue
  2. 2
      base-vue/src/views/modules/client/client.vue
  3. 2
      base-vue/src/views/modules/contract/contract.vue
  4. 2
      base-vue/src/views/modules/deploy/flwdeploy.vue
  5. 2
      base-vue/src/views/modules/deploy/flwdeployprodef.vue
  6. 4
      base-vue/src/views/modules/flow/flwdemodel.vue
  7. 88
      base-vue/src/views/modules/instance/flwmycompleteinstance.vue
  8. 104
      base-vue/src/views/modules/instance/flwmyinstance.vue
  9. 70
      base-vue/src/views/modules/instance/flwtodoinstance.vue
  10. 2
      base-vue/src/views/modules/material/material.vue
  11. 2
      base-vue/src/views/modules/sys/notice.vue
  12. 2
      base-vue/src/views/modules/tickets/tickets.vue

2
base-vue/src/views/modules/car/car.vue

@ -196,7 +196,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
} }
} }
} }

2
base-vue/src/views/modules/client/client.vue

@ -189,7 +189,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
} }
} }
} }

2
base-vue/src/views/modules/contract/contract.vue

@ -216,7 +216,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
}, },
// //
addTempHandle (id) { addTempHandle (id) {

2
base-vue/src/views/modules/deploy/flwdeploy.vue

@ -154,7 +154,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
} }
} }
} }

2
base-vue/src/views/modules/deploy/flwdeployprodef.vue

@ -320,7 +320,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
} }
} }
} }

4
base-vue/src/views/modules/flow/flwdemodel.vue

@ -193,7 +193,7 @@
}) })
} }
}) })
}) }).catch(() => {})
}, },
// //
deleteHandle (id) { deleteHandle (id) {
@ -223,7 +223,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
} }
} }
} }

88
base-vue/src/views/modules/instance/flwmycompleteinstance.vue

@ -167,36 +167,39 @@
} }
this.dataListLoading = false this.dataListLoading = false
}) })
},approveHandle(id){ },
approveHandle(id){
this.id = id this.id = id
this.dialogVisible = true this.dialogVisible = true
},showFlowHandle(procInsId){ },
showFlowHandle(procInsId){
this.procInsId = procInsId this.procInsId = procInsId
// id // id
this.$http({ this.$http({
url: this.$http.adornUrl(`/flw/instance/getCompleteHiTaskInstance/${this.procInsId}`), url: this.$http.adornUrl(`/flw/instance/getCompleteHiTaskInstance/${this.procInsId}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dialogActiveVisible = true this.dialogActiveVisible = true
this.hiTasks = data.data this.hiTasks = data.data
} }
}) })
},submitFlowComplete(){ },
submitFlowComplete(){
// //
this.$http({ this.$http({
url: this.$http.adornUrl(`/flw/instance/completeFlow/${this.id}`), url: this.$http.adornUrl(`/flw/instance/completeFlow/${this.id}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dialogVisible = false this.dialogVisible = false
this.getDataList(); this.getDataList();
} }
}) })
},claimHandle(id){ },
claimHandle(id){
this.$confirm('确定要拾取当前的任务吗?', '提示', { this.$confirm('确定要拾取当前的任务吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -211,35 +214,24 @@
this.getDataList(); this.getDataList();
} }
}) })
}).catch(() => { }).catch(() => {})
this.$message({ },
type: 'info', unclaimHandle(id){
message: '已取消删除'
});
});
},unclaimHandle(id){
this.$confirm('确定要归还当前的任务吗?', '提示', { this.$confirm('确定要归还当前的任务吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl(`/flw/instance/unclaimTask/${id}`), url: this.$http.adornUrl(`/flw/instance/unclaimTask/${id}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList(); this.getDataList();
} }
}) })
}).catch(() => { }).catch(() => {})
this.$message({
type: 'info',
message: '已取消删除'
});
});
}, },
// //
sizeChangeHandle (val) { sizeChangeHandle (val) {
@ -284,7 +276,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
} }
} }
} }

104
base-vue/src/views/modules/instance/flwmyinstance.vue

@ -161,79 +161,71 @@
} }
this.dataListLoading = false this.dataListLoading = false
}) })
},approveHandle(id){ },
approveHandle(id){
this.id = id this.id = id
this.dialogVisible = true this.dialogVisible = true
},showFlowHandle(procInsId){ },
showFlowHandle(procInsId){
this.procInsId = procInsId this.procInsId = procInsId
// id // id
this.$http({ this.$http({
url: this.$http.adornUrl(`/flw/instance/getHiTaskInstance/${this.procInsId}`), url: this.$http.adornUrl(`/flw/instance/getHiTaskInstance/${this.procInsId}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dialogActiveVisible = true this.dialogActiveVisible = true
this.hiTasks = data.data this.hiTasks = data.data
} }
}) })
},submitFlowComplete(){ },
submitFlowComplete(){
// //
this.$http({ this.$http({
url: this.$http.adornUrl(`/flw/instance/completeFlow/${this.id}`), url: this.$http.adornUrl(`/flw/instance/completeFlow/${this.id}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dialogVisible = false this.dialogVisible = false
this.getDataList(); this.getDataList();
} }
}) })
},claimHandle(id){ },
claimHandle(id){
this.$confirm('确定要拾取当前的任务吗?', '提示', { this.$confirm('确定要拾取当前的任务吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl(`/flw/instance/claimTask/${id}`), url: this.$http.adornUrl(`/flw/instance/claimTask/${id}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList(); this.getDataList();
} }
}) })
}).catch(() => { }).catch(() => {})
this.$message({ },
type: 'info', unclaimHandle(id){
message: '已取消删除'
});
});
},unclaimHandle(id){
this.$confirm('确定要归还当前的任务吗?', '提示', { this.$confirm('确定要归还当前的任务吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl(`/flw/instance/unclaimTask/${id}`), url: this.$http.adornUrl(`/flw/instance/unclaimTask/${id}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList(); this.getDataList();
} }
}) })
}).catch(() => { }).catch(() => {})
this.$message({
type: 'info',
message: '已取消删除'
});
});
}, },
// //
sizeChangeHandle (val) { sizeChangeHandle (val) {
@ -278,7 +270,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
} }
} }
} }

70
base-vue/src/views/modules/instance/flwtodoinstance.vue

@ -171,26 +171,29 @@
} }
this.dataListLoading = false this.dataListLoading = false
}) })
},approveHandle(id){ },
approveHandle(id){
this.id = id this.id = id
this.dialogVisible = true this.dialogVisible = true
},showFlowHandle(procInsId){ },
showFlowHandle(procInsId){
this.procInsId = procInsId this.procInsId = procInsId
this.dialogActiveVisible = true this.dialogActiveVisible = true
},submitFlowComplete(){ },
submitFlowComplete(){
// //
this.$http({ this.$http({
url: this.$http.adornUrl(`/flw/instance/completeFlow/${this.id}`), url: this.$http.adornUrl(`/flw/instance/completeFlow/${this.id}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dialogVisible = false this.dialogVisible = false
this.getDataList(); this.getDataList();
} }
}) })
},claimHandle(id){ },
claimHandle(id){
this.$confirm('确定要拾取当前的任务吗?', '提示', { this.$confirm('确定要拾取当前的任务吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -205,35 +208,24 @@
this.getDataList(); this.getDataList();
} }
}) })
}).catch(() => { }).catch(() => {})
this.$message({ },
type: 'info', unclaimHandle(id){
message: '已取消删除'
});
});
},unclaimHandle(id){
this.$confirm('确定要归还当前的任务吗?', '提示', { this.$confirm('确定要归还当前的任务吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl(`/flw/instance/unclaimTask/${id}`), url: this.$http.adornUrl(`/flw/instance/unclaimTask/${id}`),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams()
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList(); this.getDataList();
} }
}) })
}).catch(() => { }).catch(() => {})
this.$message({
type: 'info',
message: '已取消删除'
});
});
}, },
// //
sizeChangeHandle (val) { sizeChangeHandle (val) {
@ -278,7 +270,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
} }
} }
} }

2
base-vue/src/views/modules/material/material.vue

@ -190,7 +190,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
} }
} }
} }

2
base-vue/src/views/modules/sys/notice.vue

@ -179,7 +179,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
} }
} }
} }

2
base-vue/src/views/modules/tickets/tickets.vue

@ -239,7 +239,7 @@
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
}) }).catch(() => {})
} }
} }
} }

Loading…
Cancel
Save