修改已知bug
This commit is contained in:
+15
-2
@@ -350,13 +350,23 @@
|
|||||||
}
|
}
|
||||||
postAction('/workFlow/startProcess', query).then((res) => {
|
postAction('/workFlow/startProcess', query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.completeTask(value, res.result)
|
this.completeTask(value, res.result, true)
|
||||||
} else {
|
} else {
|
||||||
this.JLoading = false
|
this.JLoading = false
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
completeTask(value, taskId) {
|
deleteProcessInstanceByTask(taskId) {
|
||||||
|
getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => {
|
||||||
|
})
|
||||||
|
},
|
||||||
|
completeTask(value, taskId, isTrue) {
|
||||||
|
Object.keys(value).forEach(res => {
|
||||||
|
if (value[res] && value[res] instanceof String) {
|
||||||
|
value[res] = value[res].replace(/\"/g, '“')
|
||||||
|
value[res] = value[res].replace(/\'/g, '‘')
|
||||||
|
}
|
||||||
|
})
|
||||||
let query = {
|
let query = {
|
||||||
userid: this.userInfo().id,
|
userid: this.userInfo().id,
|
||||||
taskId: taskId,
|
taskId: taskId,
|
||||||
@@ -375,6 +385,9 @@
|
|||||||
} else {
|
} else {
|
||||||
this.JLoading = false
|
this.JLoading = false
|
||||||
this.$message.warning(this.$t('operationFailed'))
|
this.$message.warning(this.$t('operationFailed'))
|
||||||
|
if (isTrue) {
|
||||||
|
this.deleteProcessInstanceByTask(taskId)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
+6
@@ -564,6 +564,12 @@
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
completeTask(value, taskId) {
|
completeTask(value, taskId) {
|
||||||
|
Object.keys(value).forEach(res => {
|
||||||
|
if (value[res] && value[res] instanceof String) {
|
||||||
|
value[res] = value[res].replace(/\"/g, '“')
|
||||||
|
value[res] = value[res].replace(/\'/g, '‘')
|
||||||
|
}
|
||||||
|
})
|
||||||
let query = {
|
let query = {
|
||||||
userid: this.userInfo().id,
|
userid: this.userInfo().id,
|
||||||
taskId: taskId,
|
taskId: taskId,
|
||||||
|
|||||||
@@ -307,11 +307,18 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
completeTask() {
|
completeTask() {
|
||||||
|
let value = JSON.parse(JSON.stringify(this.queryProject))
|
||||||
|
Object.keys(value).forEach(res => {
|
||||||
|
if (value[res] && value[res] instanceof String) {
|
||||||
|
value[res] = value[res].replace(/\"/g, '“')
|
||||||
|
value[res] = value[res].replace(/\'/g, '‘')
|
||||||
|
}
|
||||||
|
})
|
||||||
let query = {
|
let query = {
|
||||||
userid: this.userInfo().id,
|
userid: this.userInfo().id,
|
||||||
taskId: this.$route.query.taskIds,
|
taskId: this.$route.query.taskIds,
|
||||||
flag: this.queryProject.flag,
|
flag: this.queryProject.flag,
|
||||||
json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
|
json: JSON.stringify(value).replace(/\"/g, '\'')
|
||||||
}
|
}
|
||||||
postAction('/workFlow/completeTask', query).then((res) => {
|
postAction('/workFlow/completeTask', query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|||||||
@@ -186,6 +186,12 @@
|
|||||||
completeTask(value, handlingTime) {
|
completeTask(value, handlingTime) {
|
||||||
let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value)
|
let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value)
|
||||||
let data = JSON.stringify(json).replace(/\"/g, '\'')
|
let data = JSON.stringify(json).replace(/\"/g, '\'')
|
||||||
|
Object.keys(data).forEach(res => {
|
||||||
|
if (data[res] && data[res] instanceof String) {
|
||||||
|
data[res] = data[res].replace(/\"/g, '“')
|
||||||
|
data[res] = data[res].replace(/\'/g, '‘')
|
||||||
|
}
|
||||||
|
})
|
||||||
let query = {
|
let query = {
|
||||||
userid: this.userInfo().id,
|
userid: this.userInfo().id,
|
||||||
taskId: this.$route.query.taskId || this.$route.query.taskIds,
|
taskId: this.$route.query.taskId || this.$route.query.taskIds,
|
||||||
@@ -248,15 +254,24 @@
|
|||||||
}
|
}
|
||||||
postAction('/workFlow/startProcess', query).then((res) => {
|
postAction('/workFlow/startProcess', query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.completeTaskDesign(value, res.result)
|
this.completeTaskDesign(value, res.result,true)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
deleteProcessInstanceByTask(taskId) {
|
||||||
completeTaskDesign(value, taskId) {
|
getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => {
|
||||||
|
})
|
||||||
|
},
|
||||||
|
completeTaskDesign(value, taskId,isTrue) {
|
||||||
value.reviewResult = 'launch'
|
value.reviewResult = 'launch'
|
||||||
let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
|
let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
|
||||||
value.operatorTime = operatorTime
|
value.operatorTime = operatorTime
|
||||||
|
Object.keys(value).forEach(res => {
|
||||||
|
if (value[res] && value[res] instanceof String) {
|
||||||
|
value[res] = value[res].replace(/\"/g, '“')
|
||||||
|
value[res] = value[res].replace(/\'/g, '‘')
|
||||||
|
}
|
||||||
|
})
|
||||||
let query = {
|
let query = {
|
||||||
userid: this.userInfo().id,
|
userid: this.userInfo().id,
|
||||||
taskId: taskId,
|
taskId: taskId,
|
||||||
@@ -272,6 +287,10 @@
|
|||||||
// this.$router.push({
|
// this.$router.push({
|
||||||
// path: '/ProcessCenter'
|
// path: '/ProcessCenter'
|
||||||
// })
|
// })
|
||||||
|
}else{
|
||||||
|
if (isTrue) {
|
||||||
|
this.deleteProcessInstanceByTask(taskId)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -171,10 +171,17 @@
|
|||||||
// this.insertBatch(dataList, 2)
|
// this.insertBatch(dataList, 2)
|
||||||
},
|
},
|
||||||
completeTask() {
|
completeTask() {
|
||||||
|
let value = JSON.parse(JSON.stringify(this.queryProject))
|
||||||
|
Object.keys(value).forEach(res => {
|
||||||
|
if (value[res] && value[res] instanceof String) {
|
||||||
|
value[res] = value[res].replace(/\"/g, '“')
|
||||||
|
value[res] = value[res].replace(/\'/g, '‘')
|
||||||
|
}
|
||||||
|
})
|
||||||
let query = {
|
let query = {
|
||||||
userid: this.userInfo().id,
|
userid: this.userInfo().id,
|
||||||
taskId: this.$route.query.taskIds,
|
taskId: this.$route.query.taskIds,
|
||||||
json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
|
json: JSON.stringify(value).replace(/\"/g, '\'')
|
||||||
}
|
}
|
||||||
postAction('/workFlow/completeTask', query).then((res) => {
|
postAction('/workFlow/completeTask', query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|||||||
@@ -342,6 +342,12 @@
|
|||||||
completeTask(value) {
|
completeTask(value) {
|
||||||
let json = Object.assign(this.queryBy, value)
|
let json = Object.assign(this.queryBy, value)
|
||||||
let data = JSON.stringify(json).replace(/\"/g, '\'')
|
let data = JSON.stringify(json).replace(/\"/g, '\'')
|
||||||
|
Object.keys(value).forEach(res => {
|
||||||
|
if (value[res] && value[res] instanceof String) {
|
||||||
|
value[res] = value[res].replace(/\"/g, '“')
|
||||||
|
value[res] = value[res].replace(/\'/g, '‘')
|
||||||
|
}
|
||||||
|
})
|
||||||
let query = {
|
let query = {
|
||||||
userid: this.userInfo().id,
|
userid: this.userInfo().id,
|
||||||
taskId: this.$route.query.taskId || this.$route.query.taskIds,
|
taskId: this.$route.query.taskId || this.$route.query.taskIds,
|
||||||
|
|||||||
@@ -1697,6 +1697,12 @@
|
|||||||
completeTask(value, taskId, index) {
|
completeTask(value, taskId, index) {
|
||||||
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
|
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
|
||||||
value.handlingTime = handlingTime
|
value.handlingTime = handlingTime
|
||||||
|
Object.keys(value).forEach(res => {
|
||||||
|
if (value[res] && value[res] instanceof String) {
|
||||||
|
value[res] = value[res].replace(/\"/g, '“')
|
||||||
|
value[res] = value[res].replace(/\'/g, '‘')
|
||||||
|
}
|
||||||
|
})
|
||||||
let query = {
|
let query = {
|
||||||
userid: this.userInfo().id,
|
userid: this.userInfo().id,
|
||||||
taskId: taskId,
|
taskId: taskId,
|
||||||
|
|||||||
Reference in New Issue
Block a user