fix: 修复进入审核页面后跳转至其他页面报错
							parent
							
								
									fb68dc2bfa
								
							
						
					
					
						commit
						7151695103
					
				|  | @ -1,131 +1,125 @@ | |||
| <template> | ||||
|   <Teleport v-if="runningTask?.id" to=".section-container"> | ||||
|     <div | ||||
|       class="h-50px position-fixed bottom-10 pl-50px text-14px flex items-center color-#32373c dark:color-#fff font-bold btn-container" | ||||
|     > | ||||
|       <el-popover :visible="passVisible" placement="top-end" :width="500" trigger="click"> | ||||
|         <template #reference> | ||||
|           <el-button plain type="success" @click="openPopover('1')"> | ||||
|             <Icon icon="ep:select" />  通过 | ||||
|           </el-button> | ||||
|         </template> | ||||
|         <div class="flex flex-col flex-1 pt-20px px-20px" v-loading="formLoading"> | ||||
|           <el-form | ||||
|             label-position="top" | ||||
|             class="mb-auto" | ||||
|             ref="formRef" | ||||
|             :model="auditForm" | ||||
|             :rules="auditRule" | ||||
|             label-width="100px" | ||||
|           > | ||||
|             <el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人"> | ||||
|               {{ processInstance?.startUser.nickname }} | ||||
|               <el-tag size="small" type="info" class="ml-8px"> | ||||
|                 {{ processInstance?.startUser.deptName }} | ||||
|               </el-tag> | ||||
|             </el-form-item> | ||||
|             <el-card v-if="runningTask.formId > 0" class="mb-15px !-mt-10px"> | ||||
|               <template #header> | ||||
|                 <span class="el-icon-picture-outline"> | ||||
|                   填写表单【{{ runningTask?.formName }}】 | ||||
|                 </span> | ||||
|               </template> | ||||
|               <form-create | ||||
|                 v-model="approveForm.value" | ||||
|                 v-model:api="approveFormFApi" | ||||
|                 :option="approveForm.option" | ||||
|                 :rule="approveForm.rule" | ||||
|   <div | ||||
|     class="h-50px position-fixed bottom-10 text-14px flex items-center color-#32373c dark:color-#fff font-bold btn-container" | ||||
|   > | ||||
|     <el-popover :visible="passVisible" placement="top-end" :width="500" trigger="click"> | ||||
|       <template #reference> | ||||
|         <el-button plain type="success" @click="openPopover('1')"> | ||||
|           <Icon icon="ep:select" />  通过 | ||||
|         </el-button> | ||||
|       </template> | ||||
|       <div class="flex flex-col flex-1 pt-20px px-20px" v-loading="formLoading"> | ||||
|         <el-form | ||||
|           label-position="top" | ||||
|           class="mb-auto" | ||||
|           ref="formRef" | ||||
|           :model="auditForm" | ||||
|           :rules="auditRule" | ||||
|           label-width="100px" | ||||
|         > | ||||
|           <el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人"> | ||||
|             {{ processInstance?.startUser.nickname }} | ||||
|             <el-tag size="small" type="info" class="ml-8px"> | ||||
|               {{ processInstance?.startUser.deptName }} | ||||
|             </el-tag> | ||||
|           </el-form-item> | ||||
|           <el-card v-if="runningTask.formId > 0" class="mb-15px !-mt-10px"> | ||||
|             <template #header> | ||||
|               <span class="el-icon-picture-outline"> 填写表单【{{ runningTask?.formName }}】 </span> | ||||
|             </template> | ||||
|             <form-create | ||||
|               v-model="approveForm.value" | ||||
|               v-model:api="approveFormFApi" | ||||
|               :option="approveForm.option" | ||||
|               :rule="approveForm.rule" | ||||
|             /> | ||||
|           </el-card> | ||||
|           <el-form-item label="审批建议" prop="reason"> | ||||
|             <el-input v-model="auditForm.reason" placeholder="请输入审批建议" type="textarea" /> | ||||
|           </el-form-item> | ||||
|           <el-form-item label="抄送人" prop="copyUserIds"> | ||||
|             <el-select v-model="auditForm.copyUserIds" multiple placeholder="请选择抄送人"> | ||||
|               <el-option | ||||
|                 v-for="itemx in userOptions" | ||||
|                 :key="itemx.id" | ||||
|                 :label="itemx.nickname" | ||||
|                 :value="itemx.id" | ||||
|               /> | ||||
|             </el-card> | ||||
|             <el-form-item label="审批建议" prop="reason"> | ||||
|               <el-input v-model="auditForm.reason" placeholder="请输入审批建议" type="textarea" /> | ||||
|             </el-form-item> | ||||
|             <el-form-item label="抄送人" prop="copyUserIds"> | ||||
|               <el-select v-model="auditForm.copyUserIds" multiple placeholder="请选择抄送人"> | ||||
|                 <el-option | ||||
|                   v-for="itemx in userOptions" | ||||
|                   :key="itemx.id" | ||||
|                   :label="itemx.nickname" | ||||
|                   :value="itemx.id" | ||||
|                 /> | ||||
|               </el-select> | ||||
|             </el-form-item> | ||||
|             </el-select> | ||||
|           </el-form-item> | ||||
| 
 | ||||
|             <el-form-item> | ||||
|               <el-button :disabled="formLoading" type="success" @click="handleAudit(true)"> | ||||
|                 通过 | ||||
|               </el-button> | ||||
|               <el-button @click="passVisible = false"> 取消 </el-button> | ||||
|             </el-form-item> | ||||
|           </el-form> | ||||
|         </div> | ||||
|       </el-popover> | ||||
|       <el-popover :visible="rejectVisible" placement="top-end" :width="500" trigger="click"> | ||||
|         <template #reference> | ||||
|           <el-button class="mr-20px" plain type="danger" @click="openPopover('2')"> | ||||
|             <Icon icon="ep:close" />  拒绝 | ||||
|           </el-button> | ||||
|         </template> | ||||
|         <div class="flex flex-col flex-1 pt-20px px-20px" v-loading="formLoading"> | ||||
|           <el-form | ||||
|             label-position="top" | ||||
|             class="mb-auto" | ||||
|             ref="formRef" | ||||
|             :model="auditForm" | ||||
|             :rules="auditRule" | ||||
|             label-width="100px" | ||||
|           > | ||||
|             <el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人"> | ||||
|               {{ processInstance?.startUser.nickname }} | ||||
|               <el-tag size="small" type="info" class="ml-8px"> | ||||
|                 {{ processInstance?.startUser.deptName }} | ||||
|               </el-tag> | ||||
|             </el-form-item> | ||||
|             <el-card v-if="runningTask.formId > 0" class="mb-15px !-mt-10px"> | ||||
|               <template #header> | ||||
|                 <span class="el-icon-picture-outline"> | ||||
|                   填写表单【{{ runningTask?.formName }}】 | ||||
|                 </span> | ||||
|               </template> | ||||
|               <form-create | ||||
|                 v-model="approveForm.value" | ||||
|                 v-model:api="approveFormFApi" | ||||
|                 :option="approveForm.option" | ||||
|                 :rule="approveForm.rule" | ||||
|               /> | ||||
|             </el-card> | ||||
|             <el-form-item label="审批建议" prop="reason"> | ||||
|               <el-input v-model="auditForm.reason" placeholder="请输入审批建议" type="textarea" /> | ||||
|             </el-form-item> | ||||
|             <el-form-item label="抄送人" prop="copyUserIds"> | ||||
|               <el-select v-model="auditForm.copyUserIds" multiple placeholder="请选择抄送人"> | ||||
|                 <el-option | ||||
|                   v-for="itemx in userOptions" | ||||
|                   :key="itemx.id" | ||||
|                   :label="itemx.nickname" | ||||
|                   :value="itemx.id" | ||||
|                 /> | ||||
|               </el-select> | ||||
|             </el-form-item> | ||||
| 
 | ||||
|             <el-form-item> | ||||
|               <el-button :disabled="formLoading" type="danger" @click="handleAudit(false)"> | ||||
|                 拒绝 | ||||
|               </el-button> | ||||
|               <el-button @click="rejectVisible = false"> 取消 </el-button> | ||||
|             </el-form-item> | ||||
|           </el-form> | ||||
|         </div> | ||||
|       </el-popover> | ||||
|       <div @click="handleSend"> <Icon :size="14" icon="svg-icon:send" /> 抄送 </div> | ||||
|       <div @click="openTaskUpdateAssigneeForm"> | ||||
|         <Icon :size="14" icon="fa:share-square-o" /> 转交 | ||||
|           <el-form-item> | ||||
|             <el-button :disabled="formLoading" type="success" @click="handleAudit(true)"> | ||||
|               通过 | ||||
|             </el-button> | ||||
|             <el-button @click="passVisible = false"> 取消 </el-button> | ||||
|           </el-form-item> | ||||
|         </el-form> | ||||
|       </div> | ||||
|       <div @click="handleDelegate"> <Icon :size="14" icon="ep:position" /> 委派 </div> | ||||
|       <div @click="handleSign"> <Icon :size="14" icon="ep:plus" /> 加签 </div> | ||||
|       <div @click="handleBack"> <Icon :size="14" icon="fa:mail-reply" /> 退回 </div> | ||||
|     </el-popover> | ||||
|     <el-popover :visible="rejectVisible" placement="top-end" :width="500" trigger="click"> | ||||
|       <template #reference> | ||||
|         <el-button class="mr-20px" plain type="danger" @click="openPopover('2')"> | ||||
|           <Icon icon="ep:close" />  拒绝 | ||||
|         </el-button> | ||||
|       </template> | ||||
|       <div class="flex flex-col flex-1 pt-20px px-20px" v-loading="formLoading"> | ||||
|         <el-form | ||||
|           label-position="top" | ||||
|           class="mb-auto" | ||||
|           ref="formRef" | ||||
|           :model="auditForm" | ||||
|           :rules="auditRule" | ||||
|           label-width="100px" | ||||
|         > | ||||
|           <el-form-item v-if="processInstance && processInstance.startUser" label="流程发起人"> | ||||
|             {{ processInstance?.startUser.nickname }} | ||||
|             <el-tag size="small" type="info" class="ml-8px"> | ||||
|               {{ processInstance?.startUser.deptName }} | ||||
|             </el-tag> | ||||
|           </el-form-item> | ||||
|           <el-card v-if="runningTask.formId > 0" class="mb-15px !-mt-10px"> | ||||
|             <template #header> | ||||
|               <span class="el-icon-picture-outline"> 填写表单【{{ runningTask?.formName }}】 </span> | ||||
|             </template> | ||||
|             <form-create | ||||
|               v-model="approveForm.value" | ||||
|               v-model:api="approveFormFApi" | ||||
|               :option="approveForm.option" | ||||
|               :rule="approveForm.rule" | ||||
|             /> | ||||
|           </el-card> | ||||
|           <el-form-item label="审批建议" prop="reason"> | ||||
|             <el-input v-model="auditForm.reason" placeholder="请输入审批建议" type="textarea" /> | ||||
|           </el-form-item> | ||||
|           <el-form-item label="抄送人" prop="copyUserIds"> | ||||
|             <el-select v-model="auditForm.copyUserIds" multiple placeholder="请选择抄送人"> | ||||
|               <el-option | ||||
|                 v-for="itemx in userOptions" | ||||
|                 :key="itemx.id" | ||||
|                 :label="itemx.nickname" | ||||
|                 :value="itemx.id" | ||||
|               /> | ||||
|             </el-select> | ||||
|           </el-form-item> | ||||
| 
 | ||||
|           <el-form-item> | ||||
|             <el-button :disabled="formLoading" type="danger" @click="handleAudit(false)"> | ||||
|               拒绝 | ||||
|             </el-button> | ||||
|             <el-button @click="rejectVisible = false"> 取消 </el-button> | ||||
|           </el-form-item> | ||||
|         </el-form> | ||||
|       </div> | ||||
|     </el-popover> | ||||
|     <div @click="handleSend"> <Icon :size="14" icon="svg-icon:send" /> 抄送 </div> | ||||
|     <div @click="openTaskUpdateAssigneeForm"> | ||||
|       <Icon :size="14" icon="fa:share-square-o" /> 转交 | ||||
|     </div> | ||||
|   </Teleport> | ||||
|     <div @click="handleDelegate"> <Icon :size="14" icon="ep:position" /> 委派 </div> | ||||
|     <div @click="handleSign"> <Icon :size="14" icon="ep:plus" /> 加签 </div> | ||||
|     <div @click="handleBack"> <Icon :size="14" icon="fa:mail-reply" /> 退回 </div> | ||||
|   </div> | ||||
|   <!-- 弹窗:转派审批人 --> | ||||
|   <TaskTransferForm ref="taskTransferFormRef" @success="getDetail" /> | ||||
|   <!-- 弹窗:回退节点 --> | ||||
|  |  | |||
|  | @ -46,6 +46,14 @@ | |||
|                 <BusinessFormComponent :id="processInstance.businessKey" /> | ||||
|               </div> | ||||
|             </div> | ||||
| 
 | ||||
|             <!-- 操作栏按钮 --> | ||||
|             <ProcessInstanceOperationButton | ||||
|               ref="operationButtonRef" | ||||
|               :processInstance="processInstance" | ||||
|               :userOptions="userOptions" | ||||
|               @success="getDetail" | ||||
|             /> | ||||
|           </el-col> | ||||
|           <el-col :span="6"> | ||||
|             <!-- TODO @GoldenZqqq:后续这个,也拆个小组件出来 --> | ||||
|  | @ -118,14 +126,6 @@ | |||
|       <!-- 流转评论 --> | ||||
|       <el-tab-pane label="流转评论"> 流转评论 </el-tab-pane> | ||||
|     </el-tabs> | ||||
| 
 | ||||
|     <!-- 操作栏按钮 --> | ||||
|     <ProcessInstanceOperationButton | ||||
|       ref="operationButtonRef" | ||||
|       :processInstance="processInstance" | ||||
|       :userOptions="userOptions" | ||||
|       @success="getDetail" | ||||
|     /> | ||||
|   </ContentWrap> | ||||
| </template> | ||||
| <script lang="ts" setup> | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 GoldenZqqq
						GoldenZqqq