层位管理

src/views/archivesConfig/dict/index.vue

@@ -38,7 +38,6 @@
     <!-- 字典列表 -->
     <el-row class="container-main" :gutter="20">
       <el-col class=" curd-in-out" :xs="10" :sm="8" :md="5" :lg="6" :xl="4">
-
         <crudOperation :permission="permission">
           <template v-slot:right>
             <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0" @click="toDelete(crud.selections)">删除</el-button>
@@ -56,7 +55,6 @@
       <!-- 字典详情列表 -->
       <!-- <el-col class="container-right" :xs="14" :sm="16" :md="19" :lg="18" :xl="20"> -->
       <el-col :xs="14" :sm="16" :md="19" :lg="18" :xl="20">
-
         <dictDetail ref="dictDetail" :permission="permission" :active-add-btn="activeAddBtn" @treeRefresh="updateKeyChildren" />
       </el-col>
     </el-row>

src/views/components/DeviceTree.vue

@@ -0,0 +1,72 @@
+<template>
+  <div class="tree-scroll">
+    <el-tree ref="deviceTree" :data="deviceTree" :props="defaultProps" node-key="id" :default-expanded-keys="defaultExpandedKeys" :default-checked-keys="defaultCheckedKeys" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" />
+  </div>
+</template>
+
+<script>
+import { menu } from '@/api/storeManage/levelManage/level'
+
+export default {
+  name: 'DeviceTree',
+  data() {
+    return {
+      deviceTree: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      defaultExpandedKeys: [],
+      defaultCheckedKeys: []
+    }
+  },
+  created() {
+    this.getDeviceTree()
+  },
+  methods: {
+    getDeviceTree() {
+      let defaultCheckedData = {}
+      menu().then((data) => {
+        let storeroom = {}
+        let devices = []
+        for (let i = 0; i < data.length; i++) {
+          if (!storeroom.id) {
+            storeroom = data[i].storeroomId
+            data[i].name = data[i].deviceName
+            data[i].isCurrent = true
+            devices.push(data[i])
+            // 设置第一个区域第一个节点的默认选中
+            defaultCheckedData = data[i]
+            // 第一个区域默认展开
+            this.defaultExpandedKeys.push(data[i].storeroomId.id)
+          } else if (storeroom.id !== data[i].storeroomId.id) {
+            storeroom.children = devices
+            this.deviceTree.push(storeroom)
+            devices = []
+            data[i].name = data[i].deviceName
+            devices.push(data[i])
+            storeroom = data[i].storeroomId
+          } else {
+            data[i].name = data[i].deviceName
+            devices.push(data[i])
+          }
+          if (i === data.length - 1) {
+            storeroom.children = devices
+            this.deviceTree.push(storeroom)
+          }
+        }
+        this.$nextTick(() => {
+          // 设置第一个区域第一个节点的默认选中
+          this.handleNodeClick(defaultCheckedData)
+          this.$refs.deviceTree.setCurrentKey(defaultCheckedData.id)
+        })
+      })
+    },
+    handleNodeClick(selectedData) {
+      this.$emit('nodeClick', selectedData)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>

src/views/storeManage/deviceManage/module/deviceDetail.vue

@@ -384,7 +384,6 @@ export default {
     async [CRUD.HOOK.beforeToEdit](crud, form) {
       if (form.deviceTypeId.name === '密集架' || form.deviceTypeId.name === '回转柜') {
         if (form.deviceTypeId.name === '密集架') {
-          console.log(1)
           // 获取密集架行号列号等信息
           await crudDevice.getDesecabinetById({ deviceInfoId: this.crud.selections[0].id }).then((data) => {
             form.rowNo = data.rowNo

src/views/storeManage/levelManage/index.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="app-container">
+    <binding-tag-dlg ref="bindingTag" :binding-id="crud.selections[0] && crud.selections[0].id" :binding-type="3" binding-txt="层架位" @refresh="crud.refresh" />
     <div class="head-container">
       <p class="warning">
         <svg-icon icon-class="warning" />
         <span>温馨提示：如需配置层位，请直接前往库房管理进行设备维护</span>
       </p>
       <div>
-        <el-button type="primary" class="iconfont icon-jiechubangding-fanbai" size="mini" @click="handleBindParam">绑定参数</el-button>
+        <el-button type="primary" class="iconfont icon-jiechubangding-fanbai" size="mini" :disabled="crud.selections.length !== 1" @click="bindingTag(crud.selections)">绑定标签</el-button>
       </div>
     </div>
     <el-row class="container-main">
@@ -15,9 +16,7 @@
           <span class="right-top-line" />
           <span class="left-bottom-line" />
           <!--树状结构-->
-          <div class="tree-scroll">
-            <el-tree ref="smartTree" :data="menuTree" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" />
-          </div>
+          <device-tree @nodeClick="handleNodeClick" />
         </div>
       </el-col>
       <!-- 档案管理列表 -->
@@ -25,86 +24,98 @@
         <span class="right-top-line" />
         <span class="left-bottom-line" />
         <!--表格渲染-->
-        <el-table ref="table" :data="tableData" highlight-current-row style="width: 100%;">
-          <el-table-column type="selection" width="55" />
-          <el-table-column type="index" label="序号" width="55" />
-          <el-table-column prop="" label="库房" />
-          <el-table-column prop="" label="层位名称" />
-          <el-table-column prop="" label="层位编号" />
-          <el-table-column prop="" label="库房代码" />
-          <el-table-column prop="" label="区号" />
-          <el-table-column prop="" label="列号" />
-          <el-table-column prop="" label="节号" />
-          <el-table-column prop="" label="层号" />
-          <el-table-column prop="" label="方向" />
-          <el-table-column prop="" label="标签" />
-          <el-table-column prop="" label="操作时间" />
+        <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="selectionChangeHandler" @row-click="clickRowHandler">
+          <el-table-column align="center" type="selection" width="55" />
+          <el-table-column align="center" type="index" label="序号" width="55" />
+          <!-- <el-table-column align="center" label="库房">
+            <template>
+              {{ storeroomName }}
+            </template>
+          </el-table-column> -->
+          <el-table-column align="center" prop="position_name" label="层位名称" />
+          <el-table-column align="center" prop="position" label="层位编号" />
+          <el-table-column align="center" prop="storeroomCode" label="库房代码" />
+          <el-table-column v-if="deviceInfo.deviceTypeId && deviceInfo.deviceTypeId.name === '密集架'" align="center" prop="areaNo" label="区号" width="80" />
+          <el-table-column v-if="deviceInfo.deviceTypeId && deviceInfo.deviceTypeId.name === '回转柜'" align="center" prop="cupboardNo" label="柜号" width="80" />
+          <el-table-column v-if="deviceInfo.deviceTypeId && deviceInfo.deviceTypeId.name === '密集架'" align="center" prop="columnRowNo" label="列号" width="80" />
+          <el-table-column v-if="deviceInfo.deviceTypeId && deviceInfo.deviceTypeId.name === '密集架'" align="center" prop="partNo" label="节号" width="80" />
+          <el-table-column align="center" prop="rowNo" label="层号" width="80" />
+          <el-table-column v-if="deviceInfo.deviceTypeId && deviceInfo.deviceTypeId.name === '回转柜'" align="center" prop="columnRowNo" label="列号" width="80" />
+          <el-table-column v-if="deviceInfo.deviceTypeId && deviceInfo.deviceTypeId.name === '密集架'" align="center" prop="direction" label="方向" width="80" />
+          <el-table-column align="center" prop="" label="标签" />
+          <el-table-column align="center" prop="update_time" label="操作时间" width="150">
+            <template slot-scope="scope">
+              <div>{{ scope.row.update_time | parseTime }}</div>
+            </template>
+          </el-table-column>
         </el-table>
+        <!--分页组件-->
+        <pagination />
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import { menu } from '@/api/storeManage/levelManage/level'
+import DeviceTree from '@/views/components/DeviceTree'
+import BindingTagDlg from '@/views/components/BindingTagDlg'
 import CRUD, { presenter } from '@crud/crud'
+import pagination from '@crud/Pagination'
 export default {
   name: 'LevelManage',
-  components: {},
+  components: { DeviceTree, pagination, BindingTagDlg },
   mixins: [presenter()],
   cruds() {
     return [
       CRUD({
-        title: '档案', url: 'api/archives-type/menu'
-        // crudMethod: { ...crudCategory }
+        url: 'api/tag/list',
+        queryOnPresenterCreated: false
       })
     ]
   },
   data() {
     return {
-      menuTree: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      tableData: []
+      deviceInfo: {},
+      storeroomName: ''
     }
   },
   created() {
-    this.getDeviceTree()
   },
   methods: {
-    getDeviceTree() {
-      console.log(1)
-      menu().then((data) => {
-        let storeroom = {}
-        let devices = []
-        for (let i = 0; i < data.length; i++) {
-          if (!storeroom.id) {
-            console.log(2)
-            storeroom = data[i].storeroomId
-            devices.push(data[i])
-          } else if (storeroom.id !== data[i].storeroomId.id) {
-            storeroom.children = devices
-            this.menuTree.push(storeroom)
-            devices = []
-            storeroom = data[i].storeroomId
-          } else {
-            devices.push(data[i])
-          }
-          if (i === data.length - 1) {
-            storeroom.children = devices
-            this.menuTree.push(storeroom)
-          }
-        }
-      })
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query.deviceInfoId = this.deviceInfo.id
     },
-    handleNodeClick() {
-
+    handleNodeClick(data) {
+      this.deviceInfo = data
+      this.crud.toQuery()
+      this.storeroomName = data.storeroomId.name
     },
     // 参数绑定
     handleBindParam() {
-
+    },
+    clickRowHandler(row) {
+      this.$refs.table.clearSelection()
+      this.$refs.table.toggleRowSelection(row)
+    },
+    selectionChangeHandler(val) {
+      if (val.length > 1) {
+        // 取出最后val的最后一个返回出来
+        const finalVal = val.pop()
+        // 清除所有选中
+        this.$refs.table.clearSelection()
+        // 给最后一个加上选中
+        this.$refs.table.toggleRowSelection(finalVal)
+        this.crud.selectionChangeHandler([finalVal])
+      } else {
+        this.crud.selectionChangeHandler(val)
+      }
+    },
+    bindingTag(data) {
+      if (data[0].tid) {
+        this.$refs.bindingTag.isBinding = true
+        this.$refs.bindingTag.tidCode = data[0].tid
+      }
+      this.$refs.bindingTag.bindingVisible = true
     }
   }
 }
@@ -120,6 +131,9 @@ export default {
     height: 30px;
     background-color: #1aae93;
     border: none;
+    &:disabled {
+      background-color: #0d5649;
+    }
     &::before {
       padding-right: 5px;
     }
@@ -138,4 +152,7 @@ export default {
     margin-left: 5px;
   }
 }
+::v-deep thead .el-table-column--selection .cell {
+  display: none;
+}
 </style>