数据资产登记更新

@@ -47,7 +47,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
 
 
 defineExpose({
 defineExpose({
   formInline,
   formInline,
-  formRef
+  formRef,
 })
 })
 const setFormFields = (list: any) => {
 const setFormFields = (list: any) => {
   let obj = {}
   let obj = {}
@@ -89,6 +89,12 @@ const cascaderChange = (val, item) => {
     formCascader.togglePopperVisible(false)
     formCascader.togglePopperVisible(false)
   }
   }
 }
 }
+
+const getCascaderCheckedData = () => {
+  const formCascader = formCascaderRef.value[0] || formCascaderRef.value;
+  const data = formCascader.getCheckedNodes();
+  return data;
+};
 const inputChange = (val) => {
 const inputChange = (val) => {
   onSubmit()
   onSubmit()
 }
 }

@@ -57,8 +57,14 @@ const cascaderChange = (val, item) => {
   emits("cascaderChange", val, item);
   emits("cascaderChange", val, item);
 }
 }
 
 
+const getCascaderCheckedData = () => {
+  const toolSearchForm = toolSearch.value.formRef[0] || toolSearch.value.formRef;
+  return toolSearchForm.getCascaderCheckedData();
+}
+
 defineExpose({
 defineExpose({
   toolSearch,
   toolSearch,
+  getCascaderCheckedData
 })
 })
 
 
 </script>
 </script>

@@ -52,7 +52,6 @@ const treeInfo: any = ref({
   queryPlaceholder: "输入分类名称搜索",
   queryPlaceholder: "输入分类名称搜索",
   props: {
   props: {
     label: "classifyName",
     label: "classifyName",
-    value: "classifyDetailGuid",
   },
   },
   nodeKey: 'classifyDetailGuid',
   nodeKey: 'classifyDetailGuid',
   expandedKey: [],
   expandedKey: [],
@@ -187,7 +186,7 @@ const fieldItemList = ref([
       checkStrictly: true,
       checkStrictly: true,
       expandTrigger: "hover",
       expandTrigger: "hover",
       label: "classifyName",
       label: "classifyName",
-      value: "classifyDetailGuid",
+      value: "guid",
     },
     },
     filterable: true,
     filterable: true,
     clearable: true,
     clearable: true,
@@ -565,6 +564,8 @@ const getFieldTableData = () => {
     pageSize: fieldTableInfo.value.page.limit,
     pageSize: fieldTableInfo.value.page.limit,
     isMergeClassify: checked1.value ? 'Y' : 'N'
     isMergeClassify: checked1.value ? 'Y' : 'N'
   }
   }
+  const cascaderData = fieldSearchRef.value.toolSearch.getCascaderCheckedData();
+  debugger
   const classifyName = params.classifyName?.at(-1) || undefined;
   const classifyName = params.classifyName?.at(-1) || undefined;
   if (classifyName && classifyName != 'unclassified') {
   if (classifyName && classifyName != 'unclassified') {
     params.classifyDetail = classifyName;
     params.classifyDetail = classifyName;
@@ -1046,7 +1047,8 @@ onMounted(() => {
                 <div class="table_panel" v-loading="fieldTableInfo.loading">
                 <div class="table_panel" v-loading="fieldTableInfo.loading">
                   <el-table ref="fieldTableRef" :data="fieldTableInfo.data" border :height="'100%'"
                   <el-table ref="fieldTableRef" :data="fieldTableInfo.data" border :height="'100%'"
                     style="width: 100%; display: inline-block" :style="{ 'max-height': 'calc(100% - 44px)' }"
                     style="width: 100%; display: inline-block" :style="{ 'max-height': 'calc(100% - 44px)' }"
-                    :cell-class-name="tableCellClassName" @selection-change="tableSelectionChange" highlight-current-row>
+                    :cell-class-name="tableCellClassName" @selection-change="tableSelectionChange"
+                    highlight-current-row>
                     <el-table-column type="selection" align="center" :width="32" :selectable="rowSelectable"
                     <el-table-column type="selection" align="center" :width="32" :selectable="rowSelectable"
                       fixed="left" />
                       fixed="left" />
                     <el-table-column v-for="(item, i) in fieldTableInfo.fields" :label="item.label" :width="item.width"
                     <el-table-column v-for="(item, i) in fieldTableInfo.fields" :label="item.label" :width="item.width"
@@ -1113,48 +1115,6 @@ onMounted(() => {
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
 .container_wrap {
 .container_wrap {
-  .aside_wrap {
-    width: 199px;
-    border-right: 1px solid #d9d9d9;
-    box-shadow: none;
-
-    .aside_title {
-      width: calc(100% - 32px);
-      display: inline-block;
-    }
-
-    .icon-add.el-icon {
-      width: 24px;
-      height: 24px;
-      vertical-align: middle;
-      cursor: pointer;
-
-      svg {
-        width: 24px;
-        height: 24px;
-      }
-    }
-
-    .tree_panel {
-      height: calc(100% - 72px);
-      padding-top: 0;
-      border-bottom: 1px solid #d9d9d9;
-
-      :deep(.el-tree) {
-        margin: 0;
-        height: calc(100% - 32px);
-        overflow: hidden auto;
-      }
-    }
-
-    .page_nav_wrap.concise {
-      justify-content: center;
-    }
-
-  }
-}
-
-.container_wrap {
   overflow: hidden auto;
   overflow: hidden auto;
 
 
   .main_wrap {
   .main_wrap {
@@ -1304,6 +1264,11 @@ onMounted(() => {
               .tree_panel {
               .tree_panel {
                 height: 100%;
                 height: 100%;
                 padding: 8px 0;
                 padding: 8px 0;
+
+                :deep(.el-tree) {
+                  height: calc(100% - 40px);
+                  overflow: hidden auto;
+                }
               }
               }
             }
             }