|
@@ -131,13 +131,7 @@
|
|
<div v-if="currentTaskRow.instanceState === 0" class="flow-actions">
|
|
<div v-if="currentTaskRow.instanceState === 0" class="flow-actions">
|
|
<el-button :icon="ChatLineSquare" @click="openComment('reviewVisible', 'review')">评论</el-button>
|
|
<el-button :icon="ChatLineSquare" @click="openComment('reviewVisible', 'review')">评论</el-button>
|
|
<template v-if="currentTaskType !== 'myReceived' || currentTaskType !== 'approved'">
|
|
<template v-if="currentTaskType !== 'myReceived' || currentTaskType !== 'approved'">
|
|
- <el-button
|
|
|
|
- v-if="currentTaskType === 'pendingApproval'"
|
|
|
|
- :icon="Check"
|
|
|
|
- type="primary"
|
|
|
|
- @click="handleFormValid"
|
|
|
|
- >同意</el-button
|
|
|
|
- >
|
|
|
|
|
|
+ <el-button v-if="currentTaskType === 'pendingApproval'" :icon="Check" type="primary" @click="handleFormValid">同意</el-button>
|
|
<el-button
|
|
<el-button
|
|
v-if="currentTaskType === 'pendingApproval' && allowReject"
|
|
v-if="currentTaskType === 'pendingApproval' && allowReject"
|
|
:icon="Close"
|
|
:icon="Close"
|
|
@@ -462,7 +456,9 @@ const getTaskDetail = () => {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// dyVueComponent.value = markRaw(defineAsyncComponent(() => import('@/views/flow/test/test1.vue')))
|
|
// dyVueComponent.value = markRaw(defineAsyncComponent(() => import('@/views/flow/test/test1.vue')))
|
|
- dyVueComponent.value = defineAsyncComponent(async () => await /* @vite-ignore */ modules[data.formTemplate.pcUrl]())
|
|
|
|
|
|
+ if (data.formTemplate.pcUrl) {
|
|
|
|
+ dyVueComponent.value = defineAsyncComponent(async () => await /* @vite-ignore */ modules[data.formTemplate.pcUrl]())
|
|
|
|
+ }
|
|
return
|
|
return
|
|
} else {
|
|
} else {
|
|
formContent = `{"formStructure":${data.formTemplate.content}}` || '{}'
|
|
formContent = `{"formStructure":${data.formTemplate.content}}` || '{}'
|