diff --git a/vue-fastapi-backend/module_admin/service/metadata_config_service.py b/vue-fastapi-backend/module_admin/service/metadata_config_service.py index d97ef47..888fd8d 100644 --- a/vue-fastapi-backend/module_admin/service/metadata_config_service.py +++ b/vue-fastapi-backend/module_admin/service/metadata_config_service.py @@ -602,7 +602,8 @@ class MetadataConfigService: else: if message: message += ", " - message += page_object.biz_name + "-批次标签修改失败" + message += page_object.biz_name + "-批次标签修改失败:"+responsPutJson['msg'] + return message @classmethod async def delete_task_biz_config_services( @@ -776,7 +777,7 @@ class MetadataConfigService: if delresponsJson['msg'] == 'success': metatask_info = await cls.get_task_biz_config_detail_services(query_db, process.metaTaskId) metatask_info2 = metatask_info.model_dump(exclude_unset=True) - metatask_info2.schId="" + metatask_info2['schId']="" await MetadataConfigDao.edit_task_biz_config(query_db,metatask_info.onum, metatask_info2) await query_db.commit() return "调度删除成功!" diff --git a/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue b/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue index 3581206..0d30b5f 100644 --- a/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue +++ b/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue @@ -508,33 +508,54 @@ async function loadRightTable(onum) { try { const res = await getTaskBizRelaList(onum) rightTableData.value = res.data || [] + + // 初始化时同步过滤左边 + filterLeftTable() } catch { ElMessage.error('加载右侧表数据失败') } } +function filterLeftTable() { + const rightKeys = new Set(rightTableData.value.map(buildKey)) + leftTableData.value = leftTableData.value.filter( + item => !rightKeys.has(buildKey(item)) + ) +} + function buildKey(row) { return `${row.ssysCd}||${row.mdlName}||${row.tabEngName}` } function moveToRight() { const existingKeys = new Set(rightTableData.value.map(buildKey)) - leftSelected.value.forEach(item => { - if (!existingKeys.has(buildKey(item))) { - let additem=item - additem.onum=item.extractOnum - rightTableData.value.push(item) - } + const toMove = leftSelected.value.filter(item => !existingKeys.has(buildKey(item))) + toMove.forEach(item => { + let additem = { ...item, onum: item.extractOnum } + rightTableData.value.push(additem) }) + // 左边删除选中的 + leftTableData.value = leftTableData.value.filter( + item => !toMove.includes(item) + ) + leftSelected.value = [] } + function moveToLeft() { const removeKeys = new Set(rightSelected.value.map(buildKey)) - rightTableData.value = rightTableData.value.filter( - item => !removeKeys.has(buildKey(item)) - ) + + // 把右边选中的去掉 + const toRemove = rightTableData.value.filter(item => removeKeys.has(buildKey(item))) + rightTableData.value = rightTableData.value.filter(item => !removeKeys.has(buildKey(item))) + + // 放回左边 + leftTableData.value.push(...toRemove) + + rightSelected.value = [] } + function resetQuery() { queryForm.bizName = '' queryForm.pageNum = 1 @@ -560,6 +581,10 @@ function openEditDialog(row) { if (!row) { ElMessage.warning('请选择一条记录进行编辑') return + } + if (row.status !== 'OFFLINE') { + ElMessage.warning('仅支持下线状态的任务进行修改') + return } title.value = '编辑标签任务' Object.assign(form, row) @@ -709,7 +734,7 @@ function handleDeleteSche() { try { console.log(onums.value,"ssssssss") - await dsmetataskdelete({processDefinitionCode:dsIds.value.toString(),onum:onums.value.toString()}) + await dsmetataskdelete({processDefinitionCode:dsIds.value.toString(),metaTaskId:onums.value.toString()}) ElMessage.success('删除调度成功') getList()