diff --git a/src/api/plugin/workflow/demo/leave.js b/src/api/plugin/workflow/demo/leave.js index cfef9b8..6151677 100644 --- a/src/api/plugin/workflow/demo/leave.js +++ b/src/api/plugin/workflow/demo/leave.js @@ -22,4 +22,12 @@ export const remove = (ids) => { ids, } }) +} + +export const submit = (data) => { + return request({ + url: `${prefix}/submit`, + method: 'post', + data + }) } \ No newline at end of file diff --git a/src/views/plugin/workflow/demo/leave/index.vue b/src/views/plugin/workflow/demo/leave/index.vue index 559a2f6..cd52877 100644 --- a/src/views/plugin/workflow/demo/leave/index.vue +++ b/src/views/plugin/workflow/demo/leave/index.vue @@ -215,7 +215,7 @@ export default { }, methods: { handleDetail(row) { - this.dynamicRoute({ processInstanceId: row.processInsId }, 'detail', true).then(() => { + this.dynamicRoute({ ...row, processInstanceId: row.processInsId }, 'detail', true).then(() => { this.form = { ...row } this.detailVisible = true }) diff --git a/src/views/plugin/workflow/process/external/Leave/detail.vue b/src/views/plugin/workflow/process/external/Leave/detail.vue index c7af0ee..cde90e2 100644 --- a/src/views/plugin/workflow/process/external/Leave/detail.vue +++ b/src/views/plugin/workflow/process/external/Leave/detail.vue @@ -28,6 +28,13 @@ :option="option" :upload-preview="handleUploadPreview"> + + + { - this.$set(this.form, 'reason', '请假' + value + '天') + if (value) this.$set(this.form, 'reason', '请假' + value + '天') + else this.$set(this.form, 'reason', '') } }, { @@ -201,7 +210,8 @@ export default { showFileList: true, multiple: true, limit: 10, - prop: 'attachment' + prop: 'attachment', + dataType: 'string' }, ] }, @@ -286,7 +296,10 @@ export default { if (valid) { const variables = {} this.vars.forEach(v => { - if (v != 'comment' && this.form[v]) variables[v] = this.form[v] + if (!this.validatenull(this.form[v])) { + variables[v] = this.form[v] + if (this.form[`$${v}`]) variables[`$${v}`] = this.form[`$${v}`] + } }) this.handleCompleteTask(pass, variables).then(() => { diff --git a/src/views/plugin/workflow/process/external/Leave/start.vue b/src/views/plugin/workflow/process/external/Leave/start.vue index de4c9a1..4449ae7 100644 --- a/src/views/plugin/workflow/process/external/Leave/start.vue +++ b/src/views/plugin/workflow/process/external/Leave/start.vue @@ -53,6 +53,9 @@