diff --git a/vue-fastapi-backend/module_admin/dao/datastd_dao.py b/vue-fastapi-backend/module_admin/dao/datastd_dao.py
index bcd5c70..67215f5 100644
--- a/vue-fastapi-backend/module_admin/dao/datastd_dao.py
+++ b/vue-fastapi-backend/module_admin/dao/datastd_dao.py
@@ -824,6 +824,13 @@ class DataStdDao:
filters = []
if query_object.data_std_cn_name:
filters.append(DataStdMain.data_std_cn_name.like(f"%{query_object.data_std_cn_name}%"))
+ if query_object.data_std_eng_name:
+ filters.append(
+ or_(
+ DataStdMain.data_std_cn_name.like(f"%{query_object.data_std_eng_name}%"),
+ DataStdMain.data_std_eng_name.like(f"%{query_object.data_std_eng_name}%")
+ )
+ )
if query_object.data_std_busi_defn:
filters.append(DataStdMain.data_std_busi_defn.like(f"%{query_object.data_std_busi_defn}%"))
if query_object.data_std_no:
diff --git a/vue-fastapi-backend/module_admin/entity/do/datastd_do.py b/vue-fastapi-backend/module_admin/entity/do/datastd_do.py
index 79cae7d..25951ab 100644
--- a/vue-fastapi-backend/module_admin/entity/do/datastd_do.py
+++ b/vue-fastapi-backend/module_admin/entity/do/datastd_do.py
@@ -1,6 +1,7 @@
from sqlalchemy import Column, Integer, String, DateTime,Text, DateTime,Date, BigInteger
from config.database import Base
from datetime import datetime
+from sqlalchemy.dialects.mysql import MEDIUMTEXT
# 数据标准模块相关表
@@ -67,9 +68,9 @@ class DataStdDict(Base):
data_dict_type = Column(String(1), default=None, comment='字典类型（0：基础数据 1：指标数据）')
src_sys = Column(Integer, default=None, comment='归属系统')
data_dict_busi_mean = Column(String(200), default=None, comment='字典业务定义')
- data_dict_data_type = Column(String(20), default=None, comment='数据类型')
+ data_dict_data_type = Column(String(100), default=None, comment='数据类型')
data_std_no = Column(String(50), default=None, comment='数据标准编号')
- src_sys_tab_fld_name = Column(String(1000), default=None, comment='来源系统表字段名')
+ src_sys_tab_fld_name = Column(MEDIUMTEXT, default=None, comment='来源系统表字段名')
data_dict_stat = Column(String(1), default=None, comment='字典状态（1：有效 0：无效）')
class DataStdDictAppr(Base):
@@ -92,8 +93,8 @@ class DataStdDictAppr(Base):
data_dict_busi_mean = Column(String(200), default=None, comment='字典业务定义')
data_std_no = Column(String(50), default=None, comment='数据标准编号')
data_dict_stat = Column(String(1), default=None, comment='字典状态（1：有效 0：无效）')
- data_dict_data_type = Column(String(20), default=None, comment='数据类型')
- src_sys_tab_fld_name = Column(String(1000), default=None, comment='来源系统表字段名')
+ data_dict_data_type = Column(String(100), default=None, comment='数据类型')
+ src_sys_tab_fld_name = Column(MEDIUMTEXT, default=None, comment='来源系统表字段名')
changeType = Column(String(10), default=None, comment='变更类型')
flowId = Column(String(50), default=None, comment='审批Id')
oldInstId = Column(String(50), default=None, comment='原始正式id')
diff --git a/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue b/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue
index 97b9b6c..c078f00 100644
--- a/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue
+++ b/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue
@@ -12,6 +12,36 @@
label-width="120px"
:rules="formRules"
>
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
{
console.error(error)
}
}
+const showSys = ref(false);
+function changeCodeType(data) {
+ if (data != "company") {
+ showSys.value = true;
+ formData.value.sysName = "";
+ formData.value.srcSys = undefined;
+ } else {
+ showSys.value = false;
+ formData.value.sysName = "公司级";
+ formData.value.srcSys = 10000;
+ }
+}
// 系统选择变化处理
const handleSystemChange = (id) => {
const system = props.dbResourceOldList.find(item => item.id === id)
@@ -325,7 +354,6 @@ const handleSubmit = () => {
}
} catch (error) {
console.error('提交失败:', error);
- ElMessage.error(`请求失败: ${error.message}`);
// 特定错误处理（如数据库约束错误）
if (error.message.includes('cannot be null')) {
diff --git a/vue-fastapi-frontend/src/views/datastd/main/index.vue b/vue-fastapi-frontend/src/views/datastd/main/index.vue
index 0091604..cd94876 100644
--- a/vue-fastapi-frontend/src/views/datastd/main/index.vue
+++ b/vue-fastapi-frontend/src/views/datastd/main/index.vue
@@ -171,9 +171,12 @@
-
+
+
+
+
@@ -238,7 +241,18 @@
>
-
+
+
+
+ {{row.dataStdEngName}}
+
+
+
@@ -452,6 +466,7 @@ const mapVisible = ref(false);
const directoryTableData = ref([])
const queryParams = ref({
+ dataStdEngName: '',
dataStdNo: '',
dataStdBusiDefn: '',
beltDataStdContent:null,
@@ -460,7 +475,7 @@ const queryParams = ref({
});
const getSrcSysName = (id) => {
const match = dbResourceOldList.value.find(item => item.id === id);
- return match ? match.name : id;
+ return match ? match.name : "公司级";
};
const single = ref(true);
const multiple = ref(true);
diff --git a/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue b/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue
index 4ad17ea..6697d13 100644
--- a/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue
+++ b/vue-fastapi-frontend/src/views/datastd/stdcode/index.vue
@@ -98,7 +98,7 @@
{{ scope.row.cdValCnMean }}
diff --git a/vue-fastapi-frontend/src/views/datastd/stddict/AddEditForm.vue b/vue-fastapi-frontend/src/views/datastd/stddict/AddEditForm.vue
index 6da5dd7..f1271c7 100644
--- a/vue-fastapi-frontend/src/views/datastd/stddict/AddEditForm.vue
+++ b/vue-fastapi-frontend/src/views/datastd/stddict/AddEditForm.vue
@@ -16,7 +16,7 @@
>
-
+
+ >
+
+
+ {{row.dataDictEngName}}
+
+
+