修改

zhsq_qk-system/src/main/java/zhsq_qk/system/domain/QkEmergencyRescueTeam.java

@@ -4,6 +4,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import zhsq_qk.common.annotation.Excel;
 import zhsq_qk.common.core.domain.BaseEntity;
+import zhsq_qk.common.core.domain.entity.SysDept;
 
 /**
  * 抢险救援队对象 qk_emergency_rescue_team
@@ -108,6 +109,18 @@ public class QkEmergencyRescueTeam extends BaseEntity {
      */
     private Long deptId;
 
+
+    private SysDept deptOne;
+
+
+    public SysDept getDeptOne() {
+        return deptOne;
+    }
+
+    public void setDeptOne(SysDept deptOne) {
+        this.deptOne = deptOne;
+    }
+
     public void setId(Long id) {
         this.id = id;
     }

zhsq_qk-system/src/main/resources/mapper/system/QkEmergencyRescueTeamMapper.xml

@@ -21,6 +21,17 @@
             <result property="effect" column="effect"/>
             <result property="longitude" column="longitude"/>
             <result property="latitude" column="latitude"/>
+        <association property="deptOne" javaType="SysDept" resultMap="deptResult"/>
+    </resultMap>
+
+    <resultMap id="deptResult" type="SysDept">
+        <id property="deptId" column="dept_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="leader" column="leader"/>
+        <result property="status" column="dept_status"/>
     </resultMap>
 
     <sql id="selectQkEmergencyRescueTeamVo">

zhsq_qk-ui/src/views/system/supplies/index.vue

@@ -95,7 +95,8 @@
       <el-table-column label="价值" align="center" prop="cost"/>
       <el-table-column label="经度" align="center" prop="longitude"/>
       <el-table-column label="纬度" align="center" prop="latitude"/>
-      <el-table-column label="所属部门" align="center" prop="dept"/>
+      <el-table-column  key="deptName" :show-overflow-tooltip="true" align="center" label="归属部门"
+                        prop="deptOne.deptName"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -141,8 +142,8 @@
         <el-form-item label="纬度" prop="latitude">
           <el-input v-model="form.latitude" placeholder="请输入纬度"/>
         </el-form-item>
-        <el-form-item label="所属部门" prop="dept">
-          <el-input v-model="form.dept" placeholder="请输入街道"/>
+        <el-form-item label="归属部门" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"/>
         </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" type="textarea" :rows="4" placeholder="请输入内容"/>
@@ -159,9 +160,13 @@
 <script>
 
 import {addSupplies, delSupplies, updateSupplies,getSupplies, listSupplies} from "@/api/system/supplies";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {deptTreeSelect} from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
 
 export default {
   name: "Supplies",
+  components: {Treeselect},
   data() {
     return {
       // 遮罩层
@@ -174,6 +179,10 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      // 部门树选项
+      deptOptions: undefined,
+      // 部门名称
+      deptName: undefined,
       // 总条数
       total: 0,
       // 防汛抗旱物资储备表格数据
@@ -201,6 +210,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
     /** 查询防汛抗旱物资储备列表 */
@@ -212,6 +222,12 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;

zhsq_qk-ui/src/views/system/team/index.vue

@@ -78,7 +78,8 @@
       <el-table-column label="主键id" align="center" prop="id"/>
       <el-table-column label="姓名" align="center" prop="name"/>
       <el-table-column label="账号" align="center" prop="userName"/>
-      <el-table-column label="组织归属" align="center" prop="dept"/>
+      <el-table-column  key="deptName" :show-overflow-tooltip="true" align="center" label="归属部门"
+                       prop="deptOne.deptName"/>
       <el-table-column label="职务" align="center" prop="post"/>
       <el-table-column label="手机号" align="center" prop="phone"/>
       <el-table-column label="经度" align="center" prop="longitude"/>
@@ -158,9 +159,9 @@
 <script>
 
 import {addTeam, delTeam, updateTeam,getTeam, listTeam} from "@/api/system/team";
-import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {deptTreeSelect} from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
 
 export default {
   name: "Team",
@@ -196,6 +197,7 @@ export default {
         name: null,
         userName: null,
         dept: null,
+        deptId: undefined,
         post: null,
         company: null,
         emergencyRescue: null,
@@ -247,6 +249,7 @@ export default {
         name: null,
         userName: null,
         dept: null,
+        deptId: null,
         post: null,
         company: null,
         emergencyRescue: null,