修改握手流程时间传参
This commit is contained in:
@@ -209,7 +209,7 @@
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
completeTask(value, handlingTime) {
|
completeTask(value, handlingTime) {
|
||||||
let json = Object.assign({ handlingTime: handlingTime }, this.queryBy, value)
|
let json = Object.assign( this.queryBy,{ handlingTime: handlingTime }, value)
|
||||||
let data = JSON.stringify(json).replace(/\"/g, '\'')
|
let data = JSON.stringify(json).replace(/\"/g, '\'')
|
||||||
let query = {
|
let query = {
|
||||||
userid: this.userInfo().id,
|
userid: this.userInfo().id,
|
||||||
|
|||||||
@@ -810,17 +810,14 @@
|
|||||||
for (let j = 0; j < selectedRowKeys.length; j++) {
|
for (let j = 0; j < selectedRowKeys.length; j++) {
|
||||||
if (this.dataSource[i].id == selectedRowKeys[j]) {
|
if (this.dataSource[i].id == selectedRowKeys[j]) {
|
||||||
this.dataSource[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
|
this.dataSource[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
|
||||||
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
|
|
||||||
this.dataSource[i].handlingTime = handlingTime
|
|
||||||
Object.keys(this.dataSource[i]).forEach(res => {
|
Object.keys(this.dataSource[i]).forEach(res => {
|
||||||
if (this.dataSource[i][res] && this.dataSource[i][res] instanceof String) {
|
if (this.dataSource[i][res] && this.dataSource[i][res] instanceof String) {
|
||||||
this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“')
|
this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“')
|
||||||
this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘')
|
this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘')
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
let data = JSON.stringify(this.dataSource[i]).replace(/\"/g, '\'')
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.startProcess(data)
|
this.startProcess(this.dataSource[i])
|
||||||
}, 500)
|
}, 500)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -832,10 +829,10 @@
|
|||||||
startProcess(value) {
|
startProcess(value) {
|
||||||
let query = {
|
let query = {
|
||||||
type: 1,
|
type: 1,
|
||||||
msg: value,
|
msg: JSON.stringify(value).replace(/\"/g, '\''),
|
||||||
projectNameId:this.$route.query.projectNameId,
|
projectNameId: this.$route.query.projectNameId,
|
||||||
projectName:this.$route.query.projectName,
|
projectName: this.$route.query.projectName,
|
||||||
taskAffirmDueDate: this.formInline.taskAffirmDueDate,
|
taskAffirmDueDate: this.formInline.taskAffirmDueDate
|
||||||
}
|
}
|
||||||
postAction('/workFlow/startProcess', query).then((res) => {
|
postAction('/workFlow/startProcess', query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
@@ -844,10 +841,12 @@
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
completeTask(value, taskId) {
|
completeTask(value, taskId) {
|
||||||
|
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
|
||||||
|
value.handlingTime = handlingTime
|
||||||
let query = {
|
let query = {
|
||||||
userid: this.userInfo().id,
|
userid: this.userInfo().id,
|
||||||
taskId: taskId,
|
taskId: taskId,
|
||||||
json: value
|
json: JSON.stringify(value).replace(/\"/g, '\'')
|
||||||
}
|
}
|
||||||
postAction('/workFlow/completeTask', query).then((res) => {
|
postAction('/workFlow/completeTask', query).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|||||||
Reference in New Issue
Block a user