diff --git a/dangan-ui/src/views/dangan/areaSort/index.vue b/dangan-ui/src/views/dangan/areaSort/index.vue
index 91ed887..823e8a9 100644
--- a/dangan-ui/src/views/dangan/areaSort/index.vue
+++ b/dangan-ui/src/views/dangan/areaSort/index.vue
@@ -9,14 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="父区域ID" prop="pid">
-        <el-input
-          v-model="queryParams.pid"
-          placeholder="请输入父区域ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -69,12 +61,15 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="areaSortList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="目录名称" align="center" prop="muName" />
-      <el-table-column label="区域分类(字典)" align="center" prop="areaType" />
-      <el-table-column label="父区域ID" align="center" prop="pid" />
+      <el-table-column label="区域分类" align="center" prop="areaType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.area_type" :value="scope.row.areaType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -94,7 +89,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -103,15 +98,12 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改档案行政分类对话框 -->
+    <!-- 添加或修改乡镇对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="目录名称" prop="muName">
           <el-input v-model="form.muName" placeholder="请输入目录名称" />
         </el-form-item>
-        <el-form-item label="父区域ID" prop="pid">
-          <el-input v-model="form.pid" placeholder="请输入父区域ID" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -126,6 +118,7 @@ import { listAreaSort, getAreaSort, delAreaSort, addAreaSort, updateAreaSort } f
 
 export default {
   name: "AreaSort",
+  dicts: ['area_type'],
   data() {
     return {
       // 遮罩层
@@ -140,8 +133,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 档案行政分类表格数据
-      areaSortList: [],
+      // 乡镇表格数据
+      list: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -151,8 +144,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         muName: null,
-        areaType: null,
-        pid: null,
+        areaType: 0,
       },
       // 表单参数
       form: {},
@@ -161,12 +153,6 @@ export default {
         muName: [
           { required: true, message: "目录名称不能为空", trigger: "blur" }
         ],
-        areaType: [
-          { required: true, message: "区域分类(字典)不能为空", trigger: "change" }
-        ],
-        pid: [
-          { required: true, message: "父区域ID不能为空", trigger: "blur" }
-        ],
       }
     };
   },
@@ -174,11 +160,11 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询档案行政分类列表 */
+    /** 查询乡镇列表 */
     getList() {
       this.loading = true;
       listAreaSort(this.queryParams).then(response => {
-        this.areaSortList = response.rows;
+        this.list = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -222,7 +208,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加档案行政分类";
+      this.title = "添加乡镇";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -231,7 +217,7 @@ export default {
       getAreaSort(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改档案行政分类";
+        this.title = "修改乡镇";
       });
     },
     /** 提交按钮 */
@@ -245,6 +231,8 @@ export default {
               this.getList();
             });
           } else {
+            this.form.areaType=0;
+            this.form.pid=0;
             addAreaSort(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -257,7 +245,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除档案行政分类编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除乡镇编号为"' + ids + '"的数据项？').then(function() {
         return delAreaSort(ids);
       }).then(() => {
         this.getList();
diff --git a/dangan-ui/src/views/dangan/areaSort1/index.vue b/dangan-ui/src/views/dangan/areaSort1/index.vue
new file mode 100644
index 0000000..c48e7f4
--- /dev/null
+++ b/dangan-ui/src/views/dangan/areaSort1/index.vue
@@ -0,0 +1,303 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="目录名称" prop="muName">
+        <el-input
+          v-model="queryParams.muName"
+          placeholder="请输入目录名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="父区域" prop="pid">
+        <el-select v-model="queryParams.pid" placeholder="请选择">
+          <el-option
+            v-for="item in parentOption"
+            :key="item.id"
+            :label="item.muName"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['dangan:areaSort:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['dangan:areaSort:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['dangan:areaSort:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['dangan:areaSort:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="目录名称" align="center" prop="muName" />
+      <el-table-column label="区域分类" align="center" prop="areaType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.area_type" :value="scope.row.areaType"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="父区域ID" align="center" prop="pid" />-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['dangan:areaSort:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['dangan:areaSort:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改村/社区对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="目录名称" prop="muName">
+          <el-input v-model="form.muName" placeholder="请输入目录名称" />
+        </el-form-item>
+        <el-form-item label="父区域" prop="pid">
+          <el-select v-model="form.pid" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in parentOption"
+              :key="item.id"
+              :label="item.muName"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAreaSort, getAreaSort, delAreaSort, addAreaSort, updateAreaSort } from "@/api/dangan/areaSort";
+
+export default {
+  name: "AreaSort1",
+  dicts: ['area_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      //父区域
+      parentOption: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 村/社区表格数据
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        muName: null,
+        areaType: 2,
+        pid: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        muName: [
+          { required: true, message: "目录名称不能为空", trigger: "blur" }
+        ],
+        areaType: [
+          { required: true, message: "区域分类(字典)不能为空", trigger: "change" }
+        ],
+        pid: [
+          { required: true, message: "父区域ID不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getParentOption();
+  },
+  methods: {
+    /** 查询村/社区列表 */
+    getList() {
+      this.loading = true;
+      listAreaSort(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 查询乡镇列表 */
+    getParentOption() {
+      listAreaSort({
+        pageNum: 1,
+        pageSize: 1000000000,
+        areaType: 0
+      }).then(response => {
+        this.parentOption = response.rows;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        muName: null,
+        areaType: null,
+        pid: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加村/社区";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAreaSort(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改村/社区";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAreaSort(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.areaType = 2;
+            addAreaSort(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除村/社区编号为"' + ids + '"的数据项？').then(function() {
+        return delAreaSort(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dangan/areaSort/export', {
+        ...this.queryParams
+      }, `areaSort_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/dangan-ui/src/views/dangan/catalog/index.vue b/dangan-ui/src/views/dangan/catalog/index.vue
index 476fb81..1d5fac1 100644
--- a/dangan-ui/src/views/dangan/catalog/index.vue
+++ b/dangan-ui/src/views/dangan/catalog/index.vue
@@ -60,8 +60,12 @@
               row-key="id"
               :default-expand-all="isExpandAll"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column label="ID" align="center" prop="id" width="120"/>
-      <el-table-column label="目录名称" align="center" prop="muName" />
+      <el-table-column label="目录名称" align="left" header-align="center" prop="muName" />
+      <el-table-column label="业务类型" align="center" prop="ywType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="显示顺序" align="center" prop="orderNum" />
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">
@@ -110,7 +114,6 @@
     <!-- 添加或修改档案目录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-
         <el-form-item label="上级目录" prop="pid">
           <treeselect
             v-model="form.pid"
@@ -118,8 +121,19 @@
             :normalizer="normalizer"
             :show-count="true"
             placeholder="选择上级目录"
+            @select="selectPid"
           />
         </el-form-item>
+        <el-form-item label="业务类型" prop="ywType" v-if="!form.id && form.pid===0">
+          <el-select v-model="form.ywType" placeholder="请选择业务类型" style="width: 100%;">
+            <el-option
+              v-for="dict in dict.type.yw_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="目录名称" prop="muName">
           <el-input v-model="form.muName" placeholder="请输入目录名称" />
         </el-form-item>
@@ -155,7 +169,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Catalog",
   components: { Treeselect },
-  dicts: ['sys_show_hide', 'sys_normal_disable'],
+  dicts: ['yw_type', 'sys_normal_disable'],
   data() {
     return {
       // 遮罩层
@@ -187,6 +201,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        pid: [
+          { required: true, message: "上级目录不能为空", trigger: "blur" }
+        ],
+        ywType: [
+          { required: true, message: "业务类型不能为空", trigger: "blur" }
+        ],
         muName: [
           { required: true, message: "目录名称不能为空", trigger: "blur" }
         ],
@@ -323,7 +343,10 @@ export default {
     },
     // 档案采集
     handleDACJ(row){
-      this.$router.push("/dangan/collection?id=" + row.id);
+      this.$router.push("/collection?id=" + row.id);
+    },
+    selectPid(){
+      this.form.ywType = undefined;
     }
   }
 };