林武泰/修改数量计量单位没显示，将资产信息后台表格使用部门显示

lab-admin/src/main/resources/mapper/asset/TbAssetMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTbAssetVo">
-        select id, bar_code, number, name, kind, category_number, amount, quantity, build_date, place_name, purpose, dept_id, registrant, specifications_model, remark, manufacturer, brand, supplier, status from tb_asset
+        select id, bar_code, number, name, kind, category_number, amount, quantity, quantity_unit, build_date, place_name, purpose, dept_id, registrant, specifications_model, remark, manufacturer, brand, supplier, status from tb_asset
     </sql>
 
     <select id="selectTbAssetList" parameterType="TbAsset" resultMap="TbAssetResult">

lab-ui/src/views/asset/asset/index.vue

@@ -225,7 +225,12 @@
           <dict-tag :options="dict.type.asset_prupose" :value="scope.row.purpose"/>
         </template>
       </el-table-column>
-      <el-table-column label="使用部门ID" align="center" prop="deptId" />
+      <!-- <el-table-column label="使用部门ID" align="center" prop="deptId" /> -->
+      <el-table-column label="使用部门" align="center">
+        <template slot-scope="scope">
+          <div>{{getDeptName(scope.row.deptId)}}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="登记人" align="center" prop="registrant" />
       <el-table-column label="规格型号" align="center" prop="specificationsModel" />
       <el-table-column label="备注" align="center" prop="remark" />
@@ -555,6 +560,36 @@ export default {
         this.loading = false;
       });
     },
+    /** 过滤获取部门名称 */
+    getDeptName(id) {
+      let name = ''
+      this.deptList.forEach(dept => {
+        if (dept.id === id) {
+          name = dept.label
+          return
+        }
+        if (dept.children != null) {
+          name = this.filterDept(dept.children, id)
+        }
+      })
+      return name
+    },
+    filterDept(deptChildren, id) {
+      let name = ''
+      let isFind = false
+      deptChildren.forEach(dept => {
+        if (dept.id === id) {
+          name = dept.label
+          isFind = true
+        }
+        if (dept.children != null) {
+          this.filterDept(dept.children, id)
+        }
+      })
+      if (isFind) {
+        return name
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;