Merge remote-tracking branch 'origin/master'

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:

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='数据类型')
+    data_dict_data_type = Column(String(100), default=None, comment='数据类型')
-    src_sys_tab_fld_name = Column(String(1000), 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') 

vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue

@@ -12,6 +12,36 @@
       label-width="120px" 
       :rules="formRules"
     >
+          <el-form-item label="标准归属" prop="dataStdVest">
+        <el-select
+              v-model="formData.dataStdVest"
+              placeholder="请选择字典归属"
+              maxlength="30"
+              @change="changeCodeType"
+            >
+              <el-option
+                v-for="dict in std_code_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+        </el-form-item>
+              <el-form-item label="来源系统" prop="srcSys" v-show="showSys">
+        <el-select
+          v-model="formData.srcSys"
+          :disabled="isShow"
+          placeholder="请选择来源系统"
+          @change="handleSystemChange"
+        >
+          <el-option
+            v-for="dict in dbResourceOldList"
+            :key="dict.id"
+            :label="dict.name"
+            :value="dict.id"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="标准编号" prop="dataStdNo">
         <el-input 
           v-model="formData.dataStdNo" 
@@ -89,21 +119,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="来源系统" prop="srcSys">
+
-        <el-select
-          v-model="formData.srcSys"
-          :disabled="isShow"
-          placeholder="请选择来源系统"
-          @change="handleSystemChange"
-        >
-          <el-option
-            v-for="dict in dbResourceOldList"
-            :key="dict.id"
-            :label="dict.name"
-            :value="dict.id"
-          />
-        </el-select>
-      </el-form-item>
 
       <el-form-item label="安全等级" prop="dataSecLvl">
         <el-select 
@@ -214,8 +230,8 @@ import { ElMessage } from 'element-plus'
 import { updateStdMain, addStdMain } from '@/api/datastd/std'
 import { listUser, deptTreeSelect } from "@/api/system/user"
 import codeComponents from '../../stdcode/codeComponents.vue'
-
+const { proxy } = getCurrentInstance();
-const { proxy } = getCurrentInstance()
+const { std_code_status,std_code_appr } = proxy.useDict("std_code_status","std_code_appr");
 const emit = defineEmits(['update:visible', 'refresh'])
 
 const props = defineProps({
@@ -240,6 +256,7 @@ formData.value=props.data
 // 表单验证规则
 const formRules = ref({
   dataStdNo: [{ required: true, message: '请输入标准编号', trigger: 'blur' }],
+  dataStdVest: [{ required: true, message: '请选择标准归属', trigger: 'change' }],
   dataStdCnName: [{ required: true, message: '请输入标准中文名', trigger: 'blur' }],
   dataStdType: [{ required: true, message: '请选择标准类型', trigger: 'change' }],
   dataStdSrc: [{ required: true, message: '请选择标准来源', trigger: 'change' }],
@@ -271,7 +288,19 @@ const initData = async () => {
     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')) {

vue-fastapi-frontend/src/views/datastd/main/index.vue

@@ -171,9 +171,12 @@
       </el-col>
       <el-col :span="19">
         <el-form :model="queryParams" ref="queryRef" :inline="true">
-          <el-form-item label="标准编号/名称">
+            <el-form-item label="标准编号">
             <el-input v-model="queryParams.dataStdNo" placeholder="请输入标准编号" />
           </el-form-item>
+          <el-form-item label="标准中/英文名称">
+            <el-input v-model="queryParams.dataStdEngName" placeholder="请输入标准编号" />
+          </el-form-item>
           <el-form-item label="业务定义">
             <el-input v-model="queryParams.dataStdBusiDefn" placeholder="请输入业务定义" />
           </el-form-item>
@@ -238,7 +241,18 @@
         >
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="标准编号" prop="dataStdNo" width="150"></el-table-column>
-<el-table-column label="标准英文名" prop="dataStdEngName" width="150"></el-table-column>
+<el-table-column label="标准英文名" prop="dataStdEngName" width="150">
+  <template #default="{ row }">
+    <el-link
+      type="primary"
+      :underline="true"
+      @click="handleEdit(row)"
+      style="cursor: pointer"
+    >
+      <span >{{row.dataStdEngName}}</span>
+    </el-link>
+  </template>
+</el-table-column>
 <el-table-column label="标准中文名" prop="dataStdCnName" width="150"></el-table-column>
 <el-table-column label="标准业务定义" prop="dataStdBusiDefn" width="150">
   <template #default="{ row }">
@@ -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);

vue-fastapi-frontend/src/views/datastd/stdcode/index.vue

@@ -98,7 +98,7 @@
               <el-link
                 type="primary"
                 :underline="true"
-                @click="handleCodeClick(scope.row)"
+                @click="handleEdit(scope.row)"
                 style="cursor: pointer"
                   >
       {{ scope.row.cdValCnMean }}

vue-fastapi-frontend/src/views/datastd/stddict/AddEditForm.vue

@@ -16,7 +16,7 @@
               ></el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="来源系统" prop="sysId" v-show="showSys">
+        <el-form-item label="来源系统" prop="srcSys" v-show="showSys">
         <el-select
               v-model="formData.srcSys"
               placeholder="请选择来源系统"

vue-fastapi-frontend/src/views/datastd/stddict/index.vue

@@ -129,7 +129,18 @@
             width="120"
             align="center"
             prop="dataDictEngName"
-          />
+          >
+            <template #default="{ row }">
+              <el-link
+                type="primary"
+                :underline="true"
+                @click="handleEdit(row)"
+                style="cursor: pointer"
+              >
+                <span >{{row.dataDictEngName}}</span>
+              </el-link>
+            </template>
+          </el-table-column>
           <el-table-column
             label="字典中文名"
             width="120"