diff --git a/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py b/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py
index 7544db7..817bc69 100644
--- a/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py
+++ b/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py
@@ -401,6 +401,7 @@ class MetadataConfigDao:
async def get_task_biz_config_list(cls, db: AsyncSession, query_object, is_page: bool = False):
query = select(TaskBizConfig).where(
TaskBizConfig.risk_lvl.like(f"%{query_object.risk_lvl}%") if query_object.risk_lvl else True,
+ TaskBizConfig.biz_name.like(f"%{query_object.biz_name}%") if query_object.biz_name else True,
TaskBizConfig.isStop == query_object.isStop if query_object.isStop is not None else True,
TaskBizConfig.create_time.between(
datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time.min),
diff --git a/vue-fastapi-backend/module_admin/service/datastd_service.py b/vue-fastapi-backend/module_admin/service/datastd_service.py
index f4a6def..f21ffc3 100644
--- a/vue-fastapi-backend/module_admin/service/datastd_service.py
+++ b/vue-fastapi-backend/module_admin/service/datastd_service.py
@@ -425,7 +425,7 @@ class DataStdService:
item.create_time = datetime.now()
item.upd_prsn = current_user.user.user_name
item.upd_time = datetime.now()
- item.src_sys = '公司级' if 'company' == item.cd_type else item.src_sys
+ item.src_sys = 10000 if 'company' == item.cd_type else item.src_sys
item.parent_id = appr_model.onum # 设置父级 ID
# 校验代码项是否已存在于正式表中
@@ -549,7 +549,7 @@ class DataStdService:
item.upd_time = datetime.now()
item.create_by = current_user.user.user_name
item.create_time = datetime.now()
- item.src_sys = '公司级' if 'company' == item.cd_type else item.src_sys
+ item.src_sys = 10000 if 'company' == item.cd_type else item.src_sys
if item.onum: # 修改项
if not await cls.check_code_unique_services(query_db, item):
@@ -610,7 +610,7 @@ class DataStdService:
apply_model = ApplyModel()
apply_model.businessType = "dataStdCode"
apply_model.businessId = appr_model.flowId
- apply_model.applicant = appr_model.upd_prsn
+ apply_model.applicant = current_user.user.user_name
await ApprovalService.apply_services(query_db, apply_model, 'dataStdCode')
return CrudResponseModel(is_success=True, message='提交修改标准代码审批成功!')
diff --git a/vue-fastapi-backend/module_admin/service/metasecurity_service.py b/vue-fastapi-backend/module_admin/service/metasecurity_service.py
index 280e8fc..8231941 100644
--- a/vue-fastapi-backend/module_admin/service/metasecurity_service.py
+++ b/vue-fastapi-backend/module_admin/service/metasecurity_service.py
@@ -634,7 +634,7 @@ async def generate_sql(tablesRowCol: dict, table_columns: dict):
if not cfg.get("isHave", False)
]
if no_config_tables:
- raise ValueError(f"表:{','.join(no_config_tables)} 均未配置行列数据安全")
+ raise ValueError(f"您没有查看{','.join(no_config_tables)} 表记录的权限,请联系管理员配置相关行/列 数据安全策略")
# ========= 1. 遍历每个表 =========
for table_name, config in tablesRowCol.items():
diff --git a/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue b/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue
index 9dceb68..7c420c8 100644
--- a/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue
+++ b/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue
@@ -185,7 +185,7 @@
@@ -617,7 +617,7 @@ function submitForm() {
"dataAstClas": JSON.stringify(astTags.value)?JSON.stringify(astTags.value):"",
"dataAstCont": form.value.dataAstCont?form.value.dataAstCont:"",
"dataAstFaq": form.value.dataAstFaq?form.value.dataAstFaq:"",
- "dataAstSrc": form.value.dataAstSrc,
+ "dataAstSrc": getIdByName(form.value.dataAstSrc),
"versionNo": form.value.versionNo,
"ctrlFlag": form.value.ctrlFlag,
}
diff --git a/vue-fastapi-frontend/src/views/datastd/stdcode/codeItem.vue b/vue-fastapi-frontend/src/views/datastd/stdcode/codeItem.vue
index 0478b57..b9dcd6d 100644
--- a/vue-fastapi-frontend/src/views/datastd/stdcode/codeItem.vue
+++ b/vue-fastapi-frontend/src/views/datastd/stdcode/codeItem.vue
@@ -138,7 +138,7 @@
>
{
return data.name.indexOf(value) !== -1;
};
const handleNodeClick = (data) => {
- if(data==9999){
- queryParams.value.srcSys =undefined;
-
- }else{
+ currentTreeNode.value = data;
+
+ if (data.id === 10000) {
+ // 公司级
+ queryParams.value.cdType = 'company';
+ queryParams.value.srcSys = undefined;
+ } else {
+ // 系统级
+ queryParams.value.cdType = 'sys';
queryParams.value.srcSys = data.id;
-
}
-
+
handleQuery();
};
+
function importTemplate() {
proxy.download("datastd/stdCode/importTemplate", {
}, `标准代码_template_${new Date().getTime()}.xlsx`);
@@ -340,6 +345,8 @@ const codeVisible = ref(false);
const mapVisible = ref(false);
const mapStdVisible = ref(false);
const codeMapId = ref(null);
+// 当前左侧树选中的节点
+const currentTreeNode = ref(null);
// 点击代码名称,弹出第二个对话框并传递数据
const handleCodeClick = (row) => {
@@ -385,16 +392,31 @@ const resetQuery = () => {
const handleAdd = () => {
dialogTitle.value = "新增标准代码";
+
+ // 默认公司级
+ var cdType = 'company';
+ var srcSys = undefined;
+
+ // 如果当前左侧选中了系统节点
+ if (currentTreeNode.value && currentTreeNode.value.id !== 10000) {
+
+ cdType = 'sys';
+ srcSys = currentTreeNode.value.id;
+ console.log(srcSys,cdType)
+ }
+
form.value = {
id: '',
cdNo: '',
cdValCnMean: '',
- cdType: '',
+ cdType:cdType,
cdValStat: '',
sysName: '',
- srcSys: '',
+ srcSys:srcSys
};
- selectedRow.value={...form.value}
+
+ selectedRow.value = { ...form.value };
+ console.log( selectedRow.value,"selectedRow.val22ue")
dialogVisible2.value = true;
};
diff --git a/vue-fastapi-frontend/src/views/datastd/stddict/index.vue b/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
index 1205ec9..151a3b1 100644
--- a/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
+++ b/vue-fastapi-frontend/src/views/datastd/stddict/index.vue
@@ -522,7 +522,10 @@ const handleAdd = () => {
dataStdItOwnershipDept: "",
dataStdItOwnershipPrsn: "",
};
-
+if(queryParams.value.srcSys){
+ selectedRow.value.dataDictVest="sys"
+ selectedRow.value.srcSys=queryParams.value.srcSys
+}
// 清空选中的数据
dialogVisible.value = true;
};
diff --git a/vue-fastapi-frontend/src/views/meta/metatask/index.vue b/vue-fastapi-frontend/src/views/meta/metatask/index.vue
index 6da4b2a..f0897e8 100644
--- a/vue-fastapi-frontend/src/views/meta/metatask/index.vue
+++ b/vue-fastapi-frontend/src/views/meta/metatask/index.vue
@@ -779,8 +779,7 @@ const resetQuery = () => {
proxy.resetForm("queryForm");
queryParams.value.dbRCode = clickNode.value?.id;
- proxy.tree.setCurrentKey(null);
- handleQuery();
+ handleQuery();
};
const handleSelectionChange = (selection) => {
diff --git a/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue b/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue
index 7fc00da..94b1fa2 100644
--- a/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue
+++ b/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue
@@ -292,7 +292,7 @@
/>
- 查询
+ 查询
@@ -533,6 +533,11 @@ async function loadLeftTable() {
ElMessage.error('加载左侧表数据失败')
}
}
+async function seacheLeft() {
+ leftQueryForm.pageNum=1
+
+ loadLeftTable()
+}
async function loadRightTable(onum) {
try {
@@ -603,6 +608,7 @@ function openAddDialog() {
onum: null,
bizName: '',
})
+ loadLeftTable()
rightTableData.value = []
open.value = true
}
diff --git a/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue b/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue
index c47aac0..4cb3b97 100644
--- a/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue
+++ b/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue
@@ -30,8 +30,18 @@ getNameById(scope.row.srcSys)
-
-
+
+
+
+
+
+ {{ row.dataDictBusiMean?.length > 20
+ ? row.dataDictBusiMean.slice(0, 20) + '...'
+ : row.dataDictBusiMean }}
+
+
+
+