WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改已知bug

Browse Source
This commit is contained in:
qq787203167
2022-08-10 17:19:11 +08:00
parent 68bc939e42
commit 0f3bcd0b96
7 changed files with 71 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+15 -2
View File
@@ -350,13 +350,23 @@
}
postAction('/workFlow/startProcess', query).then((res) => {
if (res.success) {
this.completeTask(value, res.result)
this.completeTask(value, res.result, true)
} else {
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 = {
userid: this.userInfo().id,
taskId: taskId,
@@ -375,6 +385,9 @@
} else {
this.JLoading = false
this.$message.warning(this.$t('operationFailed'))
if (isTrue) {
this.deleteProcessInstanceByTask(taskId)
}
}
})
}
jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+6
View File
@@ -564,6 +564,12 @@
})
},
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 = {
userid: this.userInfo().id,
taskId: taskId,
jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+8 -1
View File
@@ -307,11 +307,18 @@
}
},
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 = {
userid: this.userInfo().id,
taskId: this.$route.query.taskIds,
flag: this.queryProject.flag,
json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
json: JSON.stringify(value).replace(/\"/g, '\'')
}
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+22 -3
View File
@@ -186,6 +186,12 @@
completeTask(value, handlingTime) {
let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value)
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 = {
userid: this.userInfo().id,
taskId: this.$route.query.taskId || this.$route.query.taskIds,
@@ -248,15 +254,24 @@
}
postAction('/workFlow/startProcess', query).then((res) => {
if (res.success) {
this.completeTaskDesign(value, res.result)
this.completeTaskDesign(value, res.result,true)
}
})
},
completeTaskDesign(value, taskId) {
deleteProcessInstanceByTask(taskId) {
getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => {
})
},
completeTaskDesign(value, taskId,isTrue) {
value.reviewResult = 'launch'
let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
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 = {
userid: this.userInfo().id,
taskId: taskId,
@@ -272,6 +287,10 @@
// this.$router.push({
// path: '/ProcessCenter'
// })
}else{
if (isTrue) {
this.deleteProcessInstanceByTask(taskId)
}
}
})
},
jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+8 -1
View File
@@ -171,10 +171,17 @@
// this.insertBatch(dataList, 2)
},
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 = {
userid: this.userInfo().id,
taskId: this.$route.query.taskIds,
json: JSON.stringify(this.queryProject).replace(/\"/g, '\'')
json: JSON.stringify(value).replace(/\"/g, '\'')
}
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+6
View File
@@ -342,6 +342,12 @@
completeTask(value) {
let json = Object.assign(this.queryBy, value)
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 = {
userid: this.userInfo().id,
taskId: this.$route.query.taskId || this.$route.query.taskIds,
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+6
View File
@@ -1697,6 +1697,12 @@
completeTask(value, taskId, index) {
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
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 = {
userid: this.userInfo().id,
taskId: taskId,