diff --git a/src/api/plugin/workflow/workorder.js b/src/api/plugin/workflow/workorder.js index bca675a..9cad4eb 100644 --- a/src/api/plugin/workflow/workorder.js +++ b/src/api/plugin/workflow/workorder.js @@ -3,9 +3,8 @@ const prefix = '/api/blade-workflow/workOrder' // 查询 export const getList = (query) => { return request({ - url: `${prefix}/myToDo`, + url: `${prefix}/historyWorkOrder`, method: 'get', params:query }) -} -// historyWorkOrder \ No newline at end of file +} \ No newline at end of file diff --git a/src/views/plugin/workflow/mixins/ex-form.js b/src/views/plugin/workflow/mixins/ex-form.js index c862cf0..8447a8e 100644 --- a/src/views/plugin/workflow/mixins/ex-form.js +++ b/src/views/plugin/workflow/mixins/ex-form.js @@ -230,18 +230,10 @@ export default { form = { ...form, copyUser, assignee }; } if (valid) { - // 追加 - // if(this.tableData.length>0) { - // form = {...form, uploadrecord: this.tableData} - // } - // if (form.uploadrecord.length > 0) { - // for (const key in form.uploadrecord) { - // if(this.userInfo.real_name === form.uploadrecord[key].createUser) { - // form.uploadrecord[key].remark = form.beizhu - // } - // } - // } - + // 判断是不是数组 + if (typeof form.uploadrecord == "string") { + form.uploadrecord = form.uploadrecord.split(""); + } startProcess(form) .then(() => { if (isExForm === true) { @@ -319,6 +311,10 @@ export default { processDefinitionName, processDefinitionId, } = this.process; + // 判断是不是数组 + if (typeof this.form.uploadrecord == "string") { + this.form.uploadrecord = this.form.uploadrecord.split(""); + } const param = { taskId, processInstanceId, diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue index be54ae4..3829f9a 100644 --- a/src/views/plugin/workflow/process/components/detail.vue +++ b/src/views/plugin/workflow/process/components/detail.vue @@ -222,6 +222,9 @@ export default { }); }, uploadSuccess(res) { + if (typeof this.form.uploadrecord == "string") { + this.form.uploadrecord = this.form.uploadrecord.split(""); + } this.form.uploadrecord.push(res); }, // 获取任务详情