diff --git a/ruoyi-ui/src/views/szxc/sbzl/index.vue b/ruoyi-ui/src/views/szxc/sbzl/index.vue
index 619cb62..0fb96fb 100644
--- a/ruoyi-ui/src/views/szxc/sbzl/index.vue
+++ b/ruoyi-ui/src/views/szxc/sbzl/index.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="上报单位" prop="deptId">
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
+                    placeholder="请选择上报单位"/>
+      </el-form-item>
       <el-form-item label="上报人" prop="subName">
         <el-input
           v-model="queryParams.subName"
@@ -25,30 +29,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="上报单位" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入上报单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          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>
@@ -101,21 +82,23 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="sbzlList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
       <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="subName" />
       <el-table-column label="上报日期" align="center" prop="subDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.subDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报分类" align="center" prop="subType" />
+      <el-table-column label="上报分类" align="center" prop="subType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_sb_type" :value="scope.row.subType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="上报标题" align="center" prop="title" />
       <el-table-column label="内容" align="center" prop="content" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
       <el-table-column label="上报单位" align="center" prop="deptName" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -135,7 +118,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -147,32 +130,42 @@
     <!-- 添加或修改上报资料对话框 -->
     <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="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
+                      placeholder="请选择上报单位" style="width:100%;" @select="selectedTree"/>
+        </el-form-item>
+        <el-form-item label="上报标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入上报标题" />
+        </el-form-item>
         <el-form-item label="上报人" prop="subName">
           <el-input v-model="form.subName" placeholder="请输入上报人" />
         </el-form-item>
+        <el-form-item label="上报分类" prop="subType">
+          <el-select
+            v-model="form.subType"
+            placeholder="上报分类"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_sb_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="上报日期" prop="subDate">
-          <el-date-picker clearable
+          <el-date-picker clearable style="width: 100%"
             v-model="form.subDate"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="请选择上报日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="上报标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入上报标题" />
-        </el-form-item>
         <el-form-item label="内容">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="上报单位" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入上报单位" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -184,9 +177,14 @@
 
 <script>
 import { listSbzl, getSbzl, delSbzl, addSbzl, updateSbzl } from "@/api/szxc/sbzl";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Sbzl",
+  components: { Treeselect },
+  dicts: ['szxc_sb_type'],
   data() {
     return {
       // 遮罩层
@@ -202,7 +200,9 @@ export default {
       // 总条数
       total: 0,
       // 上报资料表格数据
-      sbzlList: [],
+      list: [],
+      // 组织树选项
+      deptOptions: undefined,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -238,13 +238,24 @@ export default {
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    /** 查询组织下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    selectedTree(node){
+      this.form.deptId = node.id;
+      this.form.deptName = node.label;
+    },
     /** 查询上报资料列表 */
     getList() {
       this.loading = true;
       listSbzl(this.queryParams).then(response => {
-        this.sbzlList = response.rows;
+        this.list = response.rows;
         this.total = response.total;
         this.loading = false;
       });