From 682c780b6df1c19bbe44a87a50ebbb2d7ca433e1 Mon Sep 17 00:00:00 2001 From: xueyinfei <1207092115@qq.com> Date: Tue, 26 Aug 2025 11:18:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=83=E6=95=B0=E6=8D=AE=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue-fastapi-backend/module_admin/dao/meta_dao.py | 4 ++-- .../module_admin/service/approval_service.py | 2 +- .../src/views/system/flow/index.vue | 13 ++++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/vue-fastapi-backend/module_admin/dao/meta_dao.py b/vue-fastapi-backend/module_admin/dao/meta_dao.py index 649111a..d7e3717 100644 --- a/vue-fastapi-backend/module_admin/dao/meta_dao.py +++ b/vue-fastapi-backend/module_admin/dao/meta_dao.py @@ -419,8 +419,8 @@ class MetaDao: @classmethod async def get_meta_col_supp_vett(cls, table: MetadataSuppInfoVett, db: AsyncSession): - sql_query = text("select max(apply_time) from t_metadata_fld_supp_info_vett where ssys_id ='" + table.ssys_id + - "' and mdl_name = '" + table.mdl_name + "' and tab_eng_name = '" + table.tab_eng_name + + sql_query = text("select max(apply_time) from t_metadata_fld_supp_info_vett where ssys_id =" + str(table.ssys_id) + + " and mdl_name = '" + table.mdl_name + "' and tab_eng_name = '" + table.tab_eng_name + "'") maxTime = (await db.execute(sql_query)).scalar() diff --git a/vue-fastapi-backend/module_admin/service/approval_service.py b/vue-fastapi-backend/module_admin/service/approval_service.py index f1ab552..7c2925a 100644 --- a/vue-fastapi-backend/module_admin/service/approval_service.py +++ b/vue-fastapi-backend/module_admin/service/approval_service.py @@ -131,7 +131,7 @@ class ApprovalService: await MetaDao.insertMetadataFldSuppInfo(column, result_db) else: await MetaDao.updateMetadataFldSuppInfo(suppColumn.onum, column, result_db) - suppTable = await MetaDao.get_supp_table_by_vett(table.ssys_cd, table.mdl_name, table.tab_eng_name, result_db) + suppTable = await MetaDao.get_supp_table_by_vett(table.ssys_id, table.mdl_name, table.tab_eng_name, result_db) await MetaDao.updateMetadataSuppInfoVett(table.onum, operateType, result_db) if operateType != 'canceled': if suppTable is None: diff --git a/vue-fastapi-frontend/src/views/system/flow/index.vue b/vue-fastapi-frontend/src/views/system/flow/index.vue index 453af60..6c9c481 100644 --- a/vue-fastapi-frontend/src/views/system/flow/index.vue +++ b/vue-fastapi-frontend/src/views/system/flow/index.vue @@ -563,16 +563,18 @@ import DataStdMainTable from '@/views/system/flow/dataStdMainAppr.vue'; // 路 import DataStdDictTable from '@/views/system/flow/dataStdDictAppr.vue'; // 路径根据实际调整 import DataStdCodeTable from '@/views/system/flow/dataStdCodeAppr.vue'; // 路径根据实际调整 import DataAssetMainAppr from "@/views/system/flow/dataAssetMainAppr.vue"; // 路径根据实际调整 +import { ref, nextTick, computed, watch, reactive, onMounted } from 'vue' +import cache from "../../../plugins/cache.js"; +import {Graph} from "@antv/x6"; +import useUserStore from "@/store/modules/user.js"; +const userStore = useUserStore(); // 正确调用 +const dsSysList = userStore.dsSysList; // 访问属性 const stdMainVisible = ref(false); const stdDictVisible = ref(false); const stdCodeVisible = ref(false); const dataAssetMainVisible = ref(false); const { proxy } = getCurrentInstance(); -import { ref, nextTick, computed, watch, reactive, onMounted } from 'vue' -import cache from "../../../plugins/cache.js"; -import {Graph} from "@antv/x6"; - const flowTab = ref('waiting') const selectedFlowId = ref(''); @@ -884,6 +886,7 @@ function showBusinessDataDialog(row){ } table.showTabClas = showOldTabClas oldTableInfo.value = JSON.parse(JSON.stringify(table)) + oldTableInfo.value.ssysCd = dsSysList.find(item => item.id === oldTableInfo.value.ssysId)?.name newTableInfo.value = { applyStatus:data.table.applyStatus, applyTime:data.table.applyTime, @@ -894,7 +897,7 @@ function showBusinessDataDialog(row){ pic:data.table.pic, recStat:data.table.recStat, recSubmPrsn:data.table.recSubmPrsn, - ssysCd:data.table.ssysCd, + ssysCd:dsSysList.find(item => item.id === data.table.ssysId)?.name, tabClas:data.table.tabClas, tabCrrctName:data.table.tabCrrctName, tabDesc:data.table.tabDesc,