diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index c16ec9a..b1e16c8 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="SystemEditDept">
+import type { Ref } from 'vue'
 import { nextTick, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElButton, ElCol, ElDialog, ElForm, ElFormItem, ElInput, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElRow, ElSelect } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { DeptTypeList } from './dept-interface'
-import type { DeptInfo } from './dept-interface'
-import { addDept, updateDept } from '@/api/system/dept'
+import type { DeptInfo, DeptTypeInfo } from './dept-interface'
+import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
-
+import DeptSelect from '@/components/DeptSelect/index.vue'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,8 +18,7 @@
   update: '编辑',
   create: '新增',
 }
-// 表单数据对象
-const formData: DeptInfo = reactive({
+const defaultFormData: DeptInfo = {
   id: '',
   simpleName: '',
   fullName: '',
@@ -28,7 +27,9 @@
   num: 0,
   version: '',
   tips: '',
-})
+}
+// 表单数据对象
+const formData: DeptInfo = reactive({ ...defaultFormData })
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -107,11 +108,22 @@
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef) { return }
-    dataFormRef.value?.resetFields()
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+}
+
+const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+// 获取所有组织类型
+function getDeptType() {
+  getDeptTypeList().then((res) => {
+    deptTypeList.value = res.data
   })
 }
+getDeptType()
 
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
@@ -120,6 +132,9 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.id = row.id
@@ -141,6 +156,7 @@
 }
 // 关闭弹窗
 function dialogClose() {
+  resetForm()
   dialogVisible.value = false
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
@@ -180,7 +196,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="组织类型" prop="deptType" class="required">
             <el-select v-model="formData.deptType" class="full-width-input" clearable placeholder="请选择">
-              <el-option v-for="(item, index) in DeptTypeList" :key="index" :label="item.name" :value="item.value" />
+              <el-option v-for="(item, index) in deptTypeList" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index c16ec9a..b1e16c8 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="SystemEditDept">
+import type { Ref } from 'vue'
 import { nextTick, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElButton, ElCol, ElDialog, ElForm, ElFormItem, ElInput, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElRow, ElSelect } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { DeptTypeList } from './dept-interface'
-import type { DeptInfo } from './dept-interface'
-import { addDept, updateDept } from '@/api/system/dept'
+import type { DeptInfo, DeptTypeInfo } from './dept-interface'
+import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
-
+import DeptSelect from '@/components/DeptSelect/index.vue'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,8 +18,7 @@
   update: '编辑',
   create: '新增',
 }
-// 表单数据对象
-const formData: DeptInfo = reactive({
+const defaultFormData: DeptInfo = {
   id: '',
   simpleName: '',
   fullName: '',
@@ -28,7 +27,9 @@
   num: 0,
   version: '',
   tips: '',
-})
+}
+// 表单数据对象
+const formData: DeptInfo = reactive({ ...defaultFormData })
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -107,11 +108,22 @@
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef) { return }
-    dataFormRef.value?.resetFields()
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+}
+
+const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+// 获取所有组织类型
+function getDeptType() {
+  getDeptTypeList().then((res) => {
+    deptTypeList.value = res.data
   })
 }
+getDeptType()
 
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
@@ -120,6 +132,9 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.id = row.id
@@ -141,6 +156,7 @@
 }
 // 关闭弹窗
 function dialogClose() {
+  resetForm()
   dialogVisible.value = false
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
@@ -180,7 +196,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="组织类型" prop="deptType" class="required">
             <el-select v-model="formData.deptType" class="full-width-input" clearable placeholder="请选择">
-              <el-option v-for="(item, index) in DeptTypeList" :key="index" :label="item.name" :value="item.value" />
+              <el-option v-for="(item, index) in deptTypeList" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 1dc8d94..e8b9911 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -3,7 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Switch } from '@element-plus/icons-vue'
-import type { DeptInfo, DeptTreeNode } from './dept-interface'
+import type { DeptInfo } from './dept-interface'
 import SystemEditDept from './editDept.vue'
 import { delDept, getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -63,8 +63,8 @@
   ).then(() => {
     delDept(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加组织
@@ -74,7 +74,7 @@
 
 // 表格组件
 const table = ref()
-const expansion = ref(false)
+const expansion = ref(true)
 // 展开或折叠
 function expandOrCollapse() {
   expansion.value = !expansion.value
@@ -111,7 +111,7 @@
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index c16ec9a..b1e16c8 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="SystemEditDept">
+import type { Ref } from 'vue'
 import { nextTick, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElButton, ElCol, ElDialog, ElForm, ElFormItem, ElInput, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElRow, ElSelect } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { DeptTypeList } from './dept-interface'
-import type { DeptInfo } from './dept-interface'
-import { addDept, updateDept } from '@/api/system/dept'
+import type { DeptInfo, DeptTypeInfo } from './dept-interface'
+import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
-
+import DeptSelect from '@/components/DeptSelect/index.vue'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,8 +18,7 @@
   update: '编辑',
   create: '新增',
 }
-// 表单数据对象
-const formData: DeptInfo = reactive({
+const defaultFormData: DeptInfo = {
   id: '',
   simpleName: '',
   fullName: '',
@@ -28,7 +27,9 @@
   num: 0,
   version: '',
   tips: '',
-})
+}
+// 表单数据对象
+const formData: DeptInfo = reactive({ ...defaultFormData })
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -107,11 +108,22 @@
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef) { return }
-    dataFormRef.value?.resetFields()
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+}
+
+const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+// 获取所有组织类型
+function getDeptType() {
+  getDeptTypeList().then((res) => {
+    deptTypeList.value = res.data
   })
 }
+getDeptType()
 
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
@@ -120,6 +132,9 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.id = row.id
@@ -141,6 +156,7 @@
 }
 // 关闭弹窗
 function dialogClose() {
+  resetForm()
   dialogVisible.value = false
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
@@ -180,7 +196,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="组织类型" prop="deptType" class="required">
             <el-select v-model="formData.deptType" class="full-width-input" clearable placeholder="请选择">
-              <el-option v-for="(item, index) in DeptTypeList" :key="index" :label="item.name" :value="item.value" />
+              <el-option v-for="(item, index) in deptTypeList" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 1dc8d94..e8b9911 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -3,7 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Switch } from '@element-plus/icons-vue'
-import type { DeptInfo, DeptTreeNode } from './dept-interface'
+import type { DeptInfo } from './dept-interface'
 import SystemEditDept from './editDept.vue'
 import { delDept, getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -63,8 +63,8 @@
   ).then(() => {
     delDept(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加组织
@@ -74,7 +74,7 @@
 
 // 表格组件
 const table = ref()
-const expansion = ref(false)
+const expansion = ref(true)
 // 展开或折叠
 function expandOrCollapse() {
   expansion.value = !expansion.value
@@ -111,7 +111,7 @@
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/dict-interface.ts b/src/views/system/dict/dict-interface.ts
index 9b647ec..618c4b9 100644
--- a/src/views/system/dict/dict-interface.ts
+++ b/src/views/system/dict/dict-interface.ts
@@ -2,7 +2,7 @@
 export interface DictDetail {
   name: string
   value: string
-  num: number
+  num: number | string
 }
 
 // 字典
@@ -11,7 +11,7 @@
   dictCode: string
   dictName: string
   dictTips: string
-  dictValues: DictDetail[]
+  dictValues: string
 }
 
 export interface DictListInfo {

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index c16ec9a..b1e16c8 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="SystemEditDept">
+import type { Ref } from 'vue'
 import { nextTick, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElButton, ElCol, ElDialog, ElForm, ElFormItem, ElInput, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElRow, ElSelect } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { DeptTypeList } from './dept-interface'
-import type { DeptInfo } from './dept-interface'
-import { addDept, updateDept } from '@/api/system/dept'
+import type { DeptInfo, DeptTypeInfo } from './dept-interface'
+import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
-
+import DeptSelect from '@/components/DeptSelect/index.vue'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,8 +18,7 @@
   update: '编辑',
   create: '新增',
 }
-// 表单数据对象
-const formData: DeptInfo = reactive({
+const defaultFormData: DeptInfo = {
   id: '',
   simpleName: '',
   fullName: '',
@@ -28,7 +27,9 @@
   num: 0,
   version: '',
   tips: '',
-})
+}
+// 表单数据对象
+const formData: DeptInfo = reactive({ ...defaultFormData })
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -107,11 +108,22 @@
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef) { return }
-    dataFormRef.value?.resetFields()
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+}
+
+const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+// 获取所有组织类型
+function getDeptType() {
+  getDeptTypeList().then((res) => {
+    deptTypeList.value = res.data
   })
 }
+getDeptType()
 
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
@@ -120,6 +132,9 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.id = row.id
@@ -141,6 +156,7 @@
 }
 // 关闭弹窗
 function dialogClose() {
+  resetForm()
   dialogVisible.value = false
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
@@ -180,7 +196,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="组织类型" prop="deptType" class="required">
             <el-select v-model="formData.deptType" class="full-width-input" clearable placeholder="请选择">
-              <el-option v-for="(item, index) in DeptTypeList" :key="index" :label="item.name" :value="item.value" />
+              <el-option v-for="(item, index) in deptTypeList" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 1dc8d94..e8b9911 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -3,7 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Switch } from '@element-plus/icons-vue'
-import type { DeptInfo, DeptTreeNode } from './dept-interface'
+import type { DeptInfo } from './dept-interface'
 import SystemEditDept from './editDept.vue'
 import { delDept, getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -63,8 +63,8 @@
   ).then(() => {
     delDept(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加组织
@@ -74,7 +74,7 @@
 
 // 表格组件
 const table = ref()
-const expansion = ref(false)
+const expansion = ref(true)
 // 展开或折叠
 function expandOrCollapse() {
   expansion.value = !expansion.value
@@ -111,7 +111,7 @@
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/dict-interface.ts b/src/views/system/dict/dict-interface.ts
index 9b647ec..618c4b9 100644
--- a/src/views/system/dict/dict-interface.ts
+++ b/src/views/system/dict/dict-interface.ts
@@ -2,7 +2,7 @@
 export interface DictDetail {
   name: string
   value: string
-  num: number
+  num: number | string
 }
 
 // 字典
@@ -11,7 +11,7 @@
   dictCode: string
   dictName: string
   dictTips: string
-  dictValues: DictDetail[]
+  dictValues: string
 }
 
 export interface DictListInfo {
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index c2e9eb8..0e5a959 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -5,7 +5,6 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import type { DictDetail, DictInfo, DictListInfo } from './dict-interface'
 import { addDict, updateDict } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,14 +17,16 @@
   create: '新增',
 }
 // 表单数据对象
-const formData: Ref<DictInfo> = ref({
+const formData: DictInfo = reactive({
   dictId: '',
   dictCode: '',
   dictName: '',
   dictTips: '',
-  dictValues: [],
+  dictValues: '',
 })
 
+const details: Ref<DictDetail[]> = ref([])
+
 // 保存按钮加载状态
 const btnLoading = ref(false)
 
@@ -41,24 +42,68 @@
   num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
 })
 
+// 表单提交
 function submitForm() {
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        if (dialogStatus.value === 'create') {
-          createData()
-        }
-        else if (dialogStatus.value === 'update') {
-          updateData()
+        const flag = arrayToString()
+        if (flag) {
+          if (dialogStatus.value === 'create') {
+            createData()
+          }
+          else if (dialogStatus.value === 'update') {
+            updateData()
+          }
         }
       }
     })
   }
 }
+
+// 字典详情字符串转数组
+function stringToArray() {
+  const detailArr = formData.dictValues.split(';')
+  details.value = []
+  for (const detail of detailArr) {
+    const detailItem = detail.split(':')
+    const item: DictDetail = {
+      value: detailItem[0],
+      name: detailItem[1],
+      num: parseInt(detailItem[2]),
+    }
+    details.value.push(item)
+  }
+}
+// 数据转换， 字典详情转换为中间带冒号的
+function arrayToString() {
+  let detailArray = ''
+  const detailList = details.value
+  let passFlag = true
+  if (detailList.length === 0) {
+    passFlag = false
+    ElMessage.warning('至少有一个字典值')
+    return passFlag
+  }
+  detailList.forEach((detail, index) => {
+    if (detail.value === '' || detail.name === '') {
+      passFlag = false
+    }
+    detailArray += `${detail.value}:${detail.name}:${detail.num}`
+    if (index !== (detailList.length - 1)) {
+      detailArray += ';'
+    }
+  })
+  if (!passFlag) {
+    ElMessage.warning('请将字典值和名称都填全后再进行保存')
+  }
+  formData.dictValues = detailArray
+  return passFlag
+}
 // 新增数据
 function createData() {
   btnLoading.value = true
-  addDict(formData.value).then((res) => {
+  addDict(formData).then((res) => {
     ElMessageBox.confirm(
       '新增成功，是否继续新增?',
       '提示',
@@ -80,7 +125,7 @@
 
 // 更新数据
 function updateData() {
-  updateDict(formData.value).then((res) => {
+  updateDict(formData).then((res) => {
     ElMessage.success('修改成功')
     btnLoading.value = false
     closeRefresh()
@@ -90,22 +135,24 @@
 }
 // 添加一行
 function addDetail() {
-  formData.value.dictValues.push({
+  details.value.push({
     value: '',
     name: '',
-    num: formData.value.dictValues.length,
+    num: details.value.length,
   })
 }
 // 删除一行
 function deleteDetail(index: number) {
-  formData.value.dictValues.splice(index, 1)
+  details.value.splice(index, 1)
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.dictId = ''
+  formData.dictCode = ''
+  formData.dictName = ''
+  formData.dictTips = ''
+  formData.dictValues = ''
+  details.value = []
 }
 
 // ----------初始化、关闭对话框相关-----------------
@@ -115,26 +162,17 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
-    const detailArr = row.detail.split(';')
-    const details = [] as DictDetail[]
-    for (const detail of detailArr) {
-      const detailItem = detail.split(':')
-      const item = {
-        value: detailItem[0],
-        name: detailItem[1],
-        num: parseInt(detailItem[2]),
-      }
-      details.push(item)
-    }
-    formData.value = {
-      dictId: row.id,
-      dictCode: row.code,
-      dictName: row.name,
-      dictTips: row.tips,
-      dictValues: details,
-    }
+    formData.dictId = row.id
+    formData.dictCode = row.code
+    formData.dictName = row.name
+    formData.dictTips = row.tips
+    formData.dictValues = row.detail
+    stringToArray()
   }
 }
 
@@ -147,6 +185,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
@@ -190,7 +229,7 @@
             </el-button>
           </div>
           <div class="body">
-            <el-row v-for="(detail, index) in formData.dictValues" :key="index" :gutter="10">
+            <el-row v-for="(detail, index) in details" :key="index" :gutter="10">
               <el-col :span="6">
                 <el-form-item :required="true" label="值" label-width="40">
                   <el-input v-model="detail.value" style="width: 100%;" placeholder="必填" />

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index c16ec9a..b1e16c8 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="SystemEditDept">
+import type { Ref } from 'vue'
 import { nextTick, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElButton, ElCol, ElDialog, ElForm, ElFormItem, ElInput, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElRow, ElSelect } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { DeptTypeList } from './dept-interface'
-import type { DeptInfo } from './dept-interface'
-import { addDept, updateDept } from '@/api/system/dept'
+import type { DeptInfo, DeptTypeInfo } from './dept-interface'
+import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
-
+import DeptSelect from '@/components/DeptSelect/index.vue'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,8 +18,7 @@
   update: '编辑',
   create: '新增',
 }
-// 表单数据对象
-const formData: DeptInfo = reactive({
+const defaultFormData: DeptInfo = {
   id: '',
   simpleName: '',
   fullName: '',
@@ -28,7 +27,9 @@
   num: 0,
   version: '',
   tips: '',
-})
+}
+// 表单数据对象
+const formData: DeptInfo = reactive({ ...defaultFormData })
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -107,11 +108,22 @@
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef) { return }
-    dataFormRef.value?.resetFields()
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+}
+
+const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+// 获取所有组织类型
+function getDeptType() {
+  getDeptTypeList().then((res) => {
+    deptTypeList.value = res.data
   })
 }
+getDeptType()
 
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
@@ -120,6 +132,9 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.id = row.id
@@ -141,6 +156,7 @@
 }
 // 关闭弹窗
 function dialogClose() {
+  resetForm()
   dialogVisible.value = false
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
@@ -180,7 +196,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="组织类型" prop="deptType" class="required">
             <el-select v-model="formData.deptType" class="full-width-input" clearable placeholder="请选择">
-              <el-option v-for="(item, index) in DeptTypeList" :key="index" :label="item.name" :value="item.value" />
+              <el-option v-for="(item, index) in deptTypeList" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 1dc8d94..e8b9911 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -3,7 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Switch } from '@element-plus/icons-vue'
-import type { DeptInfo, DeptTreeNode } from './dept-interface'
+import type { DeptInfo } from './dept-interface'
 import SystemEditDept from './editDept.vue'
 import { delDept, getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -63,8 +63,8 @@
   ).then(() => {
     delDept(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加组织
@@ -74,7 +74,7 @@
 
 // 表格组件
 const table = ref()
-const expansion = ref(false)
+const expansion = ref(true)
 // 展开或折叠
 function expandOrCollapse() {
   expansion.value = !expansion.value
@@ -111,7 +111,7 @@
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/dict-interface.ts b/src/views/system/dict/dict-interface.ts
index 9b647ec..618c4b9 100644
--- a/src/views/system/dict/dict-interface.ts
+++ b/src/views/system/dict/dict-interface.ts
@@ -2,7 +2,7 @@
 export interface DictDetail {
   name: string
   value: string
-  num: number
+  num: number | string
 }
 
 // 字典
@@ -11,7 +11,7 @@
   dictCode: string
   dictName: string
   dictTips: string
-  dictValues: DictDetail[]
+  dictValues: string
 }
 
 export interface DictListInfo {
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index c2e9eb8..0e5a959 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -5,7 +5,6 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import type { DictDetail, DictInfo, DictListInfo } from './dict-interface'
 import { addDict, updateDict } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,14 +17,16 @@
   create: '新增',
 }
 // 表单数据对象
-const formData: Ref<DictInfo> = ref({
+const formData: DictInfo = reactive({
   dictId: '',
   dictCode: '',
   dictName: '',
   dictTips: '',
-  dictValues: [],
+  dictValues: '',
 })
 
+const details: Ref<DictDetail[]> = ref([])
+
 // 保存按钮加载状态
 const btnLoading = ref(false)
 
@@ -41,24 +42,68 @@
   num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
 })
 
+// 表单提交
 function submitForm() {
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        if (dialogStatus.value === 'create') {
-          createData()
-        }
-        else if (dialogStatus.value === 'update') {
-          updateData()
+        const flag = arrayToString()
+        if (flag) {
+          if (dialogStatus.value === 'create') {
+            createData()
+          }
+          else if (dialogStatus.value === 'update') {
+            updateData()
+          }
         }
       }
     })
   }
 }
+
+// 字典详情字符串转数组
+function stringToArray() {
+  const detailArr = formData.dictValues.split(';')
+  details.value = []
+  for (const detail of detailArr) {
+    const detailItem = detail.split(':')
+    const item: DictDetail = {
+      value: detailItem[0],
+      name: detailItem[1],
+      num: parseInt(detailItem[2]),
+    }
+    details.value.push(item)
+  }
+}
+// 数据转换， 字典详情转换为中间带冒号的
+function arrayToString() {
+  let detailArray = ''
+  const detailList = details.value
+  let passFlag = true
+  if (detailList.length === 0) {
+    passFlag = false
+    ElMessage.warning('至少有一个字典值')
+    return passFlag
+  }
+  detailList.forEach((detail, index) => {
+    if (detail.value === '' || detail.name === '') {
+      passFlag = false
+    }
+    detailArray += `${detail.value}:${detail.name}:${detail.num}`
+    if (index !== (detailList.length - 1)) {
+      detailArray += ';'
+    }
+  })
+  if (!passFlag) {
+    ElMessage.warning('请将字典值和名称都填全后再进行保存')
+  }
+  formData.dictValues = detailArray
+  return passFlag
+}
 // 新增数据
 function createData() {
   btnLoading.value = true
-  addDict(formData.value).then((res) => {
+  addDict(formData).then((res) => {
     ElMessageBox.confirm(
       '新增成功，是否继续新增?',
       '提示',
@@ -80,7 +125,7 @@
 
 // 更新数据
 function updateData() {
-  updateDict(formData.value).then((res) => {
+  updateDict(formData).then((res) => {
     ElMessage.success('修改成功')
     btnLoading.value = false
     closeRefresh()
@@ -90,22 +135,24 @@
 }
 // 添加一行
 function addDetail() {
-  formData.value.dictValues.push({
+  details.value.push({
     value: '',
     name: '',
-    num: formData.value.dictValues.length,
+    num: details.value.length,
   })
 }
 // 删除一行
 function deleteDetail(index: number) {
-  formData.value.dictValues.splice(index, 1)
+  details.value.splice(index, 1)
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.dictId = ''
+  formData.dictCode = ''
+  formData.dictName = ''
+  formData.dictTips = ''
+  formData.dictValues = ''
+  details.value = []
 }
 
 // ----------初始化、关闭对话框相关-----------------
@@ -115,26 +162,17 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
-    const detailArr = row.detail.split(';')
-    const details = [] as DictDetail[]
-    for (const detail of detailArr) {
-      const detailItem = detail.split(':')
-      const item = {
-        value: detailItem[0],
-        name: detailItem[1],
-        num: parseInt(detailItem[2]),
-      }
-      details.push(item)
-    }
-    formData.value = {
-      dictId: row.id,
-      dictCode: row.code,
-      dictName: row.name,
-      dictTips: row.tips,
-      dictValues: details,
-    }
+    formData.dictId = row.id
+    formData.dictCode = row.code
+    formData.dictName = row.name
+    formData.dictTips = row.tips
+    formData.dictValues = row.detail
+    stringToArray()
   }
 }
 
@@ -147,6 +185,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
@@ -190,7 +229,7 @@
             </el-button>
           </div>
           <div class="body">
-            <el-row v-for="(detail, index) in formData.dictValues" :key="index" :gutter="10">
+            <el-row v-for="(detail, index) in details" :key="index" :gutter="10">
               <el-col :span="6">
                 <el-form-item :required="true" label="值" label-width="40">
                   <el-input v-model="detail.value" style="width: 100%;" placeholder="必填" />
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index c7cf29c..6fd6ea3 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -71,8 +71,8 @@
   ).then(() => {
     delDict(row.id).then(() => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加资源

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index c16ec9a..b1e16c8 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="SystemEditDept">
+import type { Ref } from 'vue'
 import { nextTick, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElButton, ElCol, ElDialog, ElForm, ElFormItem, ElInput, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElRow, ElSelect } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { DeptTypeList } from './dept-interface'
-import type { DeptInfo } from './dept-interface'
-import { addDept, updateDept } from '@/api/system/dept'
+import type { DeptInfo, DeptTypeInfo } from './dept-interface'
+import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
-
+import DeptSelect from '@/components/DeptSelect/index.vue'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,8 +18,7 @@
   update: '编辑',
   create: '新增',
 }
-// 表单数据对象
-const formData: DeptInfo = reactive({
+const defaultFormData: DeptInfo = {
   id: '',
   simpleName: '',
   fullName: '',
@@ -28,7 +27,9 @@
   num: 0,
   version: '',
   tips: '',
-})
+}
+// 表单数据对象
+const formData: DeptInfo = reactive({ ...defaultFormData })
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -107,11 +108,22 @@
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef) { return }
-    dataFormRef.value?.resetFields()
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+}
+
+const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+// 获取所有组织类型
+function getDeptType() {
+  getDeptTypeList().then((res) => {
+    deptTypeList.value = res.data
   })
 }
+getDeptType()
 
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
@@ -120,6 +132,9 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.id = row.id
@@ -141,6 +156,7 @@
 }
 // 关闭弹窗
 function dialogClose() {
+  resetForm()
   dialogVisible.value = false
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
@@ -180,7 +196,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="组织类型" prop="deptType" class="required">
             <el-select v-model="formData.deptType" class="full-width-input" clearable placeholder="请选择">
-              <el-option v-for="(item, index) in DeptTypeList" :key="index" :label="item.name" :value="item.value" />
+              <el-option v-for="(item, index) in deptTypeList" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 1dc8d94..e8b9911 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -3,7 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Switch } from '@element-plus/icons-vue'
-import type { DeptInfo, DeptTreeNode } from './dept-interface'
+import type { DeptInfo } from './dept-interface'
 import SystemEditDept from './editDept.vue'
 import { delDept, getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -63,8 +63,8 @@
   ).then(() => {
     delDept(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加组织
@@ -74,7 +74,7 @@
 
 // 表格组件
 const table = ref()
-const expansion = ref(false)
+const expansion = ref(true)
 // 展开或折叠
 function expandOrCollapse() {
   expansion.value = !expansion.value
@@ -111,7 +111,7 @@
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/dict-interface.ts b/src/views/system/dict/dict-interface.ts
index 9b647ec..618c4b9 100644
--- a/src/views/system/dict/dict-interface.ts
+++ b/src/views/system/dict/dict-interface.ts
@@ -2,7 +2,7 @@
 export interface DictDetail {
   name: string
   value: string
-  num: number
+  num: number | string
 }
 
 // 字典
@@ -11,7 +11,7 @@
   dictCode: string
   dictName: string
   dictTips: string
-  dictValues: DictDetail[]
+  dictValues: string
 }
 
 export interface DictListInfo {
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index c2e9eb8..0e5a959 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -5,7 +5,6 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import type { DictDetail, DictInfo, DictListInfo } from './dict-interface'
 import { addDict, updateDict } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,14 +17,16 @@
   create: '新增',
 }
 // 表单数据对象
-const formData: Ref<DictInfo> = ref({
+const formData: DictInfo = reactive({
   dictId: '',
   dictCode: '',
   dictName: '',
   dictTips: '',
-  dictValues: [],
+  dictValues: '',
 })
 
+const details: Ref<DictDetail[]> = ref([])
+
 // 保存按钮加载状态
 const btnLoading = ref(false)
 
@@ -41,24 +42,68 @@
   num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
 })
 
+// 表单提交
 function submitForm() {
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        if (dialogStatus.value === 'create') {
-          createData()
-        }
-        else if (dialogStatus.value === 'update') {
-          updateData()
+        const flag = arrayToString()
+        if (flag) {
+          if (dialogStatus.value === 'create') {
+            createData()
+          }
+          else if (dialogStatus.value === 'update') {
+            updateData()
+          }
         }
       }
     })
   }
 }
+
+// 字典详情字符串转数组
+function stringToArray() {
+  const detailArr = formData.dictValues.split(';')
+  details.value = []
+  for (const detail of detailArr) {
+    const detailItem = detail.split(':')
+    const item: DictDetail = {
+      value: detailItem[0],
+      name: detailItem[1],
+      num: parseInt(detailItem[2]),
+    }
+    details.value.push(item)
+  }
+}
+// 数据转换， 字典详情转换为中间带冒号的
+function arrayToString() {
+  let detailArray = ''
+  const detailList = details.value
+  let passFlag = true
+  if (detailList.length === 0) {
+    passFlag = false
+    ElMessage.warning('至少有一个字典值')
+    return passFlag
+  }
+  detailList.forEach((detail, index) => {
+    if (detail.value === '' || detail.name === '') {
+      passFlag = false
+    }
+    detailArray += `${detail.value}:${detail.name}:${detail.num}`
+    if (index !== (detailList.length - 1)) {
+      detailArray += ';'
+    }
+  })
+  if (!passFlag) {
+    ElMessage.warning('请将字典值和名称都填全后再进行保存')
+  }
+  formData.dictValues = detailArray
+  return passFlag
+}
 // 新增数据
 function createData() {
   btnLoading.value = true
-  addDict(formData.value).then((res) => {
+  addDict(formData).then((res) => {
     ElMessageBox.confirm(
       '新增成功，是否继续新增?',
       '提示',
@@ -80,7 +125,7 @@
 
 // 更新数据
 function updateData() {
-  updateDict(formData.value).then((res) => {
+  updateDict(formData).then((res) => {
     ElMessage.success('修改成功')
     btnLoading.value = false
     closeRefresh()
@@ -90,22 +135,24 @@
 }
 // 添加一行
 function addDetail() {
-  formData.value.dictValues.push({
+  details.value.push({
     value: '',
     name: '',
-    num: formData.value.dictValues.length,
+    num: details.value.length,
   })
 }
 // 删除一行
 function deleteDetail(index: number) {
-  formData.value.dictValues.splice(index, 1)
+  details.value.splice(index, 1)
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.dictId = ''
+  formData.dictCode = ''
+  formData.dictName = ''
+  formData.dictTips = ''
+  formData.dictValues = ''
+  details.value = []
 }
 
 // ----------初始化、关闭对话框相关-----------------
@@ -115,26 +162,17 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
-    const detailArr = row.detail.split(';')
-    const details = [] as DictDetail[]
-    for (const detail of detailArr) {
-      const detailItem = detail.split(':')
-      const item = {
-        value: detailItem[0],
-        name: detailItem[1],
-        num: parseInt(detailItem[2]),
-      }
-      details.push(item)
-    }
-    formData.value = {
-      dictId: row.id,
-      dictCode: row.code,
-      dictName: row.name,
-      dictTips: row.tips,
-      dictValues: details,
-    }
+    formData.dictId = row.id
+    formData.dictCode = row.code
+    formData.dictName = row.name
+    formData.dictTips = row.tips
+    formData.dictValues = row.detail
+    stringToArray()
   }
 }
 
@@ -147,6 +185,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
@@ -190,7 +229,7 @@
             </el-button>
           </div>
           <div class="body">
-            <el-row v-for="(detail, index) in formData.dictValues" :key="index" :gutter="10">
+            <el-row v-for="(detail, index) in details" :key="index" :gutter="10">
               <el-col :span="6">
                 <el-form-item :required="true" label="值" label-width="40">
                   <el-input v-model="detail.value" style="width: 100%;" placeholder="必填" />
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index c7cf29c..6fd6ea3 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -71,8 +71,8 @@
   ).then(() => {
     delDict(row.id).then(() => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加资源
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 7607022..709e08c 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -122,24 +122,26 @@
           </el-button>
         </template>
       </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button type="text" size="small" @click="detail(scope.row)">
-                详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <table-container>
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        >
+          <template #columns>
+            <el-table-column label="操作" width="70" align="center">
+              <template #default="scope">
+                <el-button type="text" size="small" @click="detail(scope.row)">
+                  详情ㅤㅤ
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
     </app-container>
   </div>
 </template>

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index c16ec9a..b1e16c8 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="SystemEditDept">
+import type { Ref } from 'vue'
 import { nextTick, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElButton, ElCol, ElDialog, ElForm, ElFormItem, ElInput, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElRow, ElSelect } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { DeptTypeList } from './dept-interface'
-import type { DeptInfo } from './dept-interface'
-import { addDept, updateDept } from '@/api/system/dept'
+import type { DeptInfo, DeptTypeInfo } from './dept-interface'
+import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
-
+import DeptSelect from '@/components/DeptSelect/index.vue'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,8 +18,7 @@
   update: '编辑',
   create: '新增',
 }
-// 表单数据对象
-const formData: DeptInfo = reactive({
+const defaultFormData: DeptInfo = {
   id: '',
   simpleName: '',
   fullName: '',
@@ -28,7 +27,9 @@
   num: 0,
   version: '',
   tips: '',
-})
+}
+// 表单数据对象
+const formData: DeptInfo = reactive({ ...defaultFormData })
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -107,11 +108,22 @@
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef) { return }
-    dataFormRef.value?.resetFields()
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+}
+
+const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+// 获取所有组织类型
+function getDeptType() {
+  getDeptTypeList().then((res) => {
+    deptTypeList.value = res.data
   })
 }
+getDeptType()
 
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
@@ -120,6 +132,9 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.id = row.id
@@ -141,6 +156,7 @@
 }
 // 关闭弹窗
 function dialogClose() {
+  resetForm()
   dialogVisible.value = false
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
@@ -180,7 +196,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="组织类型" prop="deptType" class="required">
             <el-select v-model="formData.deptType" class="full-width-input" clearable placeholder="请选择">
-              <el-option v-for="(item, index) in DeptTypeList" :key="index" :label="item.name" :value="item.value" />
+              <el-option v-for="(item, index) in deptTypeList" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 1dc8d94..e8b9911 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -3,7 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Switch } from '@element-plus/icons-vue'
-import type { DeptInfo, DeptTreeNode } from './dept-interface'
+import type { DeptInfo } from './dept-interface'
 import SystemEditDept from './editDept.vue'
 import { delDept, getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -63,8 +63,8 @@
   ).then(() => {
     delDept(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加组织
@@ -74,7 +74,7 @@
 
 // 表格组件
 const table = ref()
-const expansion = ref(false)
+const expansion = ref(true)
 // 展开或折叠
 function expandOrCollapse() {
   expansion.value = !expansion.value
@@ -111,7 +111,7 @@
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/dict-interface.ts b/src/views/system/dict/dict-interface.ts
index 9b647ec..618c4b9 100644
--- a/src/views/system/dict/dict-interface.ts
+++ b/src/views/system/dict/dict-interface.ts
@@ -2,7 +2,7 @@
 export interface DictDetail {
   name: string
   value: string
-  num: number
+  num: number | string
 }
 
 // 字典
@@ -11,7 +11,7 @@
   dictCode: string
   dictName: string
   dictTips: string
-  dictValues: DictDetail[]
+  dictValues: string
 }
 
 export interface DictListInfo {
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index c2e9eb8..0e5a959 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -5,7 +5,6 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import type { DictDetail, DictInfo, DictListInfo } from './dict-interface'
 import { addDict, updateDict } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,14 +17,16 @@
   create: '新增',
 }
 // 表单数据对象
-const formData: Ref<DictInfo> = ref({
+const formData: DictInfo = reactive({
   dictId: '',
   dictCode: '',
   dictName: '',
   dictTips: '',
-  dictValues: [],
+  dictValues: '',
 })
 
+const details: Ref<DictDetail[]> = ref([])
+
 // 保存按钮加载状态
 const btnLoading = ref(false)
 
@@ -41,24 +42,68 @@
   num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
 })
 
+// 表单提交
 function submitForm() {
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        if (dialogStatus.value === 'create') {
-          createData()
-        }
-        else if (dialogStatus.value === 'update') {
-          updateData()
+        const flag = arrayToString()
+        if (flag) {
+          if (dialogStatus.value === 'create') {
+            createData()
+          }
+          else if (dialogStatus.value === 'update') {
+            updateData()
+          }
         }
       }
     })
   }
 }
+
+// 字典详情字符串转数组
+function stringToArray() {
+  const detailArr = formData.dictValues.split(';')
+  details.value = []
+  for (const detail of detailArr) {
+    const detailItem = detail.split(':')
+    const item: DictDetail = {
+      value: detailItem[0],
+      name: detailItem[1],
+      num: parseInt(detailItem[2]),
+    }
+    details.value.push(item)
+  }
+}
+// 数据转换， 字典详情转换为中间带冒号的
+function arrayToString() {
+  let detailArray = ''
+  const detailList = details.value
+  let passFlag = true
+  if (detailList.length === 0) {
+    passFlag = false
+    ElMessage.warning('至少有一个字典值')
+    return passFlag
+  }
+  detailList.forEach((detail, index) => {
+    if (detail.value === '' || detail.name === '') {
+      passFlag = false
+    }
+    detailArray += `${detail.value}:${detail.name}:${detail.num}`
+    if (index !== (detailList.length - 1)) {
+      detailArray += ';'
+    }
+  })
+  if (!passFlag) {
+    ElMessage.warning('请将字典值和名称都填全后再进行保存')
+  }
+  formData.dictValues = detailArray
+  return passFlag
+}
 // 新增数据
 function createData() {
   btnLoading.value = true
-  addDict(formData.value).then((res) => {
+  addDict(formData).then((res) => {
     ElMessageBox.confirm(
       '新增成功，是否继续新增?',
       '提示',
@@ -80,7 +125,7 @@
 
 // 更新数据
 function updateData() {
-  updateDict(formData.value).then((res) => {
+  updateDict(formData).then((res) => {
     ElMessage.success('修改成功')
     btnLoading.value = false
     closeRefresh()
@@ -90,22 +135,24 @@
 }
 // 添加一行
 function addDetail() {
-  formData.value.dictValues.push({
+  details.value.push({
     value: '',
     name: '',
-    num: formData.value.dictValues.length,
+    num: details.value.length,
   })
 }
 // 删除一行
 function deleteDetail(index: number) {
-  formData.value.dictValues.splice(index, 1)
+  details.value.splice(index, 1)
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.dictId = ''
+  formData.dictCode = ''
+  formData.dictName = ''
+  formData.dictTips = ''
+  formData.dictValues = ''
+  details.value = []
 }
 
 // ----------初始化、关闭对话框相关-----------------
@@ -115,26 +162,17 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
-    const detailArr = row.detail.split(';')
-    const details = [] as DictDetail[]
-    for (const detail of detailArr) {
-      const detailItem = detail.split(':')
-      const item = {
-        value: detailItem[0],
-        name: detailItem[1],
-        num: parseInt(detailItem[2]),
-      }
-      details.push(item)
-    }
-    formData.value = {
-      dictId: row.id,
-      dictCode: row.code,
-      dictName: row.name,
-      dictTips: row.tips,
-      dictValues: details,
-    }
+    formData.dictId = row.id
+    formData.dictCode = row.code
+    formData.dictName = row.name
+    formData.dictTips = row.tips
+    formData.dictValues = row.detail
+    stringToArray()
   }
 }
 
@@ -147,6 +185,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
@@ -190,7 +229,7 @@
             </el-button>
           </div>
           <div class="body">
-            <el-row v-for="(detail, index) in formData.dictValues" :key="index" :gutter="10">
+            <el-row v-for="(detail, index) in details" :key="index" :gutter="10">
               <el-col :span="6">
                 <el-form-item :required="true" label="值" label-width="40">
                   <el-input v-model="detail.value" style="width: 100%;" placeholder="必填" />
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index c7cf29c..6fd6ea3 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -71,8 +71,8 @@
   ).then(() => {
     delDict(row.id).then(() => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加资源
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 7607022..709e08c 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -122,24 +122,26 @@
           </el-button>
         </template>
       </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button type="text" size="small" @click="detail(scope.row)">
-                详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <table-container>
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        >
+          <template #columns>
+            <el-table-column label="操作" width="70" align="center">
+              <template #default="scope">
+                <el-button type="text" size="small" @click="detail(scope.row)">
+                  详情ㅤㅤ
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index eb10497..611488a 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -159,25 +159,27 @@
           </el-button>
         </template>
       </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                ㅤ详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <table-container>
+        <!-- 查询结果Table显示 -->
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        >
+          <template #columns>
+            <el-table-column label="操作" width="70" align="center">
+              <template #default="scope">
+                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                  ㅤ详情ㅤㅤ
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
     </app-container>
   </div>
 </template>

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index c16ec9a..b1e16c8 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="SystemEditDept">
+import type { Ref } from 'vue'
 import { nextTick, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElButton, ElCol, ElDialog, ElForm, ElFormItem, ElInput, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElRow, ElSelect } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { DeptTypeList } from './dept-interface'
-import type { DeptInfo } from './dept-interface'
-import { addDept, updateDept } from '@/api/system/dept'
+import type { DeptInfo, DeptTypeInfo } from './dept-interface'
+import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
-
+import DeptSelect from '@/components/DeptSelect/index.vue'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,8 +18,7 @@
   update: '编辑',
   create: '新增',
 }
-// 表单数据对象
-const formData: DeptInfo = reactive({
+const defaultFormData: DeptInfo = {
   id: '',
   simpleName: '',
   fullName: '',
@@ -28,7 +27,9 @@
   num: 0,
   version: '',
   tips: '',
-})
+}
+// 表单数据对象
+const formData: DeptInfo = reactive({ ...defaultFormData })
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -107,11 +108,22 @@
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef) { return }
-    dataFormRef.value?.resetFields()
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+}
+
+const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+// 获取所有组织类型
+function getDeptType() {
+  getDeptTypeList().then((res) => {
+    deptTypeList.value = res.data
   })
 }
+getDeptType()
 
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
@@ -120,6 +132,9 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.id = row.id
@@ -141,6 +156,7 @@
 }
 // 关闭弹窗
 function dialogClose() {
+  resetForm()
   dialogVisible.value = false
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
@@ -180,7 +196,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="组织类型" prop="deptType" class="required">
             <el-select v-model="formData.deptType" class="full-width-input" clearable placeholder="请选择">
-              <el-option v-for="(item, index) in DeptTypeList" :key="index" :label="item.name" :value="item.value" />
+              <el-option v-for="(item, index) in deptTypeList" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 1dc8d94..e8b9911 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -3,7 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Switch } from '@element-plus/icons-vue'
-import type { DeptInfo, DeptTreeNode } from './dept-interface'
+import type { DeptInfo } from './dept-interface'
 import SystemEditDept from './editDept.vue'
 import { delDept, getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -63,8 +63,8 @@
   ).then(() => {
     delDept(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加组织
@@ -74,7 +74,7 @@
 
 // 表格组件
 const table = ref()
-const expansion = ref(false)
+const expansion = ref(true)
 // 展开或折叠
 function expandOrCollapse() {
   expansion.value = !expansion.value
@@ -111,7 +111,7 @@
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/dict-interface.ts b/src/views/system/dict/dict-interface.ts
index 9b647ec..618c4b9 100644
--- a/src/views/system/dict/dict-interface.ts
+++ b/src/views/system/dict/dict-interface.ts
@@ -2,7 +2,7 @@
 export interface DictDetail {
   name: string
   value: string
-  num: number
+  num: number | string
 }
 
 // 字典
@@ -11,7 +11,7 @@
   dictCode: string
   dictName: string
   dictTips: string
-  dictValues: DictDetail[]
+  dictValues: string
 }
 
 export interface DictListInfo {
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index c2e9eb8..0e5a959 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -5,7 +5,6 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import type { DictDetail, DictInfo, DictListInfo } from './dict-interface'
 import { addDict, updateDict } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,14 +17,16 @@
   create: '新增',
 }
 // 表单数据对象
-const formData: Ref<DictInfo> = ref({
+const formData: DictInfo = reactive({
   dictId: '',
   dictCode: '',
   dictName: '',
   dictTips: '',
-  dictValues: [],
+  dictValues: '',
 })
 
+const details: Ref<DictDetail[]> = ref([])
+
 // 保存按钮加载状态
 const btnLoading = ref(false)
 
@@ -41,24 +42,68 @@
   num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
 })
 
+// 表单提交
 function submitForm() {
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        if (dialogStatus.value === 'create') {
-          createData()
-        }
-        else if (dialogStatus.value === 'update') {
-          updateData()
+        const flag = arrayToString()
+        if (flag) {
+          if (dialogStatus.value === 'create') {
+            createData()
+          }
+          else if (dialogStatus.value === 'update') {
+            updateData()
+          }
         }
       }
     })
   }
 }
+
+// 字典详情字符串转数组
+function stringToArray() {
+  const detailArr = formData.dictValues.split(';')
+  details.value = []
+  for (const detail of detailArr) {
+    const detailItem = detail.split(':')
+    const item: DictDetail = {
+      value: detailItem[0],
+      name: detailItem[1],
+      num: parseInt(detailItem[2]),
+    }
+    details.value.push(item)
+  }
+}
+// 数据转换， 字典详情转换为中间带冒号的
+function arrayToString() {
+  let detailArray = ''
+  const detailList = details.value
+  let passFlag = true
+  if (detailList.length === 0) {
+    passFlag = false
+    ElMessage.warning('至少有一个字典值')
+    return passFlag
+  }
+  detailList.forEach((detail, index) => {
+    if (detail.value === '' || detail.name === '') {
+      passFlag = false
+    }
+    detailArray += `${detail.value}:${detail.name}:${detail.num}`
+    if (index !== (detailList.length - 1)) {
+      detailArray += ';'
+    }
+  })
+  if (!passFlag) {
+    ElMessage.warning('请将字典值和名称都填全后再进行保存')
+  }
+  formData.dictValues = detailArray
+  return passFlag
+}
 // 新增数据
 function createData() {
   btnLoading.value = true
-  addDict(formData.value).then((res) => {
+  addDict(formData).then((res) => {
     ElMessageBox.confirm(
       '新增成功，是否继续新增?',
       '提示',
@@ -80,7 +125,7 @@
 
 // 更新数据
 function updateData() {
-  updateDict(formData.value).then((res) => {
+  updateDict(formData).then((res) => {
     ElMessage.success('修改成功')
     btnLoading.value = false
     closeRefresh()
@@ -90,22 +135,24 @@
 }
 // 添加一行
 function addDetail() {
-  formData.value.dictValues.push({
+  details.value.push({
     value: '',
     name: '',
-    num: formData.value.dictValues.length,
+    num: details.value.length,
   })
 }
 // 删除一行
 function deleteDetail(index: number) {
-  formData.value.dictValues.splice(index, 1)
+  details.value.splice(index, 1)
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.dictId = ''
+  formData.dictCode = ''
+  formData.dictName = ''
+  formData.dictTips = ''
+  formData.dictValues = ''
+  details.value = []
 }
 
 // ----------初始化、关闭对话框相关-----------------
@@ -115,26 +162,17 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
-    const detailArr = row.detail.split(';')
-    const details = [] as DictDetail[]
-    for (const detail of detailArr) {
-      const detailItem = detail.split(':')
-      const item = {
-        value: detailItem[0],
-        name: detailItem[1],
-        num: parseInt(detailItem[2]),
-      }
-      details.push(item)
-    }
-    formData.value = {
-      dictId: row.id,
-      dictCode: row.code,
-      dictName: row.name,
-      dictTips: row.tips,
-      dictValues: details,
-    }
+    formData.dictId = row.id
+    formData.dictCode = row.code
+    formData.dictName = row.name
+    formData.dictTips = row.tips
+    formData.dictValues = row.detail
+    stringToArray()
   }
 }
 
@@ -147,6 +185,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
@@ -190,7 +229,7 @@
             </el-button>
           </div>
           <div class="body">
-            <el-row v-for="(detail, index) in formData.dictValues" :key="index" :gutter="10">
+            <el-row v-for="(detail, index) in details" :key="index" :gutter="10">
               <el-col :span="6">
                 <el-form-item :required="true" label="值" label-width="40">
                   <el-input v-model="detail.value" style="width: 100%;" placeholder="必填" />
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index c7cf29c..6fd6ea3 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -71,8 +71,8 @@
   ).then(() => {
     delDict(row.id).then(() => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加资源
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 7607022..709e08c 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -122,24 +122,26 @@
           </el-button>
         </template>
       </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button type="text" size="small" @click="detail(scope.row)">
-                详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <table-container>
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        >
+          <template #columns>
+            <el-table-column label="操作" width="70" align="center">
+              <template #default="scope">
+                <el-button type="text" size="small" @click="detail(scope.row)">
+                  详情ㅤㅤ
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index eb10497..611488a 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -159,25 +159,27 @@
           </el-button>
         </template>
       </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                ㅤ详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <table-container>
+        <!-- 查询结果Table显示 -->
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        >
+          <template #columns>
+            <el-table-column label="操作" width="70" align="center">
+              <template #default="scope">
+                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                  ㅤ详情ㅤㅤ
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 22c649d..db9ae07 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -146,15 +146,17 @@
           </el-button>
         </template>
       </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      />
+      <table-container>
+        <!-- 查询结果Table显示 -->
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        />
+      </table-container>
     </app-container>
   </div>
 </template>

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index c16ec9a..b1e16c8 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="SystemEditDept">
+import type { Ref } from 'vue'
 import { nextTick, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElButton, ElCol, ElDialog, ElForm, ElFormItem, ElInput, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElRow, ElSelect } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { DeptTypeList } from './dept-interface'
-import type { DeptInfo } from './dept-interface'
-import { addDept, updateDept } from '@/api/system/dept'
+import type { DeptInfo, DeptTypeInfo } from './dept-interface'
+import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
-
+import DeptSelect from '@/components/DeptSelect/index.vue'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,8 +18,7 @@
   update: '编辑',
   create: '新增',
 }
-// 表单数据对象
-const formData: DeptInfo = reactive({
+const defaultFormData: DeptInfo = {
   id: '',
   simpleName: '',
   fullName: '',
@@ -28,7 +27,9 @@
   num: 0,
   version: '',
   tips: '',
-})
+}
+// 表单数据对象
+const formData: DeptInfo = reactive({ ...defaultFormData })
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -107,11 +108,22 @@
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef) { return }
-    dataFormRef.value?.resetFields()
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+}
+
+const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+// 获取所有组织类型
+function getDeptType() {
+  getDeptTypeList().then((res) => {
+    deptTypeList.value = res.data
   })
 }
+getDeptType()
 
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
@@ -120,6 +132,9 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.id = row.id
@@ -141,6 +156,7 @@
 }
 // 关闭弹窗
 function dialogClose() {
+  resetForm()
   dialogVisible.value = false
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
@@ -180,7 +196,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="组织类型" prop="deptType" class="required">
             <el-select v-model="formData.deptType" class="full-width-input" clearable placeholder="请选择">
-              <el-option v-for="(item, index) in DeptTypeList" :key="index" :label="item.name" :value="item.value" />
+              <el-option v-for="(item, index) in deptTypeList" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 1dc8d94..e8b9911 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -3,7 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Switch } from '@element-plus/icons-vue'
-import type { DeptInfo, DeptTreeNode } from './dept-interface'
+import type { DeptInfo } from './dept-interface'
 import SystemEditDept from './editDept.vue'
 import { delDept, getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -63,8 +63,8 @@
   ).then(() => {
     delDept(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加组织
@@ -74,7 +74,7 @@
 
 // 表格组件
 const table = ref()
-const expansion = ref(false)
+const expansion = ref(true)
 // 展开或折叠
 function expandOrCollapse() {
   expansion.value = !expansion.value
@@ -111,7 +111,7 @@
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/dict-interface.ts b/src/views/system/dict/dict-interface.ts
index 9b647ec..618c4b9 100644
--- a/src/views/system/dict/dict-interface.ts
+++ b/src/views/system/dict/dict-interface.ts
@@ -2,7 +2,7 @@
 export interface DictDetail {
   name: string
   value: string
-  num: number
+  num: number | string
 }
 
 // 字典
@@ -11,7 +11,7 @@
   dictCode: string
   dictName: string
   dictTips: string
-  dictValues: DictDetail[]
+  dictValues: string
 }
 
 export interface DictListInfo {
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index c2e9eb8..0e5a959 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -5,7 +5,6 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import type { DictDetail, DictInfo, DictListInfo } from './dict-interface'
 import { addDict, updateDict } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,14 +17,16 @@
   create: '新增',
 }
 // 表单数据对象
-const formData: Ref<DictInfo> = ref({
+const formData: DictInfo = reactive({
   dictId: '',
   dictCode: '',
   dictName: '',
   dictTips: '',
-  dictValues: [],
+  dictValues: '',
 })
 
+const details: Ref<DictDetail[]> = ref([])
+
 // 保存按钮加载状态
 const btnLoading = ref(false)
 
@@ -41,24 +42,68 @@
   num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
 })
 
+// 表单提交
 function submitForm() {
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        if (dialogStatus.value === 'create') {
-          createData()
-        }
-        else if (dialogStatus.value === 'update') {
-          updateData()
+        const flag = arrayToString()
+        if (flag) {
+          if (dialogStatus.value === 'create') {
+            createData()
+          }
+          else if (dialogStatus.value === 'update') {
+            updateData()
+          }
         }
       }
     })
   }
 }
+
+// 字典详情字符串转数组
+function stringToArray() {
+  const detailArr = formData.dictValues.split(';')
+  details.value = []
+  for (const detail of detailArr) {
+    const detailItem = detail.split(':')
+    const item: DictDetail = {
+      value: detailItem[0],
+      name: detailItem[1],
+      num: parseInt(detailItem[2]),
+    }
+    details.value.push(item)
+  }
+}
+// 数据转换， 字典详情转换为中间带冒号的
+function arrayToString() {
+  let detailArray = ''
+  const detailList = details.value
+  let passFlag = true
+  if (detailList.length === 0) {
+    passFlag = false
+    ElMessage.warning('至少有一个字典值')
+    return passFlag
+  }
+  detailList.forEach((detail, index) => {
+    if (detail.value === '' || detail.name === '') {
+      passFlag = false
+    }
+    detailArray += `${detail.value}:${detail.name}:${detail.num}`
+    if (index !== (detailList.length - 1)) {
+      detailArray += ';'
+    }
+  })
+  if (!passFlag) {
+    ElMessage.warning('请将字典值和名称都填全后再进行保存')
+  }
+  formData.dictValues = detailArray
+  return passFlag
+}
 // 新增数据
 function createData() {
   btnLoading.value = true
-  addDict(formData.value).then((res) => {
+  addDict(formData).then((res) => {
     ElMessageBox.confirm(
       '新增成功，是否继续新增?',
       '提示',
@@ -80,7 +125,7 @@
 
 // 更新数据
 function updateData() {
-  updateDict(formData.value).then((res) => {
+  updateDict(formData).then((res) => {
     ElMessage.success('修改成功')
     btnLoading.value = false
     closeRefresh()
@@ -90,22 +135,24 @@
 }
 // 添加一行
 function addDetail() {
-  formData.value.dictValues.push({
+  details.value.push({
     value: '',
     name: '',
-    num: formData.value.dictValues.length,
+    num: details.value.length,
   })
 }
 // 删除一行
 function deleteDetail(index: number) {
-  formData.value.dictValues.splice(index, 1)
+  details.value.splice(index, 1)
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.dictId = ''
+  formData.dictCode = ''
+  formData.dictName = ''
+  formData.dictTips = ''
+  formData.dictValues = ''
+  details.value = []
 }
 
 // ----------初始化、关闭对话框相关-----------------
@@ -115,26 +162,17 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
-    const detailArr = row.detail.split(';')
-    const details = [] as DictDetail[]
-    for (const detail of detailArr) {
-      const detailItem = detail.split(':')
-      const item = {
-        value: detailItem[0],
-        name: detailItem[1],
-        num: parseInt(detailItem[2]),
-      }
-      details.push(item)
-    }
-    formData.value = {
-      dictId: row.id,
-      dictCode: row.code,
-      dictName: row.name,
-      dictTips: row.tips,
-      dictValues: details,
-    }
+    formData.dictId = row.id
+    formData.dictCode = row.code
+    formData.dictName = row.name
+    formData.dictTips = row.tips
+    formData.dictValues = row.detail
+    stringToArray()
   }
 }
 
@@ -147,6 +185,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
@@ -190,7 +229,7 @@
             </el-button>
           </div>
           <div class="body">
-            <el-row v-for="(detail, index) in formData.dictValues" :key="index" :gutter="10">
+            <el-row v-for="(detail, index) in details" :key="index" :gutter="10">
               <el-col :span="6">
                 <el-form-item :required="true" label="值" label-width="40">
                   <el-input v-model="detail.value" style="width: 100%;" placeholder="必填" />
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index c7cf29c..6fd6ea3 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -71,8 +71,8 @@
   ).then(() => {
     delDict(row.id).then(() => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加资源
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 7607022..709e08c 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -122,24 +122,26 @@
           </el-button>
         </template>
       </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button type="text" size="small" @click="detail(scope.row)">
-                详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <table-container>
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        >
+          <template #columns>
+            <el-table-column label="操作" width="70" align="center">
+              <template #default="scope">
+                <el-button type="text" size="small" @click="detail(scope.row)">
+                  详情ㅤㅤ
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index eb10497..611488a 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -159,25 +159,27 @@
           </el-button>
         </template>
       </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                ㅤ详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <table-container>
+        <!-- 查询结果Table显示 -->
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        >
+          <template #columns>
+            <el-table-column label="操作" width="70" align="center">
+              <template #default="scope">
+                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                  ㅤ详情ㅤㅤ
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 22c649d..db9ae07 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -146,15 +146,17 @@
           </el-button>
         </template>
       </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      />
+      <table-container>
+        <!-- 查询结果Table显示 -->
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        />
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index 1e72e08..59a8a6b 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -103,10 +103,16 @@
 
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.value = {
+    name: '',
+    id: '',
+    url: '',
+    code: '',
+    pid: '',
+    resourceType: '',
+    num: 0,
+    icon: '',
+  }
 }
 
 // 树列表配置
@@ -137,7 +143,10 @@
   dialogVisible.value = true
   btnLoading.value = false
   if (dialogstatus === 'create') {
-    // resetForm()
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.value = {
@@ -162,6 +171,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index c16ec9a..b1e16c8 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="SystemEditDept">
+import type { Ref } from 'vue'
 import { nextTick, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElButton, ElCol, ElDialog, ElForm, ElFormItem, ElInput, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElRow, ElSelect } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { DeptTypeList } from './dept-interface'
-import type { DeptInfo } from './dept-interface'
-import { addDept, updateDept } from '@/api/system/dept'
+import type { DeptInfo, DeptTypeInfo } from './dept-interface'
+import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
-
+import DeptSelect from '@/components/DeptSelect/index.vue'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,8 +18,7 @@
   update: '编辑',
   create: '新增',
 }
-// 表单数据对象
-const formData: DeptInfo = reactive({
+const defaultFormData: DeptInfo = {
   id: '',
   simpleName: '',
   fullName: '',
@@ -28,7 +27,9 @@
   num: 0,
   version: '',
   tips: '',
-})
+}
+// 表单数据对象
+const formData: DeptInfo = reactive({ ...defaultFormData })
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -107,11 +108,22 @@
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef) { return }
-    dataFormRef.value?.resetFields()
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+}
+
+const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+// 获取所有组织类型
+function getDeptType() {
+  getDeptTypeList().then((res) => {
+    deptTypeList.value = res.data
   })
 }
+getDeptType()
 
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
@@ -120,6 +132,9 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.id = row.id
@@ -141,6 +156,7 @@
 }
 // 关闭弹窗
 function dialogClose() {
+  resetForm()
   dialogVisible.value = false
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
@@ -180,7 +196,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="组织类型" prop="deptType" class="required">
             <el-select v-model="formData.deptType" class="full-width-input" clearable placeholder="请选择">
-              <el-option v-for="(item, index) in DeptTypeList" :key="index" :label="item.name" :value="item.value" />
+              <el-option v-for="(item, index) in deptTypeList" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 1dc8d94..e8b9911 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -3,7 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Switch } from '@element-plus/icons-vue'
-import type { DeptInfo, DeptTreeNode } from './dept-interface'
+import type { DeptInfo } from './dept-interface'
 import SystemEditDept from './editDept.vue'
 import { delDept, getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -63,8 +63,8 @@
   ).then(() => {
     delDept(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加组织
@@ -74,7 +74,7 @@
 
 // 表格组件
 const table = ref()
-const expansion = ref(false)
+const expansion = ref(true)
 // 展开或折叠
 function expandOrCollapse() {
   expansion.value = !expansion.value
@@ -111,7 +111,7 @@
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/dict-interface.ts b/src/views/system/dict/dict-interface.ts
index 9b647ec..618c4b9 100644
--- a/src/views/system/dict/dict-interface.ts
+++ b/src/views/system/dict/dict-interface.ts
@@ -2,7 +2,7 @@
 export interface DictDetail {
   name: string
   value: string
-  num: number
+  num: number | string
 }
 
 // 字典
@@ -11,7 +11,7 @@
   dictCode: string
   dictName: string
   dictTips: string
-  dictValues: DictDetail[]
+  dictValues: string
 }
 
 export interface DictListInfo {
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index c2e9eb8..0e5a959 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -5,7 +5,6 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import type { DictDetail, DictInfo, DictListInfo } from './dict-interface'
 import { addDict, updateDict } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,14 +17,16 @@
   create: '新增',
 }
 // 表单数据对象
-const formData: Ref<DictInfo> = ref({
+const formData: DictInfo = reactive({
   dictId: '',
   dictCode: '',
   dictName: '',
   dictTips: '',
-  dictValues: [],
+  dictValues: '',
 })
 
+const details: Ref<DictDetail[]> = ref([])
+
 // 保存按钮加载状态
 const btnLoading = ref(false)
 
@@ -41,24 +42,68 @@
   num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
 })
 
+// 表单提交
 function submitForm() {
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        if (dialogStatus.value === 'create') {
-          createData()
-        }
-        else if (dialogStatus.value === 'update') {
-          updateData()
+        const flag = arrayToString()
+        if (flag) {
+          if (dialogStatus.value === 'create') {
+            createData()
+          }
+          else if (dialogStatus.value === 'update') {
+            updateData()
+          }
         }
       }
     })
   }
 }
+
+// 字典详情字符串转数组
+function stringToArray() {
+  const detailArr = formData.dictValues.split(';')
+  details.value = []
+  for (const detail of detailArr) {
+    const detailItem = detail.split(':')
+    const item: DictDetail = {
+      value: detailItem[0],
+      name: detailItem[1],
+      num: parseInt(detailItem[2]),
+    }
+    details.value.push(item)
+  }
+}
+// 数据转换， 字典详情转换为中间带冒号的
+function arrayToString() {
+  let detailArray = ''
+  const detailList = details.value
+  let passFlag = true
+  if (detailList.length === 0) {
+    passFlag = false
+    ElMessage.warning('至少有一个字典值')
+    return passFlag
+  }
+  detailList.forEach((detail, index) => {
+    if (detail.value === '' || detail.name === '') {
+      passFlag = false
+    }
+    detailArray += `${detail.value}:${detail.name}:${detail.num}`
+    if (index !== (detailList.length - 1)) {
+      detailArray += ';'
+    }
+  })
+  if (!passFlag) {
+    ElMessage.warning('请将字典值和名称都填全后再进行保存')
+  }
+  formData.dictValues = detailArray
+  return passFlag
+}
 // 新增数据
 function createData() {
   btnLoading.value = true
-  addDict(formData.value).then((res) => {
+  addDict(formData).then((res) => {
     ElMessageBox.confirm(
       '新增成功，是否继续新增?',
       '提示',
@@ -80,7 +125,7 @@
 
 // 更新数据
 function updateData() {
-  updateDict(formData.value).then((res) => {
+  updateDict(formData).then((res) => {
     ElMessage.success('修改成功')
     btnLoading.value = false
     closeRefresh()
@@ -90,22 +135,24 @@
 }
 // 添加一行
 function addDetail() {
-  formData.value.dictValues.push({
+  details.value.push({
     value: '',
     name: '',
-    num: formData.value.dictValues.length,
+    num: details.value.length,
   })
 }
 // 删除一行
 function deleteDetail(index: number) {
-  formData.value.dictValues.splice(index, 1)
+  details.value.splice(index, 1)
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.dictId = ''
+  formData.dictCode = ''
+  formData.dictName = ''
+  formData.dictTips = ''
+  formData.dictValues = ''
+  details.value = []
 }
 
 // ----------初始化、关闭对话框相关-----------------
@@ -115,26 +162,17 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
-    const detailArr = row.detail.split(';')
-    const details = [] as DictDetail[]
-    for (const detail of detailArr) {
-      const detailItem = detail.split(':')
-      const item = {
-        value: detailItem[0],
-        name: detailItem[1],
-        num: parseInt(detailItem[2]),
-      }
-      details.push(item)
-    }
-    formData.value = {
-      dictId: row.id,
-      dictCode: row.code,
-      dictName: row.name,
-      dictTips: row.tips,
-      dictValues: details,
-    }
+    formData.dictId = row.id
+    formData.dictCode = row.code
+    formData.dictName = row.name
+    formData.dictTips = row.tips
+    formData.dictValues = row.detail
+    stringToArray()
   }
 }
 
@@ -147,6 +185,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
@@ -190,7 +229,7 @@
             </el-button>
           </div>
           <div class="body">
-            <el-row v-for="(detail, index) in formData.dictValues" :key="index" :gutter="10">
+            <el-row v-for="(detail, index) in details" :key="index" :gutter="10">
               <el-col :span="6">
                 <el-form-item :required="true" label="值" label-width="40">
                   <el-input v-model="detail.value" style="width: 100%;" placeholder="必填" />
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index c7cf29c..6fd6ea3 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -71,8 +71,8 @@
   ).then(() => {
     delDict(row.id).then(() => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加资源
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 7607022..709e08c 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -122,24 +122,26 @@
           </el-button>
         </template>
       </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button type="text" size="small" @click="detail(scope.row)">
-                详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <table-container>
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        >
+          <template #columns>
+            <el-table-column label="操作" width="70" align="center">
+              <template #default="scope">
+                <el-button type="text" size="small" @click="detail(scope.row)">
+                  详情ㅤㅤ
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index eb10497..611488a 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -159,25 +159,27 @@
           </el-button>
         </template>
       </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                ㅤ详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <table-container>
+        <!-- 查询结果Table显示 -->
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        >
+          <template #columns>
+            <el-table-column label="操作" width="70" align="center">
+              <template #default="scope">
+                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                  ㅤ详情ㅤㅤ
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 22c649d..db9ae07 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -146,15 +146,17 @@
           </el-button>
         </template>
       </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      />
+      <table-container>
+        <!-- 查询结果Table显示 -->
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        />
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index 1e72e08..59a8a6b 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -103,10 +103,16 @@
 
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.value = {
+    name: '',
+    id: '',
+    url: '',
+    code: '',
+    pid: '',
+    resourceType: '',
+    num: 0,
+    icon: '',
+  }
 }
 
 // 树列表配置
@@ -137,7 +143,10 @@
   dialogVisible.value = true
   btnLoading.value = false
   if (dialogstatus === 'create') {
-    // resetForm()
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.value = {
@@ -162,6 +171,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index 3017259..5ca65ed 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -77,8 +77,8 @@
   ).then(() => {
     delResource(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加资源

diff --git a/src/api/system/area.ts b/src/api/system/area.ts
index 8b4e5a8..682162d 100644
--- a/src/api/system/area.ts
+++ b/src/api/system/area.ts
@@ -2,7 +2,7 @@
  * 区域管理接口
  */
 import request from '../index'
-const prefix = 'sys'
+const prefix = 'ext'
 
 // 区域查询
 export function getAreaListPage(params: object) {
@@ -45,7 +45,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: `${prefix}/dict/code/levelType`,
+    url: 'sys/dict/code/levelType',
     method: 'get',
   })
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 48f386e..06e3178 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -64,3 +64,11 @@
     },
   })
 }
+
+// 资源类型列表
+export function getDeptTypeList() {
+  return request({
+    url: `${prefix}/dict/code/deptType`,
+    method: 'get',
+  })
+}
diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue
index 419d14d..2344541 100644
--- a/src/components/DeptSelect/index.vue
+++ b/src/components/DeptSelect/index.vue
@@ -176,7 +176,7 @@
       class="full-width-input"
     />
     <el-select v-else v-model="value" :placeholder="props.placeholder" :size="props.size" :disabled="props.disabled" :clearable="props.clearable" class="full-width-input">
-      <el-option />
+      <el-option v-for="(item, index) in deptTreeList" :key="index" :label="item.name" :value="item.id" />
     </el-select>
   </div>
 </template>
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 335a6fb..396ab2d 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -2,7 +2,7 @@
 import { computed, onActivated, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Ref } from 'vue'
-import type { IlistQuery } from './area_interface'
+import type { IlistQuery } from './area-interface'
 import EditArea from './editArea.vue'
 import { delArea, getAreaListPage } from '@/api/system/area'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
@@ -136,31 +136,34 @@
         <el-input v-model.trim="listQuery.keywords" placeholder="区域名称/编码" clearable />
       </search-item>
     </search-area>
-    <!-- 查询结果Table显示 -->
-    <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
-      <template #btns>
-        <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
-          新增
-        </el-button>
-      </template>
-      <template #columns>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template #default="scope">
-            <span :class="column.class">{{ scope.row[column.value] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="showOperate" label="操作" width="160" align="center">
-          <template #default="scope">
-            <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
-              修改
-            </el-button>
-            <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </template>
-    </normal-table>
+    <table-container>
+      <!-- 查询结果Table显示 -->
+      <normal-table :data="list" :total="total" :query="listQuery" :list-loading="listLoading" @change="changePage">
+        <template #btns>
+          <el-button v-if="proxy.hasPerm('/sys/area/add')" size="small" class="filter-item" icon="el-icon-plus" @click="add">
+            新增
+          </el-button>
+        </template>
+        <template #columns>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+            <template #default="scope">
+              <span>{{ scope.row[column.value] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column v-if="showOperate" label="操作" width="160" align="center">
+            <template #default="scope">
+              <el-button v-if="proxy.hasPerm('/sys/area/update')" type="text" size="small" @click="edit(scope.row)">
+                修改
+              </el-button>
+              <el-button v-if="proxy.hasPerm('/sys/area/delete')" type="text" size="small" @click="del(scope.row)">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
     <edit-area v-show="dialogFormVisible" ref="editarea" @watchChild="fetchData" />
   </app-container>
 </template>
diff --git a/src/views/system/dept/dept-interface.ts b/src/views/system/dept/dept-interface.ts
index 12ffea3..d5a75b6 100644
--- a/src/views/system/dept/dept-interface.ts
+++ b/src/views/system/dept/dept-interface.ts
@@ -1,9 +1,17 @@
 // 部门类别
 export const DeptTypeList = [
-  { name: '公司/单位', value: '03' },
-  { name: '部门/组', value: '04' },
+  { name: '公司', value: '1' },
+  { name: '部门', value: '2' },
+  { name: '科室', value: '3' },
+  { name: '工程组', value: '4' },
 ]
 
+// 部门类型
+export interface DeptTypeInfo {
+  name: string
+  value: string
+}
+
 // 部门信息，下拉树用
 export interface DeptTreeNode {
   id: string
@@ -26,4 +34,5 @@
   deptType: string
   tips: string
   children?: []
+  [key: string]: string | number | [] | undefined
 }
diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue
index c16ec9a..b1e16c8 100644
--- a/src/views/system/dept/editDept.vue
+++ b/src/views/system/dept/editDept.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup name="SystemEditDept">
+import type { Ref } from 'vue'
 import { nextTick, reactive } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElButton, ElCol, ElDialog, ElForm, ElFormItem, ElInput, ElInputNumber, ElMessage, ElMessageBox, ElOption, ElRow, ElSelect } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
-import { DeptTypeList } from './dept-interface'
-import type { DeptInfo } from './dept-interface'
-import { addDept, updateDept } from '@/api/system/dept'
+import type { DeptInfo, DeptTypeInfo } from './dept-interface'
+import { addDept, getDeptTypeList, updateDept } from '@/api/system/dept'
 import useDictStore from '@/store/modules/dict'
-
+import DeptSelect from '@/components/DeptSelect/index.vue'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,8 +18,7 @@
   update: '编辑',
   create: '新增',
 }
-// 表单数据对象
-const formData: DeptInfo = reactive({
+const defaultFormData: DeptInfo = {
   id: '',
   simpleName: '',
   fullName: '',
@@ -28,7 +27,9 @@
   num: 0,
   version: '',
   tips: '',
-})
+}
+// 表单数据对象
+const formData: DeptInfo = reactive({ ...defaultFormData })
 
 // 保存按钮加载状态
 const btnLoading = ref(false)
@@ -107,11 +108,22 @@
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef) { return }
-    dataFormRef.value?.resetFields()
+  const form = formData
+  const keys = Object.keys(formData)
+  keys.forEach((key) => {
+    form[key] = defaultFormData[key]
+  })
+  Object.assign(formData, form)
+}
+
+const deptTypeList: Ref<DeptTypeInfo[]> = ref([])
+// 获取所有组织类型
+function getDeptType() {
+  getDeptTypeList().then((res) => {
+    deptTypeList.value = res.data
   })
 }
+getDeptType()
 
 // ----------初始化、关闭对话框相关-----------------
 function initDialog(dialogstatus: string, row: DeptInfo) {
@@ -120,6 +132,9 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.id = row.id
@@ -141,6 +156,7 @@
 }
 // 关闭弹窗
 function dialogClose() {
+  resetForm()
   dialogVisible.value = false
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
@@ -180,7 +196,7 @@
         <el-col :span="12" class="grid-cell">
           <el-form-item label="组织类型" prop="deptType" class="required">
             <el-select v-model="formData.deptType" class="full-width-input" clearable placeholder="请选择">
-              <el-option v-for="(item, index) in DeptTypeList" :key="index" :label="item.name" :value="item.value" />
+              <el-option v-for="(item, index) in deptTypeList" :key="index" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue
index 1dc8d94..e8b9911 100644
--- a/src/views/system/dept/listDept.vue
+++ b/src/views/system/dept/listDept.vue
@@ -3,7 +3,7 @@
 import { getCurrentInstance, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Plus, Switch } from '@element-plus/icons-vue'
-import type { DeptInfo, DeptTreeNode } from './dept-interface'
+import type { DeptInfo } from './dept-interface'
 import SystemEditDept from './editDept.vue'
 import { delDept, getDeptList } from '@/api/system/dept'
 import { toTreeList } from '@/utils/structure'
@@ -63,8 +63,8 @@
   ).then(() => {
     delDept(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加组织
@@ -74,7 +74,7 @@
 
 // 表格组件
 const table = ref()
-const expansion = ref(false)
+const expansion = ref(true)
 // 展开或折叠
 function expandOrCollapse() {
   expansion.value = !expansion.value
@@ -111,7 +111,7 @@
           展开/折叠
         </el-button>
       </template>
-      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" style="width: 100%;" :tree-props="{ children: 'children' }">
+      <el-table ref="table" v-loading="loading" :data="list" row-key="id" :border="false" default-expand-all style="width: 100%;" :tree-props="{ children: 'children' }">
         <el-table-column v-for="column of columns" :key="column.value" :label="column.text" :prop="column.value" :width="column.width" :align="column.align" />
         <el-table-column v-if="proxy.hasPerm('/sys/dept/update') || proxy.hasPerm('/sys/dept/delete')" label="操作" width="140" align="center">
           <template #default="scope">
diff --git a/src/views/system/dict/dict-interface.ts b/src/views/system/dict/dict-interface.ts
index 9b647ec..618c4b9 100644
--- a/src/views/system/dict/dict-interface.ts
+++ b/src/views/system/dict/dict-interface.ts
@@ -2,7 +2,7 @@
 export interface DictDetail {
   name: string
   value: string
-  num: number
+  num: number | string
 }
 
 // 字典
@@ -11,7 +11,7 @@
   dictCode: string
   dictName: string
   dictTips: string
-  dictValues: DictDetail[]
+  dictValues: string
 }
 
 export interface DictListInfo {
diff --git a/src/views/system/dict/editDict.vue b/src/views/system/dict/editDict.vue
index c2e9eb8..0e5a959 100644
--- a/src/views/system/dict/editDict.vue
+++ b/src/views/system/dict/editDict.vue
@@ -5,7 +5,6 @@
 import type { FormInstance, FormRules } from 'element-plus'
 import type { DictDetail, DictInfo, DictListInfo } from './dict-interface'
 import { addDict, updateDict } from '@/api/system/dict'
-import { toTreeList } from '@/utils/structure'
 // ----------------------- 以下是字段定义 emits props ---------------------
 const emits = defineEmits(['closeRefresh'])
 
@@ -18,14 +17,16 @@
   create: '新增',
 }
 // 表单数据对象
-const formData: Ref<DictInfo> = ref({
+const formData: DictInfo = reactive({
   dictId: '',
   dictCode: '',
   dictName: '',
   dictTips: '',
-  dictValues: [],
+  dictValues: '',
 })
 
+const details: Ref<DictDetail[]> = ref([])
+
 // 保存按钮加载状态
 const btnLoading = ref(false)
 
@@ -41,24 +42,68 @@
   num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }],
 })
 
+// 表单提交
 function submitForm() {
   if (dataFormRef) {
     dataFormRef.value?.validate((valid: boolean) => {
       if (valid) {
-        if (dialogStatus.value === 'create') {
-          createData()
-        }
-        else if (dialogStatus.value === 'update') {
-          updateData()
+        const flag = arrayToString()
+        if (flag) {
+          if (dialogStatus.value === 'create') {
+            createData()
+          }
+          else if (dialogStatus.value === 'update') {
+            updateData()
+          }
         }
       }
     })
   }
 }
+
+// 字典详情字符串转数组
+function stringToArray() {
+  const detailArr = formData.dictValues.split(';')
+  details.value = []
+  for (const detail of detailArr) {
+    const detailItem = detail.split(':')
+    const item: DictDetail = {
+      value: detailItem[0],
+      name: detailItem[1],
+      num: parseInt(detailItem[2]),
+    }
+    details.value.push(item)
+  }
+}
+// 数据转换， 字典详情转换为中间带冒号的
+function arrayToString() {
+  let detailArray = ''
+  const detailList = details.value
+  let passFlag = true
+  if (detailList.length === 0) {
+    passFlag = false
+    ElMessage.warning('至少有一个字典值')
+    return passFlag
+  }
+  detailList.forEach((detail, index) => {
+    if (detail.value === '' || detail.name === '') {
+      passFlag = false
+    }
+    detailArray += `${detail.value}:${detail.name}:${detail.num}`
+    if (index !== (detailList.length - 1)) {
+      detailArray += ';'
+    }
+  })
+  if (!passFlag) {
+    ElMessage.warning('请将字典值和名称都填全后再进行保存')
+  }
+  formData.dictValues = detailArray
+  return passFlag
+}
 // 新增数据
 function createData() {
   btnLoading.value = true
-  addDict(formData.value).then((res) => {
+  addDict(formData).then((res) => {
     ElMessageBox.confirm(
       '新增成功，是否继续新增?',
       '提示',
@@ -80,7 +125,7 @@
 
 // 更新数据
 function updateData() {
-  updateDict(formData.value).then((res) => {
+  updateDict(formData).then((res) => {
     ElMessage.success('修改成功')
     btnLoading.value = false
     closeRefresh()
@@ -90,22 +135,24 @@
 }
 // 添加一行
 function addDetail() {
-  formData.value.dictValues.push({
+  details.value.push({
     value: '',
     name: '',
-    num: formData.value.dictValues.length,
+    num: details.value.length,
   })
 }
 // 删除一行
 function deleteDetail(index: number) {
-  formData.value.dictValues.splice(index, 1)
+  details.value.splice(index, 1)
 }
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.dictId = ''
+  formData.dictCode = ''
+  formData.dictName = ''
+  formData.dictTips = ''
+  formData.dictValues = ''
+  details.value = []
 }
 
 // ----------初始化、关闭对话框相关-----------------
@@ -115,26 +162,17 @@
   btnLoading.value = false
   if (dialogstatus === 'create') {
     resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
-    const detailArr = row.detail.split(';')
-    const details = [] as DictDetail[]
-    for (const detail of detailArr) {
-      const detailItem = detail.split(':')
-      const item = {
-        value: detailItem[0],
-        name: detailItem[1],
-        num: parseInt(detailItem[2]),
-      }
-      details.push(item)
-    }
-    formData.value = {
-      dictId: row.id,
-      dictCode: row.code,
-      dictName: row.name,
-      dictTips: row.tips,
-      dictValues: details,
-    }
+    formData.dictId = row.id
+    formData.dictCode = row.code
+    formData.dictName = row.name
+    formData.dictTips = row.tips
+    formData.dictValues = row.detail
+    stringToArray()
   }
 }
 
@@ -147,6 +185,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
@@ -190,7 +229,7 @@
             </el-button>
           </div>
           <div class="body">
-            <el-row v-for="(detail, index) in formData.dictValues" :key="index" :gutter="10">
+            <el-row v-for="(detail, index) in details" :key="index" :gutter="10">
               <el-col :span="6">
                 <el-form-item :required="true" label="值" label-width="40">
                   <el-input v-model="detail.value" style="width: 100%;" placeholder="必填" />
diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue
index c7cf29c..6fd6ea3 100644
--- a/src/views/system/dict/listDict.vue
+++ b/src/views/system/dict/listDict.vue
@@ -71,8 +71,8 @@
   ).then(() => {
     delDict(row.id).then(() => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加资源
diff --git a/src/views/system/log/listErrorLog.vue b/src/views/system/log/listErrorLog.vue
index 7607022..709e08c 100644
--- a/src/views/system/log/listErrorLog.vue
+++ b/src/views/system/log/listErrorLog.vue
@@ -122,24 +122,26 @@
           </el-button>
         </template>
       </search-area>
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button type="text" size="small" @click="detail(scope.row)">
-                详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <table-container>
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        >
+          <template #columns>
+            <el-table-column label="操作" width="70" align="center">
+              <template #default="scope">
+                <el-button type="text" size="small" @click="detail(scope.row)">
+                  详情ㅤㅤ
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/log/listLog.vue b/src/views/system/log/listLog.vue
index eb10497..611488a 100644
--- a/src/views/system/log/listLog.vue
+++ b/src/views/system/log/listLog.vue
@@ -159,25 +159,27 @@
           </el-button>
         </template>
       </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="70" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="detail(scope.row)">
-                ㅤ详情ㅤㅤ
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
+      <table-container>
+        <!-- 查询结果Table显示 -->
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        >
+          <template #columns>
+            <el-table-column label="操作" width="70" align="center">
+              <template #default="scope">
+                <el-button link type="primary" size="small" @click="detail(scope.row)">
+                  ㅤ详情ㅤㅤ
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/log/loginLog.vue b/src/views/system/log/loginLog.vue
index 22c649d..db9ae07 100644
--- a/src/views/system/log/loginLog.vue
+++ b/src/views/system/log/loginLog.vue
@@ -146,15 +146,17 @@
           </el-button>
         </template>
       </search-area>
-      <!-- 查询结果Table显示 -->
-      <normal-table
-        :data="list"
-        :total="total"
-        :columns="columns"
-        :query="listQuery"
-        :list-loading="listLoading"
-        @change="changePage"
-      />
+      <table-container>
+        <!-- 查询结果Table显示 -->
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="listLoading"
+          @change="changePage"
+        />
+      </table-container>
     </app-container>
   </div>
 </template>
diff --git a/src/views/system/resource/editResource.vue b/src/views/system/resource/editResource.vue
index 1e72e08..59a8a6b 100644
--- a/src/views/system/resource/editResource.vue
+++ b/src/views/system/resource/editResource.vue
@@ -103,10 +103,16 @@
 
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.value = {
+    name: '',
+    id: '',
+    url: '',
+    code: '',
+    pid: '',
+    resourceType: '',
+    num: 0,
+    icon: '',
+  }
 }
 
 // 树列表配置
@@ -137,7 +143,10 @@
   dialogVisible.value = true
   btnLoading.value = false
   if (dialogstatus === 'create') {
-    // resetForm()
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.value = {
@@ -162,6 +171,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })
diff --git a/src/views/system/resource/listResource.vue b/src/views/system/resource/listResource.vue
index 3017259..5ca65ed 100644
--- a/src/views/system/resource/listResource.vue
+++ b/src/views/system/resource/listResource.vue
@@ -77,8 +77,8 @@
   ).then(() => {
     delResource(row.id).then((res) => {
       ElMessage.success('删除成功')
+      fetchData()
     })
-    fetchData()
   })
 }
 // 添加资源
diff --git a/src/views/system/role/editRole.vue b/src/views/system/role/editRole.vue
index 6f668f9..d83a56f 100644
--- a/src/views/system/role/editRole.vue
+++ b/src/views/system/role/editRole.vue
@@ -96,10 +96,16 @@
 
 // 重置表单
 function resetForm() {
-  nextTick(() => {
-    if (!dataFormRef.value) { return }
-    dataFormRef.value?.resetFields()
-  })
+  formData.value = {
+    id: '',
+    name: '',
+    tips: '',
+    dataScopeType: '',
+    pid: '',
+    deptId: '',
+    num: 0,
+    version: '',
+  }
 }
 
 // 树列表配置
@@ -138,7 +144,10 @@
   dialogVisible.value = true
   btnLoading.value = false
   if (dialogstatus === 'create') {
-    // resetForm()
+    resetForm()
+    nextTick(() => {
+      dataFormRef.value?.clearValidate()
+    })
   }
   else if (dialogstatus === 'update') {
     formData.value = {
@@ -163,6 +172,7 @@
 // 关闭弹窗
 function dialogClose() {
   dialogVisible.value = false
+  resetForm()
 }
 // ----------------------- 以下是暴露的方法内容 ----------------------------
 defineExpose({ initDialog })