问题修复

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='提交修改标准代码审批成功!')

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

@@ -138,7 +138,7 @@
     >
       <template #default="scope">
         <el-input
-          v-if="scope.row.isEditing"
+          v-if="true"
           v-model="scope.row.cdNo"
           size="small"
           placeholder="请输入代码值"
@@ -156,7 +156,7 @@
     >
       <template #default="scope">
         <el-input
-          v-if="scope.row.isEditing"
+          v-if="true"
           v-model="scope.row.cdValCnMean"
           size="small"
           placeholder="请输入代码含义"
@@ -278,6 +278,10 @@ if (props.rowData.onum) {
   } else {
     showSys.value = false;
   }
+}else if(props.rowData.cdType=="sys"){
+  form.value.srcSys=props.rowData.srcSys
+  form.value.cdType=props.rowData.cdType
+    showSys.value = true;
 }
 
 // 双击行进入编辑模式

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

@@ -295,16 +295,21 @@ const filterNode = (value, data) => {
   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;
 };
 

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;
 };