Skip to content

Commit 7151695

Browse files
GoldenZqqqGoldenZqqq
committed
fix: 修复进入审核页面后跳转至其他页面报错
1 parent fb68dc2 commit 7151695

File tree

2 files changed

+123
-129
lines changed

2 files changed

+123
-129
lines changed

‎src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue

Lines changed: 115 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,125 @@
11
<template>
2-
<Teleport v-if="runningTask?.id" to=".section-container">
3-
<div
4-
class="h-50px position-fixed bottom-10 pl-50px text-14px flex items-center color-#32373c dark:color-#fff font-bold btn-container"
5-
>
6-
<el-popover :visible="passVisible" placement="top-end" :width="500" trigger="click">
7-
<template #reference>
8-
<el-button plain type="success" @click="openPopover('1')">
9-
<Icon icon="ep:select" />&nbsp; 通过
10-
</el-button>
11-
</template>
12-
<div class="flex flex-col flex-1 pt-20px px-20px" v-loading="formLoading">
13-
<el-form
14-
label-position="top"
15-
class="mb-auto"
16-
ref="formRef"
17-
:model="auditForm"
18-
:rules="auditRule"
19-
label-width="100px"
20-
>
21-
<el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人">
22-
{{ processInstance?.startUser.nickname }}
23-
<el-tag size="small" type="info" class="ml-8px">
24-
{{ processInstance?.startUser.deptName }}
25-
</el-tag>
26-
</el-form-item>
27-
<el-card v-if="runningTask.formId > 0" class="mb-15px !-mt-10px">
28-
<template #header>
29-
<span class="el-icon-picture-outline">
30-
填写表单【{{ runningTask?.formName }}】
31-
</span>
32-
</template>
33-
<form-create
34-
v-model="approveForm.value"
35-
v-model:api="approveFormFApi"
36-
:option="approveForm.option"
37-
:rule="approveForm.rule"
2+
<div
3+
class="h-50px position-fixed bottom-10 text-14px flex items-center color-#32373c dark:color-#fff font-bold btn-container"
4+
>
5+
<el-popover :visible="passVisible" placement="top-end" :width="500" trigger="click">
6+
<template #reference>
7+
<el-button plain type="success" @click="openPopover('1')">
8+
<Icon icon="ep:select" />&nbsp; 通过
9+
</el-button>
10+
</template>
11+
<div class="flex flex-col flex-1 pt-20px px-20px" v-loading="formLoading">
12+
<el-form
13+
label-position="top"
14+
class="mb-auto"
15+
ref="formRef"
16+
:model="auditForm"
17+
:rules="auditRule"
18+
label-width="100px"
19+
>
20+
<el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人">
21+
{{ processInstance?.startUser.nickname }}
22+
<el-tag size="small" type="info" class="ml-8px">
23+
{{ processInstance?.startUser.deptName }}
24+
</el-tag>
25+
</el-form-item>
26+
<el-card v-if="runningTask.formId > 0" class="mb-15px !-mt-10px">
27+
<template #header>
28+
<span class="el-icon-picture-outline"> 填写表单【{{ runningTask?.formName }}】 </span>
29+
</template>
30+
<form-create
31+
v-model="approveForm.value"
32+
v-model:api="approveFormFApi"
33+
:option="approveForm.option"
34+
:rule="approveForm.rule"
35+
/>
36+
</el-card>
37+
<el-form-item label="审批建议" prop="reason">
38+
<el-input v-model="auditForm.reason" placeholder="请输入审批建议" type="textarea" />
39+
</el-form-item>
40+
<el-form-item label="抄送人" prop="copyUserIds">
41+
<el-select v-model="auditForm.copyUserIds" multiple placeholder="请选择抄送人">
42+
<el-option
43+
v-for="itemx in userOptions"
44+
:key="itemx.id"
45+
:label="itemx.nickname"
46+
:value="itemx.id"
3847
/>
39-
</el-card>
40-
<el-form-item label="审批建议" prop="reason">
41-
<el-input v-model="auditForm.reason" placeholder="请输入审批建议" type="textarea" />
42-
</el-form-item>
43-
<el-form-item label="抄送人" prop="copyUserIds">
44-
<el-select v-model="auditForm.copyUserIds" multiple placeholder="请选择抄送人">
45-
<el-option
46-
v-for="itemx in userOptions"
47-
:key="itemx.id"
48-
:label="itemx.nickname"
49-
:value="itemx.id"
50-
/>
51-
</el-select>
52-
</el-form-item>
48+
</el-select>
49+
</el-form-item>
5350

54-
<el-form-item>
55-
<el-button :disabled="formLoading" type="success" @click="handleAudit(true)">
56-
通过
57-
</el-button>
58-
<el-button @click="passVisible = false"> 取消 </el-button>
59-
</el-form-item>
60-
</el-form>
61-
</div>
62-
</el-popover>
63-
<el-popover :visible="rejectVisible" placement="top-end" :width="500" trigger="click">
64-
<template #reference>
65-
<el-button class="mr-20px" plain type="danger" @click="openPopover('2')">
66-
<Icon icon="ep:close" />&nbsp; 拒绝
67-
</el-button>
68-
</template>
69-
<div class="flex flex-col flex-1 pt-20px px-20px" v-loading="formLoading">
70-
<el-form
71-
label-position="top"
72-
class="mb-auto"
73-
ref="formRef"
74-
:model="auditForm"
75-
:rules="auditRule"
76-
label-width="100px"
77-
>
78-
<el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人">
79-
{{ processInstance?.startUser.nickname }}
80-
<el-tag size="small" type="info" class="ml-8px">
81-
{{ processInstance?.startUser.deptName }}
82-
</el-tag>
83-
</el-form-item>
84-
<el-card v-if="runningTask.formId > 0" class="mb-15px !-mt-10px">
85-
<template #header>
86-
<span class="el-icon-picture-outline">
87-
填写表单【{{ runningTask?.formName }}】
88-
</span>
89-
</template>
90-
<form-create
91-
v-model="approveForm.value"
92-
v-model:api="approveFormFApi"
93-
:option="approveForm.option"
94-
:rule="approveForm.rule"
51+
<el-form-item>
52+
<el-button :disabled="formLoading" type="success" @click="handleAudit(true)">
53+
通过
54+
</el-button>
55+
<el-button @click="passVisible = false"> 取消 </el-button>
56+
</el-form-item>
57+
</el-form>
58+
</div>
59+
</el-popover>
60+
<el-popover :visible="rejectVisible" placement="top-end" :width="500" trigger="click">
61+
<template #reference>
62+
<el-button class="mr-20px" plain type="danger" @click="openPopover('2')">
63+
<Icon icon="ep:close" />&nbsp; 拒绝
64+
</el-button>
65+
</template>
66+
<div class="flex flex-col flex-1 pt-20px px-20px" v-loading="formLoading">
67+
<el-form
68+
label-position="top"
69+
class="mb-auto"
70+
ref="formRef"
71+
:model="auditForm"
72+
:rules="auditRule"
73+
label-width="100px"
74+
>
75+
<el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人">
76+
{{ processInstance?.startUser.nickname }}
77+
<el-tag size="small" type="info" class="ml-8px">
78+
{{ processInstance?.startUser.deptName }}
79+
</el-tag>
80+
</el-form-item>
81+
<el-card v-if="runningTask.formId > 0" class="mb-15px !-mt-10px">
82+
<template #header>
83+
<span class="el-icon-picture-outline"> 填写表单【{{ runningTask?.formName }}】 </span>
84+
</template>
85+
<form-create
86+
v-model="approveForm.value"
87+
v-model:api="approveFormFApi"
88+
:option="approveForm.option"
89+
:rule="approveForm.rule"
90+
/>
91+
</el-card>
92+
<el-form-item label="审批建议" prop="reason">
93+
<el-input v-model="auditForm.reason" placeholder="请输入审批建议" type="textarea" />
94+
</el-form-item>
95+
<el-form-item label="抄送人" prop="copyUserIds">
96+
<el-select v-model="auditForm.copyUserIds" multiple placeholder="请选择抄送人">
97+
<el-option
98+
v-for="itemx in userOptions"
99+
:key="itemx.id"
100+
:label="itemx.nickname"
101+
:value="itemx.id"
95102
/>
96-
</el-card>
97-
<el-form-item label="审批建议" prop="reason">
98-
<el-input v-model="auditForm.reason" placeholder="请输入审批建议" type="textarea" />
99-
</el-form-item>
100-
<el-form-item label="抄送人" prop="copyUserIds">
101-
<el-select v-model="auditForm.copyUserIds" multiple placeholder="请选择抄送人">
102-
<el-option
103-
v-for="itemx in userOptions"
104-
:key="itemx.id"
105-
:label="itemx.nickname"
106-
:value="itemx.id"
107-
/>
108-
</el-select>
109-
</el-form-item>
103+
</el-select>
104+
</el-form-item>
110105

111-
<el-form-item>
112-
<el-button :disabled="formLoading" type="danger" @click="handleAudit(false)">
113-
拒绝
114-
</el-button>
115-
<el-button @click="rejectVisible = false"> 取消 </el-button>
116-
</el-form-item>
117-
</el-form>
118-
</div>
119-
</el-popover>
120-
<div @click="handleSend"> <Icon :size="14" icon="svg-icon:send" />&nbsp;抄送 </div>
121-
<div @click="openTaskUpdateAssigneeForm">
122-
<Icon :size="14" icon="fa:share-square-o" />&nbsp;转交
106+
<el-form-item>
107+
<el-button :disabled="formLoading" type="danger" @click="handleAudit(false)">
108+
拒绝
109+
</el-button>
110+
<el-button @click="rejectVisible = false"> 取消 </el-button>
111+
</el-form-item>
112+
</el-form>
123113
</div>
124-
<div @click="handleDelegate"> <Icon :size="14" icon="ep:position" />&nbsp;委派 </div>
125-
<div @click="handleSign"> <Icon :size="14" icon="ep:plus" />&nbsp;加签 </div>
126-
<div @click="handleBack"> <Icon :size="14" icon="fa:mail-reply" />&nbsp;退回 </div>
114+
</el-popover>
115+
<div @click="handleSend"> <Icon :size="14" icon="svg-icon:send" />&nbsp;抄送 </div>
116+
<div @click="openTaskUpdateAssigneeForm">
117+
<Icon :size="14" icon="fa:share-square-o" />&nbsp;转交
127118
</div>
128-
</Teleport>
119+
<div @click="handleDelegate"> <Icon :size="14" icon="ep:position" />&nbsp;委派 </div>
120+
<div @click="handleSign"> <Icon :size="14" icon="ep:plus" />&nbsp;加签 </div>
121+
<div @click="handleBack"> <Icon :size="14" icon="fa:mail-reply" />&nbsp;退回 </div>
122+
</div>
129123
<!-- 弹窗：转派审批人 -->
130124
<TaskTransferForm ref="taskTransferFormRef" @success="getDetail" />
131125
<!-- 弹窗：回退节点 -->

‎src/views/bpm/processInstance/detail/index_new.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@
4646
<BusinessFormComponent :id="processInstance.businessKey" />
4747
</div>
4848
</div>
49+
50+
<!-- 操作栏按钮 -->
51+
<ProcessInstanceOperationButton
52+
ref="operationButtonRef"
53+
:processInstance="processInstance"
54+
:userOptions="userOptions"
55+
@success="getDetail"
56+
/>
4957
</el-col>
5058
<el-col :span="6">
5159
<!-- TODO @GoldenZqqq：后续这个，也拆个小组件出来 -->
@@ -118,14 +126,6 @@
118126
<!-- 流转评论 -->
119127
<el-tab-pane label="流转评论"> 流转评论 </el-tab-pane>
120128
</el-tabs>
121-
122-
<!-- 操作栏按钮 -->
123-
<ProcessInstanceOperationButton
124-
ref="operationButtonRef"
125-
:processInstance="processInstance"
126-
:userOptions="userOptions"
127-
@success="getDetail"
128-
/>
129129
</ContentWrap>
130130
</template>
131131
<script lang="ts" setup>

0 commit comments

Comments
 (0)