From ba98fb31a550e5ef00ee69cebdaabc35508ff292 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Wed, 27 Nov 2024 18:38:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(frontend):=20=E5=8D=95=E6=8D=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E8=BF=AD=E4=BB=A3=5F5=20#7190=20#=20Reviewed,=20trans?=
 =?UTF-8?q?action=20id:=2025085?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbm-ui/frontend/src/hooks/useTicketCount.ts   | 18 ++---
 .../layout/components/PersonalWorkbench.vue   |  2 +-
 dbm-ui/frontend/src/locales/zh-cn.json        |  5 ++
 .../src/services/source/ticketFlow.ts         | 10 +--
 .../components/list/components/TableMode.vue  |  4 +-
 .../ticket-center/common/CardModeList.vue     | 13 ++--
 .../ticket-center/common/TableModeTable.vue   |  9 ++-
 .../ticket-center/common/TicketClone.vue      |  4 +-
 .../ticket-center/common/TicketDetailLink.vue |  2 +-
 .../ticket-center/common/TicketRevoke.vue     | 44 +++++++++++
 .../ProcessResourceReplenish.vue              | 78 +++++++++++++++++++
 .../common/action-confirm/ProcessRetry.vue    | 44 +++--------
 .../common/hooks/use-fetch-data.ts            |  5 +-
 .../common/ticket-detail/Index.vue            | 11 ++-
 .../flow-type-common/StatusFailed.vue         |  6 +-
 .../flow-type-inner-flow/StatusFailed.vue     |  6 +-
 .../components/todo-list/type-itsm/Index.vue  |  2 -
 .../type-resource-replenish/StatusTodo.vue    |  6 +-
 .../views/ticket-center/self-apply/Index.vue  |  2 +-
 .../components/list/components/CardMode.vue   |  2 +-
 .../components/list/components/TableMode.vue  |  6 +-
 .../self-apply/hooks/use-url-redirect.ts      | 47 -----------
 .../views/ticket-center/self-todo/Index.vue   |  8 +-
 .../components/list/components/TableMode.vue  | 14 +---
 .../row-action/StatusResourceReplenish.vue    |  6 +-
 .../list/components/hooks/useStatusList.ts    |  6 +-
 26 files changed, 208 insertions(+), 152 deletions(-)
 create mode 100644 dbm-ui/frontend/src/views/ticket-center/common/TicketRevoke.vue
 create mode 100644 dbm-ui/frontend/src/views/ticket-center/common/action-confirm/ProcessResourceReplenish.vue
 delete mode 100644 dbm-ui/frontend/src/views/ticket-center/self-apply/hooks/use-url-redirect.ts

diff --git a/dbm-ui/frontend/src/hooks/useTicketCount.ts b/dbm-ui/frontend/src/hooks/useTicketCount.ts
index a9b712feac..acf9be0912 100644
--- a/dbm-ui/frontend/src/hooks/useTicketCount.ts
+++ b/dbm-ui/frontend/src/hooks/useTicketCount.ts
@@ -6,22 +6,22 @@ import { getTicketCount } from '@services/source/ticketFlow';
 import { useEventBus } from '@hooks';
 
 const run = () => {
+  const isLoading = ref(true);
   const data = ref<ServiceReturnType<typeof getTicketCount>>({
-    MY_APPROVE: 0,
     APPROVE: 0,
-    TODO: 0,
-    RUNNING: 0,
-    RESOURCE_REPLENISH: 0,
-    FAILED: 0,
     DONE: 0,
+    FAILED: 0,
+    INNER_TODO: 0,
+    MY_APPROVE: 0,
+    RESOURCE_REPLENISH: 0,
     SELF_MANAGE: 0,
+    TODO: 0,
   });
 
-  const { loading, run } = useRequest(getTicketCount, {
-    cacheKey: 'ticketCount',
-    cacheTime: 10000,
+  const { run } = useRequest(getTicketCount, {
     onSuccess(result) {
       data.value = result;
+      isLoading.value = false;
     },
   });
 
@@ -34,7 +34,7 @@ const run = () => {
   });
 
   return {
-    loading,
+    loading: isLoading,
     data,
   };
 };
diff --git a/dbm-ui/frontend/src/layout/components/PersonalWorkbench.vue b/dbm-ui/frontend/src/layout/components/PersonalWorkbench.vue
index c0c0fd6f7e..1d9996b67e 100644
--- a/dbm-ui/frontend/src/layout/components/PersonalWorkbench.vue
+++ b/dbm-ui/frontend/src/layout/components/PersonalWorkbench.vue
@@ -92,7 +92,7 @@
       ticketCount.value.APPROVE +
       ticketCount.value.FAILED +
       ticketCount.value.RESOURCE_REPLENISH +
-      ticketCount.value.RUNNING +
+      ticketCount.value.INNER_TODO +
       ticketCount.value.TODO
     );
   });
diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json
index e71a95a22a..868b6deeb7 100644
--- a/dbm-ui/frontend/src/locales/zh-cn.json
+++ b/dbm-ui/frontend/src/locales/zh-cn.json
@@ -3746,5 +3746,10 @@
   "强制实例下架：": "强制实例下架：",
   "Excel文件：": "Excel文件：",
   "单据t不在n单据中": "单据 {t} 不在“{n}”单据中",
+  "单据重试确认": "单据重试确认",
+  "重试后，单据将再次尝试继续执行": "重试后，单据将再次尝试继续执行",
+  "批量处理": "批量处理",
+  "新窗口打开": "新窗口打开",
+  "重试后，单据将再次尝试申请资源": "重试后，单据将再次尝试申请资源",
   "这行勿动！新增翻译请在上一行添加！": ""
 }
diff --git a/dbm-ui/frontend/src/services/source/ticketFlow.ts b/dbm-ui/frontend/src/services/source/ticketFlow.ts
index 006904d889..ccb00fe953 100644
--- a/dbm-ui/frontend/src/services/source/ticketFlow.ts
+++ b/dbm-ui/frontend/src/services/source/ticketFlow.ts
@@ -51,14 +51,14 @@ export function processTodo(params: { id: number; todo_id: number; action: strin
 // 获取单据数量
 export function getTicketCount() {
   return http.get<{
-    MY_APPROVE: number;
     APPROVE: number;
-    TODO: number;
-    RUNNING: number;
-    RESOURCE_REPLENISH: number;
-    FAILED: number;
     DONE: number;
+    FAILED: number;
+    INNER_TODO: number;
+    MY_APPROVE: number;
+    RESOURCE_REPLENISH: number;
     SELF_MANAGE: number;
+    TODO: number;
   }>(`${path}/get_tickets_count/`);
 }
 
diff --git a/dbm-ui/frontend/src/views/ticket-center/business/components/list/components/TableMode.vue b/dbm-ui/frontend/src/views/ticket-center/business/components/list/components/TableMode.vue
index 0fb786160c..b581575930 100644
--- a/dbm-ui/frontend/src/views/ticket-center/business/components/list/components/TableMode.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/business/components/list/components/TableMode.vue
@@ -43,10 +43,10 @@
           :label="t('操作')"
           width="160">
           <template #default="{ data }: { data: IRowData }">
-            <TicketDetailLink
+            <TicketClone
               v-if="data"
               :data="data" />
-            <TicketClone
+            <TicketDetailLink
               v-if="data"
               class="ml-8"
               :data="data" />
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/CardModeList.vue b/dbm-ui/frontend/src/views/ticket-center/common/CardModeList.vue
index 4098c8e19d..35d6c59822 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/CardModeList.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/CardModeList.vue
@@ -72,7 +72,7 @@
   import TicketModel from '@services/model/ticket/ticket';
   import { getTickets } from '@services/source/ticket';
 
-  import { useStretchLayout, useUrlSearch } from '@hooks';
+  import { useEventBus, useStretchLayout, useUrlSearch } from '@hooks';
 
   import EmptyStatus from '@components/empty-status/EmptyStatus.vue';
   import RenderRow from '@components/render-row/index.vue';
@@ -96,6 +96,7 @@
   const router = useRouter();
   const { t } = useI18n();
   const { getSearchParams } = useUrlSearch();
+  const eventBus = useEventBus();
   const { splitScreen: stretchLayoutSplitScreen } = useStretchLayout();
 
   const { formatValue: formatDateValue } = useDatePicker();
@@ -186,12 +187,14 @@
     });
   };
 
-  onDeactivated(() => {
-    pauseFetchData();
-  });
-
   onActivated(() => {
     currentTicketScrollToTop();
+    eventBus.on('refreshTicketStatus', fetchData);
+  });
+
+  onDeactivated(() => {
+    pauseFetchData();
+    eventBus.off('refreshTicketStatus', fetchData);
   });
 
   onMounted(() => {
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue b/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue
index 6119f79ca8..4e9a65d680 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue
@@ -183,7 +183,7 @@
   import { getTickets } from '@services/source/ticket';
   import {getInnerFlowInfo} from '@services/source/ticketFlow'
 
-  import { useStretchLayout } from '@hooks';
+  import { useEventBus, useStretchLayout  } from '@hooks';
 
   import EmptyStatus from '@components/empty-status/EmptyStatus.vue';
   import TicketStatusTag from '@components/ticket-status-tag/Index.vue';
@@ -218,6 +218,7 @@
   }>()
 
   const { t } = useI18n();
+  const eventBus = useEventBus();
   const { isSplited: isStretchLayoutOpen } = useStretchLayout();
 
   let isInited = false;
@@ -301,8 +302,6 @@
       pagination.current = 1;
     }
 
-    console.log('from watch fetchdata = ', window.location.href)
-
     fetchData();
   });
 
@@ -390,17 +389,21 @@
   }
 
   const fetchRefresh = () => {
+    rowSelectMemo.value = {}
+    triggerSelection();
     fetchData();
   }
 
   onActivated(() => {
     resumeFetchData();
     resumeFetchInnerFlowInfo();
+    eventBus.on('refreshTicketStatus', fetchRefresh);
   })
 
   onDeactivated(() => {
     pauseFetchData();
     pauseFetchInnerFlowInfo();
+    eventBus.off('refreshTicketStatus', fetchRefresh);
   })
 
   onMounted(() => {
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/TicketClone.vue b/dbm-ui/frontend/src/views/ticket-center/common/TicketClone.vue
index 129046776c..7e00f05833 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/TicketClone.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/TicketClone.vue
@@ -36,6 +36,8 @@
 
   import { ClusterTypes, TicketTypes } from '@common/const';
 
+  import { getBusinessHref } from '@utils';
+
   interface Props {
     data: TicketModel<unknown>;
   }
@@ -178,7 +180,7 @@
           ticketType: props.data.ticket_type,
         },
       });
-      window.open(href, '_blank');
+      window.open(getBusinessHref(href, props.data.bk_biz_id), '_blank');
     }
   };
 </script>
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/TicketDetailLink.vue b/dbm-ui/frontend/src/views/ticket-center/common/TicketDetailLink.vue
index a471bdd591..d05407fade 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/TicketDetailLink.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/TicketDetailLink.vue
@@ -7,7 +7,7 @@
         ticketId: data.id,
       },
     }">
-    {{ t('查看详情') }}
+    {{ t('新窗口打开') }}
   </RouterLink>
 </template>
 <script setup lang="ts">
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/TicketRevoke.vue b/dbm-ui/frontend/src/views/ticket-center/common/TicketRevoke.vue
new file mode 100644
index 0000000000..6e077efd76
--- /dev/null
+++ b/dbm-ui/frontend/src/views/ticket-center/common/TicketRevoke.vue
@@ -0,0 +1,44 @@
+<template>
+  <DbPopconfirm
+    v-if="isCan"
+    :confirm-handler="handleRevoke"
+    :content="t('撤销后，单据将作废处理')"
+    :title="t('确定撤销单据')">
+    <BkButton theme="danger">
+      {{ t('撤销单据') }}
+    </BkButton>
+  </DbPopconfirm>
+</template>
+<script setup lang="ts">
+  import { computed } from 'vue';
+  import { useI18n } from 'vue-i18n';
+
+  import TicketModel from '@services/model/ticket/ticket';
+  import { revokeTicket } from '@services/source/ticketFlow';
+
+  import { useEventBus } from '@hooks';
+
+  import { useUserProfile } from '@stores';
+
+  interface Props {
+    data: TicketModel<unknown>;
+  }
+
+  const props = defineProps<Props>();
+
+  const { username } = useUserProfile();
+
+  const { t } = useI18n();
+  const eventBus = useEventBus();
+
+  const isCan = computed(
+    () => props.data.status === TicketModel.STATUS_APPROVE && props.data.todo_operators.includes(username),
+  );
+
+  const handleRevoke = () =>
+    revokeTicket({
+      ticket_ids: [props.data.id],
+    }).then(() => {
+      eventBus.emit('refreshTicketStatus');
+    });
+</script>
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/action-confirm/ProcessResourceReplenish.vue b/dbm-ui/frontend/src/views/ticket-center/common/action-confirm/ProcessResourceReplenish.vue
new file mode 100644
index 0000000000..866857fcfc
--- /dev/null
+++ b/dbm-ui/frontend/src/views/ticket-center/common/action-confirm/ProcessResourceReplenish.vue
@@ -0,0 +1,78 @@
+<template>
+  <DbPopconfirm
+    :confirm-handler="handleApproval"
+    placement="bottom"
+    :title="t('单据重试确认')"
+    trigger="click"
+    :width="350">
+    <slot />
+    <template #content>
+      <div>
+        {{ t('操作：') }}
+        <BkTag
+          class="mr-4"
+          theme="success"
+          type="stroke">
+          {{ t('确认执行') }}
+        </BkTag>
+        <span>{{ t('重试后，单据将再次尝试申请资源') }}</span>
+      </div>
+    </template>
+  </DbPopconfirm>
+</template>
+<script setup lang="ts">
+  import { ref } from 'vue';
+  import { useI18n } from 'vue-i18n';
+
+  import FlowMode from '@services/model/ticket/flow';
+  import TicketModel from '@services/model/ticket/ticket';
+  import { batchProcessTicket, batchProcessTodo } from '@services/source/ticketFlow';
+
+  import { useEventBus } from '@hooks';
+
+  import { messageSuccess } from '@utils';
+
+  interface Props {
+    data?: TicketModel;
+    todoData?: FlowMode['todos'][number];
+  }
+
+  const props = defineProps<Props>();
+
+  const { t } = useI18n();
+  const eventBus = useEventBus();
+
+  const isSubmitting = ref(false);
+
+  const handleApproval = () => {
+    isSubmitting.value = true;
+
+    return Promise.resolve()
+      .then(() => {
+        if (props.data) {
+          return batchProcessTicket({
+            action: 'APPROVE',
+            ticket_ids: [props.data.id],
+          });
+        }
+        if (props.todoData) {
+          return batchProcessTodo({
+            action: 'APPROVE',
+            operations: [
+              {
+                todo_id: props.todoData.id,
+              },
+            ],
+          });
+        }
+        return Promise.reject();
+      })
+      .then(() => {
+        messageSuccess(t('操作成功'));
+        eventBus.emit('refreshTicketStatus');
+      })
+      .finally(() => {
+        isSubmitting.value = false;
+      });
+  };
+</script>
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/action-confirm/ProcessRetry.vue b/dbm-ui/frontend/src/views/ticket-center/common/action-confirm/ProcessRetry.vue
index 3da72ea292..b90616bb72 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/action-confirm/ProcessRetry.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/action-confirm/ProcessRetry.vue
@@ -3,7 +3,8 @@
     :confirm-handler="handleApproval"
     placement="bottom"
     :title="t('单据重试确认')"
-    trigger="click">
+    trigger="click"
+    :width="350">
     <slot />
     <template #content>
       <div>
@@ -14,7 +15,7 @@
           type="stroke">
           {{ t('重试') }}
         </BkTag>
-        <span>{{ t('重试后，单据将再次尝试申请资源') }}</span>
+        <span>{{ t('重试后，单据将再次尝试继续执行') }}</span>
       </div>
     </template>
   </DbPopconfirm>
@@ -25,15 +26,15 @@
 
   import FlowMode from '@services/model/ticket/flow';
   import TicketModel from '@services/model/ticket/ticket';
-  import { batchProcessTicket, batchProcessTodo } from '@services/source/ticketFlow';
+  import { retryFlow } from '@services/source/ticketFlow';
 
   import { useEventBus } from '@hooks';
 
   import { messageSuccess } from '@utils';
 
   interface Props {
-    data?: TicketModel<unknown>;
-    todoData?: FlowMode<unknown>['todos'][number];
+    data: TicketModel;
+    flowData: FlowMode;
   }
 
   const props = defineProps<Props>();
@@ -41,38 +42,17 @@
   const { t } = useI18n();
   const eventBus = useEventBus();
 
-  const approveFormMode = reactive({
-    remark: '',
-  });
-
   const isSubmitting = ref(false);
 
   const handleApproval = () => {
     isSubmitting.value = true;
     return Promise.resolve()
-      .then(() => {
-        if (props.data) {
-          return batchProcessTicket({
-            action: 'APPROVE',
-            ticket_ids: [props.data.id],
-            params: approveFormMode,
-          });
-        }
-        if (props.todoData) {
-          return batchProcessTodo({
-            action: 'APPROVE',
-            operations: [
-              {
-                todo_id: props.todoData.id,
-                params: {
-                  remark: t('确认提交'),
-                },
-              },
-            ],
-          });
-        }
-        return Promise.reject();
-      })
+      .then(() =>
+        retryFlow({
+          id: props.data.id,
+          flow_id: props.flowData.id,
+        }),
+      )
       .then(() => {
         messageSuccess(t('操作成功'));
         eventBus.emit('refreshTicketStatus');
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/hooks/use-fetch-data.ts b/dbm-ui/frontend/src/views/ticket-center/common/hooks/use-fetch-data.ts
index b1451a2345..87672aa85a 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/hooks/use-fetch-data.ts
+++ b/dbm-ui/frontend/src/views/ticket-center/common/hooks/use-fetch-data.ts
@@ -42,7 +42,6 @@ const create = (dataSource: typeof getTickets, options?: { onSuccess?: (data: Ti
     },
     {
       manual: true,
-      debounceInterval: 100,
       onSuccess(data) {
         dataList.value.forEach((ticketData) => {
           if (data[ticketData.id]) {
@@ -58,7 +57,7 @@ const create = (dataSource: typeof getTickets, options?: { onSuccess?: (data: Ti
 
   const { start: loopFetchTicketStatus } = useTimeoutFn(() => {
     fetchTicketStatus();
-  }, 1000000);
+  }, 10000);
 
   const fetchTicketList = (params: ServiceParameters<typeof getTickets>) => {
     isLoading.value = true;
@@ -90,7 +89,7 @@ const create = (dataSource: typeof getTickets, options?: { onSuccess?: (data: Ti
 
   eventBus.on('refreshTicketStatus', fetchTicketStatus);
 
-  onBeforeUnmount(() => {
+  onBeforeRouteLeave(() => {
     eventBus.off('refreshTicketStatus', fetchTicketStatus);
   });
 
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/Index.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/Index.vue
index e4673f2341..928218a9b2 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/Index.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/Index.vue
@@ -36,18 +36,17 @@
               mode="collapse"
               :title="t('实施进度')">
               <FlowInfos :data="ticketData" />
-              <!-- <FlowInfo
-                :data="ticketData"
-                @refresh="handleRefreshTicketData" /> -->
             </DbCard>
           </template>
           <template
             v-if="ticketData"
             #action>
             <TicketClone
+              class="mr-8"
               :data="ticketData"
               :text="false"
               theme="" />
+            <TicketRevoke :data="ticketData" />
           </template>
         </SmartAction>
       </PermissionCatch>
@@ -66,6 +65,7 @@
   import PermissionCatch from '@components/apply-permission/Catch.vue';
 
   import TicketClone from '@views/ticket-center/common/TicketClone.vue';
+  import TicketRevoke from '@views/ticket-center/common/TicketRevoke.vue';
 
   import { useTimeoutFn } from '@vueuse/core';
 
@@ -85,7 +85,7 @@
   const getOffsetTarget = () => document.body.querySelector('.ticket-details-page .db-card');
 
   const isLoading = ref(true);
-  const ticketData = shallowRef<TicketModel<unknown>>();
+  const ticketData = shallowRef<TicketModel>();
 
   const { runAsync: fetchTicketDetails } = useRequest(
     (params: ServiceParameters<typeof getTicketDetails>) =>
@@ -104,13 +104,12 @@
   );
 
   const refreshTicketData = () => {
-    console.log('refreshTicketDatarefreshTicketDatarefreshTicketData');
     fetchTicketDetails({
       id: props.ticketId,
     });
   };
 
-  const { start: loopFetchTicketDetails } = useTimeoutFn(refreshTicketData, 1000000);
+  const { start: loopFetchTicketDetails } = useTimeoutFn(refreshTicketData, 10000);
 
   watch(
     () => props.ticketId,
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-common/StatusFailed.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-common/StatusFailed.vue
index b6f691c2c9..1e824a1ba8 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-common/StatusFailed.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-common/StatusFailed.vue
@@ -29,11 +29,13 @@
         <div
           v-if="isCanOperation && isNeedOperation"
           class="mt-12">
-          <ProcessRetry :data="ticketDetail">
+          <ProcessRetry
+            :data="ticketDetail"
+            :flow-data="data">
             <BkButton
               class="w-88"
               theme="primary">
-              {{ t('重试') }}
+              {{ t('失败重试') }}
             </BkButton>
           </ProcessRetry>
         </div>
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-inner-flow/StatusFailed.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-inner-flow/StatusFailed.vue
index 73d3eb1c9a..c9a34056ee 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-inner-flow/StatusFailed.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/flow-type-inner-flow/StatusFailed.vue
@@ -22,11 +22,13 @@
       <div
         v-if="isCanOperation && isNeedOperation"
         class="mt-12">
-        <ProcessRetry :data="ticketDetail">
+        <ProcessRetry
+          :data="ticketDetail"
+          :flow-data="data">
           <BkButton
             class="w-88"
             theme="primary">
-            {{ t('重试') }}
+            {{ t('失败重试') }}
           </BkButton>
         </ProcessRetry>
         <ProcessTerminate :data="ticketDetail">
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/todo-list/type-itsm/Index.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/todo-list/type-itsm/Index.vue
index d470f4b012..f27748756e 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/todo-list/type-itsm/Index.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/todo-list/type-itsm/Index.vue
@@ -25,6 +25,4 @@
     [FlowMode.TODO_STATUS_TODO]: StatusTodo,
     [FlowMode.TODO_STATUS_DONE_FAILED]: StatusDoneFailed,
   })[props.data.status];
-
-  console.log('from type itesm = ', props.data);
 </script>
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/todo-list/type-resource-replenish/StatusTodo.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/todo-list/type-resource-replenish/StatusTodo.vue
index 6687e281db..0b32f691af 100644
--- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/todo-list/type-resource-replenish/StatusTodo.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/flow-info/components/todo-list/type-resource-replenish/StatusTodo.vue
@@ -9,13 +9,13 @@
     </I18nT>
     <div style="margin-top: 10px; color: #979ba5">{{ utcDisplayTime(data.done_at) }}</div>
     <template v-if="isSuperuser || data.operators.includes(username)">
-      <ProcessRetry :todo-data="data">
+      <ProcessResourceReplenish :todo-data="data">
         <BkButton
           class="w-88"
           theme="primary">
           {{ t('重试') }}
         </BkButton>
-      </ProcessRetry>
+      </ProcessResourceReplenish>
       <ProcessTerminate :todo-data="data">
         <BkButton
           class="w-88 ml-8"
@@ -35,7 +35,7 @@
 
   import CostTimer from '@components/cost-timer/CostTimer.vue';
 
-  import ProcessRetry from '@views/ticket-center/common/action-confirm/ProcessRetry.vue';
+  import ProcessResourceReplenish from '@views/ticket-center/common/action-confirm/ProcessResourceReplenish.vue';
   import ProcessTerminate from '@views/ticket-center/common/action-confirm/ProcessTerminate.vue';
 
   import { utcDisplayTime, utcTimeToSeconds } from '@utils';
diff --git a/dbm-ui/frontend/src/views/ticket-center/self-apply/Index.vue b/dbm-ui/frontend/src/views/ticket-center/self-apply/Index.vue
index 1e0a578175..fc76948776 100644
--- a/dbm-ui/frontend/src/views/ticket-center/self-apply/Index.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/self-apply/Index.vue
@@ -50,7 +50,7 @@
 
   const isPreChecking = useDetailPreCheck({
     id: ticketId.value,
-    self_manage: 1,
+    self_manage: 0,
   });
 
   const handleStretchLayoutChange = (value: boolean) => {
diff --git a/dbm-ui/frontend/src/views/ticket-center/self-apply/components/list/components/CardMode.vue b/dbm-ui/frontend/src/views/ticket-center/self-apply/components/list/components/CardMode.vue
index 1fdc325f6e..9a6fe287a3 100644
--- a/dbm-ui/frontend/src/views/ticket-center/self-apply/components/list/components/CardMode.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/self-apply/components/list/components/CardMode.vue
@@ -39,7 +39,7 @@
   const dataSource = (params: ServiceParameters<typeof getTickets>) =>
     getTickets({
       ...params,
-      self_manage: 1,
+      self_manage: 0,
     });
 </script>
 <style lang="less">
diff --git a/dbm-ui/frontend/src/views/ticket-center/self-apply/components/list/components/TableMode.vue b/dbm-ui/frontend/src/views/ticket-center/self-apply/components/list/components/TableMode.vue
index a4df4ea67b..e86fa3dc6c 100644
--- a/dbm-ui/frontend/src/views/ticket-center/self-apply/components/list/components/TableMode.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/self-apply/components/list/components/TableMode.vue
@@ -44,10 +44,10 @@
           :label="t('操作')"
           width="160">
           <template #default="{ data }: { data: IRowData }">
-            <TicketDetailLink
+            <TicketClone
               v-if="data"
               :data="data" />
-            <TicketClone
+            <TicketDetailLink
               v-if="data"
               class="ml-8"
               :data="data" />
@@ -90,7 +90,7 @@
   const dataSource = (params: ServiceParameters<typeof getTickets>) =>
     getTickets({
       ...params,
-      self_manage: 1,
+      self_manage: 0,
     });
 
   const selectTicketId = ref(0);
diff --git a/dbm-ui/frontend/src/views/ticket-center/self-apply/hooks/use-url-redirect.ts b/dbm-ui/frontend/src/views/ticket-center/self-apply/hooks/use-url-redirect.ts
deleted file mode 100644
index 81a864cce2..0000000000
--- a/dbm-ui/frontend/src/views/ticket-center/self-apply/hooks/use-url-redirect.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { ref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-
-import { getTicketDetails } from '@services/source/ticket';
-
-import { useUserProfile } from '@stores';
-
-export default (ticketId?: number) => {
-  const router = useRouter();
-  const route = useRoute();
-  const { username } = useUserProfile();
-
-  const isLoading = ref(false);
-
-  if (ticketId) {
-    isLoading.value = true;
-    getTicketDetails({
-      id: ticketId,
-    })
-      .then((data) => {
-        if (data.creator === username) {
-          return;
-        }
-        if (data.isTodo) {
-          if (route.name !== 'MyTodos') {
-            router.replace({
-              name: 'MyTodos',
-              params: {
-                status: data.status,
-                ticketId,
-              },
-              query: {
-                id: ticketId,
-              },
-            });
-          }
-        }
-      })
-      .finally(() => {
-        isLoading.value = false;
-      });
-  }
-
-  return {
-    loading: isLoading,
-  };
-};
diff --git a/dbm-ui/frontend/src/views/ticket-center/self-todo/Index.vue b/dbm-ui/frontend/src/views/ticket-center/self-todo/Index.vue
index d49b1cab16..e658dcb1b4 100644
--- a/dbm-ui/frontend/src/views/ticket-center/self-todo/Index.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/self-todo/Index.vue
@@ -22,10 +22,10 @@
     <template #list>
       <List />
     </template>
-    <template
-      v-if="ticketId"
-      #right>
-      <Detail :ticket-id="ticketId" />
+    <template #right>
+      <Detail
+        v-if="ticketId"
+        :ticket-id="ticketId" />
     </template>
   </StretchLayout>
 </template>
diff --git a/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/TableMode.vue b/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/TableMode.vue
index 21273060e3..cf7dbba9a5 100644
--- a/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/TableMode.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/TableMode.vue
@@ -79,7 +79,7 @@
   import TicketModel from '@services/model/ticket/ticket';
   import { getTickets } from '@services/source/ticket';
 
-  import { useEventBus, useStretchLayout, useUrlSearch } from '@hooks';
+  import { useStretchLayout, useUrlSearch } from '@hooks';
 
   import useDatePicker from '@views/ticket-center/common/hooks/use-date-picker';
   import useSearchSelect from '@views/ticket-center/common/hooks/use-search-select';
@@ -93,7 +93,6 @@
   const router = useRouter();
 
   const { t } = useI18n();
-  const eventBus = useEventBus();
   const currentInstance = getCurrentInstance();
 
   const { list: statusList, defaultStatus } = useStatusList();
@@ -139,11 +138,6 @@
     });
   });
 
-  const handleRefreshTable = () => {
-    dataTableRef.value!.fetchData();
-    dataTableRef.value!.resetSelection();
-  };
-
   const handleShowDetail = (data: TicketModel) => {
     stretchLayoutSplitScreen();
     selectTicketId.value = data.id;
@@ -153,8 +147,6 @@
     selectTicketIdList.value = data;
   };
 
-  eventBus.on('refreshTicketStatus', handleRefreshTable);
-
   onActivated(() => {
     ticketStatus.value = defaultStatus.value;
     selectTicketId.value = Number(route.query.selectId);
@@ -175,10 +167,6 @@
       });
     });
   });
-
-  onBeforeUnmount(() => {
-    eventBus.off('refreshTicketStatus', handleRefreshTable);
-  });
 </script>
 <style lang="less">
   .ticket-list-table-mode {
diff --git a/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/components/row-action/StatusResourceReplenish.vue b/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/components/row-action/StatusResourceReplenish.vue
index efa9359a69..e2a22bb643 100644
--- a/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/components/row-action/StatusResourceReplenish.vue
+++ b/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/components/row-action/StatusResourceReplenish.vue
@@ -1,11 +1,11 @@
 <template>
-  <ProcessRetry :data="data">
+  <ProcessResourceReplenish :data="data">
     <BkButton
       text
       theme="primary">
       {{ t('重试') }}
     </BkButton>
-  </ProcessRetry>
+  </ProcessResourceReplenish>
   <ProcessTerminate :data="data">
     <BkButton
       class="ml-8"
@@ -23,7 +23,7 @@
 
   import TicketModel from '@services/model/ticket/ticket';
 
-  import ProcessRetry from '@views/ticket-center/common/action-confirm/ProcessRetry.vue';
+  import ProcessResourceReplenish from '@views/ticket-center/common/action-confirm/ProcessResourceReplenish.vue';
   import ProcessTerminate from '@views/ticket-center/common/action-confirm/ProcessTerminate.vue';
   import TicketDetailLink from '@views/ticket-center/common/TicketDetailLink.vue';
 
diff --git a/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/hooks/useStatusList.ts b/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/hooks/useStatusList.ts
index 9285523e46..a37a9d502b 100644
--- a/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/hooks/useStatusList.ts
+++ b/dbm-ui/frontend/src/views/ticket-center/self-todo/components/list/components/hooks/useStatusList.ts
@@ -37,9 +37,9 @@ export default () => {
       count: ticketCount.value.FAILED,
     },
     {
-      id: TicketModel.STATUS_RUNNING,
-      name: `${t('待继续')}(${ticketCount.value.RUNNING})`,
-      count: ticketCount.value.RUNNING,
+      id: TicketModel.STATUS_INNER_TODO,
+      name: `${t('待继续')}(${ticketCount.value.INNER_TODO})`,
+      count: ticketCount.value.INNER_TODO,
     },
   ]);