Procházet zdrojové kódy

修复了审批后无法正确跳转回去的bug

Shinohara Haruna před 5 měsíci
rodič
revize
f05e36bda5

+ 34 - 29
smsb-plus-ui/src/views/smsb/itemPush/approval.vue

@@ -8,7 +8,7 @@
           <el-button v-if="approvalButtonShow" :loading="buttonLoading" type="primary" @click="approvalVerifyOpen"> 审批
           </el-button>
           <el-button v-if="itemPushBase && itemPushBase.id && itemPushBase.status !== 'draft'" type="primary"
-                     @click="handleApprovalRecord">
+            @click="handleApprovalRecord">
             流程进度
           </el-button>
         </div>
@@ -69,22 +69,22 @@
         <!-- 第二部分内容 -->
         <div class="section-content">
           <el-table v-loading="loading" :data="deviceList">
-            <el-table-column label="设备名称" align="left" prop="name" :show-overflow-tooltip="true"/>
+            <el-table-column label="设备名称" align="left" prop="name" :show-overflow-tooltip="true" />
           </el-table>
         </div>
         <!-- 第三部分内容 -->
         <div class="section-content">
           <el-table v-loading="loading" :data="sourceList">
-            <el-table-column label="原名" align="left" prop="originalName" width="150" :show-overflow-tooltip="true"/>
+            <el-table-column label="原名" align="left" prop="originalName" width="150" :show-overflow-tooltip="true" />
             <el-table-column label="类型" align="center" prop="type" width="80">
               <template #default="scope">
-                <dict-tag :options="smsb_source_type" :value="scope.row.type"/>
+                <dict-tag :options="smsb_source_type" :value="scope.row.type" />
               </template>
             </el-table-column>
-            <el-table-column label="大小" align="center" prop="size"/>
+            <el-table-column label="大小" align="center" prop="size" />
             <el-table-column label="截图" align="center" prop="screenshot">
               <template #default="scope">
-                <image-preview :src="scope.row.screenshot" style="width: 40px; height: 40px; cursor: pointer"/>
+                <image-preview :src="scope.row.screenshot" style="width: 40px; height: 40px; cursor: pointer" />
               </template>
             </el-table-column>
           </el-table>
@@ -92,28 +92,28 @@
       </div>
     </el-card>
     <!-- 提交组件 -->
-    <SubmitVerifySmsb ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback"/>
+    <SubmitVerifySmsb ref="submitVerifyRef" :task-variables="taskVariables" @submit-callback="submitCallback" />
     <!-- 审批记录 -->
-    <approvalRecordSmsb ref="approvalRecordRef"/>
+    <approvalRecordSmsb ref="approvalRecordRef" />
   </div>
 </template>
 
 <script setup name="Leave" lang="ts">
-import {addLeave, updateLeave} from '@/api/workflow/leave';
-import {LeaveVO} from '@/api/workflow/leave/types';
-import {startWorkFlow} from '@/api/workflow/task';
+import { addLeave, updateLeave } from '@/api/workflow/leave';
+import { LeaveVO } from '@/api/workflow/leave/types';
+import { startWorkFlow } from '@/api/workflow/task';
 import SubmitVerifySmsb from '@/views/smsb/itemReview/submitVerifySmsb.vue';
 import ApprovalRecordSmsb from '@/views/smsb/itemReview/approvalRecordSmsb.vue';
-import {AxiosResponse} from 'axios';
-import {StartProcessBo} from '@/api/workflow/workflowCommon/types';
-import {getItemPushReview} from '@/api/smsb/source/item_push';
-import {ItemPushForm, ItemPushQuery, ItemPushTimeRangeVO, ItemPushVO} from '@/api/smsb/source/item_push_type';
-import {DeviceVO} from '@/api/smsb/device/device_type';
-import {MinioDataVO} from '@/api/smsb/source/minioData_type';
-import {ElTable} from 'element-plus';
+import { AxiosResponse } from 'axios';
+import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
+import { getItemPushReview } from '@/api/smsb/source/item_push';
+import { ItemPushForm, ItemPushQuery, ItemPushTimeRangeVO, ItemPushVO } from '@/api/smsb/source/item_push_type';
+import { DeviceVO } from '@/api/smsb/device/device_type';
+import { MinioDataVO } from '@/api/smsb/source/minioData_type';
+import { ElTable } from 'element-plus';
 
-const {proxy} = getCurrentInstance() as ComponentInternalInstance;
-const {smsb_push_type, smsb_push_level, smsb_push_state, smsb_source_type} = toRefs<any>(
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { smsb_push_type, smsb_push_level, smsb_push_state, smsb_source_type } = toRefs<any>(
   proxy?.useDict('smsb_push_type', 'smsb_push_level', 'smsb_push_state', 'smsb_source_type')
 );
 const approvalButtonShow = ref(false);
@@ -152,7 +152,7 @@ const initFormData: ItemPushForm = {
   status: undefined
 };
 const data = reactive<PageData<ItemPushForm, ItemPushQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10
@@ -160,11 +160,11 @@ const data = reactive<PageData<ItemPushForm, ItemPushQuery>>({
   rules: {}
 });
 
-const {form, rules} = toRefs(data);
+const { form, rules } = toRefs(data);
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData}
+  form.value = { ...initFormData };
 };
 
 /** 获取详情 */
@@ -245,7 +245,7 @@ const handleApprovalRecord = () => {
 //提交回调
 const submitCallback = async () => {
   await proxy.$tab.closePage(proxy.$route);
-  proxy.$router.go(-1);
+  proxy.$router.push('/source/review');
 };
 
 //返回
@@ -297,14 +297,17 @@ onMounted(() => {
 }
 
 .info-item {
-  flex: 1 1 16%; /* 每个项目至少占容器的16%,允许伸缩 */
+  flex: 1 1 16%;
+  /* 每个项目至少占容器的16%,允许伸缩 */
   margin: 5px 0;
   box-sizing: border-box;
-  padding-right: 10px; /* 避免内容重叠 */
+  padding-right: 10px;
+  /* 避免内容重叠 */
 }
 
 .info-item strong {
-  display: block; /* 将 strong 标签换行,以便内容更易读 */
+  display: block;
+  /* 将 strong 标签换行,以便内容更易读 */
 }
 
 .loading-text {
@@ -323,10 +326,12 @@ onMounted(() => {
 .section-content {
   flex: 1;
   padding: 10px;
-  border-right: 1px solid #ebeef5; /* 可选:添加分隔线 */
+  border-right: 1px solid #ebeef5;
+  /* 可选:添加分隔线 */
 }
 
 .section-content:last-child {
-  border-right: none; /* 移除最后一个元素的分隔线 */
+  border-right: none;
+  /* 移除最后一个元素的分隔线 */
 }
 </style>

+ 2 - 1
smsb-plus-ui/src/views/smsb/itemReview/approvalRecordSmsb.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="container">
-    <el-dialog v-model="visible" draggable title="审批记录" :width="props.width" :height="props.height" :close-on-click-modal="false">
+    <el-dialog v-model="visible" draggable title="审批记录" :width="props.width" :height="props.height"
+      :close-on-click-modal="false">
       <el-tabs v-model="tabActiveName" class="demo-tabs">
         <el-tab-pane label="流程图" name="bpmn">
           <BpmnView ref="bpmnViewRef"></BpmnView>

+ 7 - 5
smsb-plus-ui/src/views/smsb/itemReview/submitVerifySmsb.vue

@@ -1,5 +1,6 @@
 <template>
-  <el-dialog v-model="dialog.visible" :title="dialog.title" width="40%" draggable :before-close="cancel" center :close-on-click-modal="false">
+  <el-dialog v-model="dialog.visible" :title="dialog.title" width="40%" draggable :before-close="cancel" center
+    :close-on-click-modal="false">
     <el-form v-loading="loading" :model="form" label-width="120px">
       <el-form-item v-if="task.businessStatus === 'waiting'" label="审批意见">
         <el-input v-model="form.message" type="textarea" :rows="5" maxlength="254" placeholder="请输入审批意见" />
@@ -11,7 +12,8 @@
         <!--
                 <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 驳回 </el-button>
         -->
-        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 驳回 </el-button>
+        <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger"
+          @click="handleTerminationTask"> 驳回 </el-button>
         <el-button :disabled="buttonDisabled" @click="cancel">取消</el-button>
       </span>
     </template>
@@ -31,7 +33,7 @@ import { TaskVO } from '@/api/workflow/task/types';
 const props = defineProps({
   taskVariables: {
     type: Object as () => Record<string, any>,
-    default: () => {}
+    default: () => { }
   }
 });
 //遮罩层
@@ -120,7 +122,7 @@ const openDialog = (id?: string) => {
   });
 };
 
-onMounted(() => {});
+onMounted(() => { });
 const emits = defineEmits(['submitCallback', 'cancelCallback']);
 
 /** 办理流程 */
@@ -133,7 +135,7 @@ const handleCompleteTask = async () => {
   try {
     await completeTaskSmsb(form.value);
     dialog.visible = false;
-    // emits('submitCallback');
+    emits('submitCallback');
     proxy?.$modal.msgSuccess('操作成功');
   } finally {
     loading.value = false;