diff --git a/src/views/dataNetworkDiskManagement/dataDirectory/DataDirectoryMaintenance.vue b/src/views/dataNetworkDiskManagement/dataDirectory/DataDirectoryMaintenance.vue
index f9ed801..2c9b1f9 100644
--- a/src/views/dataNetworkDiskManagement/dataDirectory/DataDirectoryMaintenance.vue
+++ b/src/views/dataNetworkDiskManagement/dataDirectory/DataDirectoryMaintenance.vue
@@ -22,8 +22,8 @@
             v-model="selectedRowKeys"
             checkable
             :tree-data="dataSource"
+            :expandedKeys="expandedKeys"
             :replaceFields="replaceFields"
-            @expand="onExpand"
             @select="onSelect"/>
         </div>
         <!--        /左侧区域-->
@@ -41,14 +41,12 @@
 <script>
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_committee.png'
-import { JeroListMixin } from '@/mixins/JeroListMixin'
 import DataDirectoryModule from './modules/DataDirectoryModule'
 import { getAction } from '../../../api/manage'
 
 export default {
   name: 'DataDirectoryMaintenance',
   components: { PageHeaderTitle, DataDirectoryModule },
-  mixins: [JeroListMixin],
   data() {
     return {
       IconImg,
@@ -57,28 +55,31 @@ export default {
         queryById: '/payDataDirectory/payDataDirectory/getOne',
         deleteBatch: '/payDataDirectory/payDataDirectory/deleteBatch'
       },
-      autoExpandParent: true,
-      checkedKeys: [],
-      columns: [], // 防止混入报错
       replaceFields: {
         children: 'children',
         title: 'name',
         key: 'id'
-      }
+      },
+      isExpandAll: false,
+      queryParam: {},
+      dataSource: [],
+      selectedRowKeys: [],
+      expandedKeys: []
     }
   },
+  watch: {
+    dataSource: {
+      handler() {
+        this.isExpandAll = true
+        this.$forceUpdate()
+      },
+      deep: true
+    }
+  },
+  created() {
+    this.loadData()
+  },
   methods: {
-    onExpand(expandedKeys) {
-      console.log('onExpand', expandedKeys)
-      // if not set autoExpandParent to false, if children expanded, parent can not collapse.
-      // or, you can remove all expanded children keys.
-      this.expandedKeys = expandedKeys
-      this.autoExpandParent = false
-    },
-    onCheck(checkedKeys) {
-      console.log('onCheck', checkedKeys)
-      this.checkedKeys = checkedKeys
-    },
     /**
      * 点击名称选中
      * @param info
@@ -98,6 +99,80 @@ export default {
     },
     dataDirectoryFormOk() {
       this.loadData()
+    },
+    searchQuery() {
+      this.loadData()
+    },
+    loadData() {
+      if (!this.url.list) {
+        this.$message.error('请设置url.list属性!')
+        return
+      }
+      let params = this.queryParam
+      this.loading = true
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records || res.result
+          this.getExpandKeys(this.dataSource)
+          //清空列表选中
+          this.selectedRowKeys = []
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message)
+        }
+        this.loading = false
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    batchDel() {
+      if (!this.url.deleteBatch) {
+        this.$message.error('请设置url.deleteBatch属性!')
+        return
+      }
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('请选择一条记录！')
+        return
+      } else {
+        let ids = ''
+        for (let a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ','
+        }
+        const that = this
+        this.$confirm({
+          title: '确认删除',
+          content: '是否删除选中数据?',
+          onOk: function () {
+            that.loading = true
+            getAction(that.url.deleteBatch, { ids: ids }).then((res) => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.loadData()
+                that.onClearSelected()
+              } else {
+                that.$message.warning(res.message)
+              }
+            }).finally(() => {
+              that.loading = false
+            })
+          }
+        })
+      }
+    },
+    /**
+     * 展开全部（获取所有非一级元素的parentId）
+     * @param treeList
+     */
+    getExpandKeys(treeList) {
+      for (let i = 0; i < treeList.length; i++) {
+        let item = treeList[i]
+        if (item.children.length > 0) {
+          this.getExpandKeys(item.children)
+        }
+        if (item.parentId !== '0') {
+          this.expandedKeys.push(item.parentId)
+        }
+      }
     }
   }
 }