diff --git a/frontend/src/components/pure/navbar/index.vue b/frontend/src/components/pure/navbar/index.vue
index 72f2b94682..e9b84ee82e 100644
--- a/frontend/src/components/pure/navbar/index.vue
+++ b/frontend/src/components/pure/navbar/index.vue
@@ -93,7 +93,7 @@
-
+
diff --git a/frontend/src/views/taskCenter/component/caseTaskDetailTable.vue b/frontend/src/views/taskCenter/component/caseTaskDetailTable.vue
index a0018fe5ab..fe53f4f3b2 100644
--- a/frontend/src/views/taskCenter/component/caseTaskDetailTable.vue
+++ b/frontend/src/views/taskCenter/component/caseTaskDetailTable.vue
@@ -408,7 +408,7 @@
org: getOrganizationExecuteTaskDetailList,
}[props.type];
- const { propsRes, propsEvent, loadList, setLoadListParams, getTableQueryParams, resetSelector } = useTable(
+ const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector } = useTable(
currentExecuteTaskDetailList,
{
tableKey: TableKeyEnum.TASK_CENTER_CASE_TASK_DETAIL,
@@ -499,6 +499,13 @@
org: organizationBatchStopTaskDetail,
}[props.type];
+ const conditionParams = computed(() => {
+ return {
+ keyword: keyword.value,
+ filter: propsRes.value.filter,
+ };
+ });
+
function stopTask(record?: TaskCenterTaskDetailItem, isBatch?: boolean, params?: BatchActionQueryParams) {
let title = t('ms.taskCenter.stopTaskTitle', { name: characterLimit(record?.taskName) });
if (isBatch) {
@@ -512,9 +519,6 @@
content: t('ms.taskCenter.stopTimeTaskTip'),
okText: t('common.stopConfirm'),
cancelText: t('common.cancel'),
- okButtonProps: {
- status: 'danger',
- },
maskClosable: false,
onBeforeOk: async () => {
try {
@@ -523,7 +527,7 @@
selectIds: params?.selectedIds || [],
selectAll: !!params?.selectAll,
excludeIds: params?.excludeIds || [],
- ...getTableQueryParams(),
+ ...conditionParams.value,
});
} else {
await currentStopTask(record?.id || '');
diff --git a/frontend/src/views/taskCenter/component/caseTaskTable.vue b/frontend/src/views/taskCenter/component/caseTaskTable.vue
index 45ec156204..899d97a5d4 100644
--- a/frontend/src/views/taskCenter/component/caseTaskTable.vue
+++ b/frontend/src/views/taskCenter/component/caseTaskTable.vue
@@ -483,7 +483,7 @@
},
],
};
- const { propsRes, propsEvent, loadList, setLoadListParams, getTableQueryParams, resetSelector } = useTable(
+ const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector } = useTable(
currentExecuteTaskList,
{
tableKey: TableKeyEnum.TASK_CENTER_CASE_TASK,
@@ -573,6 +573,13 @@
org: organizationBatchDeleteTask,
}[props.type];
+ const conditionParams = computed(() => {
+ return {
+ keyword: keyword.value,
+ filter: propsRes.value.filter,
+ };
+ });
+
/**
* 删除任务
*/
@@ -600,7 +607,7 @@
selectIds: params?.selectedIds || [],
selectAll: !!params?.selectAll,
excludeIds: params?.excludeIds || [],
- ...getTableQueryParams(),
+ ...conditionParams.value,
});
} else {
await currentDeleteTask(record?.id || '');
@@ -653,7 +660,7 @@
selectIds: params?.selectedIds || [],
selectAll: !!params?.selectAll,
excludeIds: params?.excludeIds || [],
- ...getTableQueryParams(),
+ ...conditionParams.value,
});
} else {
await currentStopTask(record?.id || '');
diff --git a/frontend/src/views/taskCenter/component/systemTaskTable.vue b/frontend/src/views/taskCenter/component/systemTaskTable.vue
index 0cde497385..ce2ad7cfe3 100644
--- a/frontend/src/views/taskCenter/component/systemTaskTable.vue
+++ b/frontend/src/views/taskCenter/component/systemTaskTable.vue
@@ -369,7 +369,7 @@
project: getProjectScheduleList,
}[props.type];
- const { propsRes, propsEvent, loadList, setLoadListParams, getTableQueryParams, resetSelector } = useTable(
+ const { propsRes, propsEvent, loadList, setLoadListParams, resetSelector } = useTable(
currentScheduleList,
{
tableKey: TableKeyEnum.TASK_CENTER_SYSTEM_TASK,
@@ -431,6 +431,13 @@
});
}
+ const conditionParams = computed(() => {
+ return {
+ keyword: keyword.value,
+ filter: propsRes.value.filter,
+ };
+ });
+
const currentBatchOpenSchedule = {
system: systemBatchOpenTask,
org: organizationBatchOpenTask,
@@ -443,7 +450,7 @@
selectIds: params?.selectedIds || [],
selectAll: !!params?.selectAll,
excludeIds: params?.excludeIds || [],
- ...getTableQueryParams(),
+ ...conditionParams.value,
});
Message.success(t('ms.taskCenter.openTaskSuccess'));
resetSelector();
@@ -468,7 +475,7 @@
selectIds: params?.selectedIds || [],
selectAll: !!params?.selectAll,
excludeIds: params?.excludeIds || [],
- ...getTableQueryParams(),
+ ...conditionParams.value,
});
Message.success(t('ms.taskCenter.closeTaskSuccess'));
resetSelector();