diff --git a/src/api/storeManage/deviceManage/device.js b/src/api/storeManage/deviceManage/device.js
index 3d0de99..689cb12 100644
--- a/src/api/storeManage/deviceManage/device.js
+++ b/src/api/storeManage/deviceManage/device.js
@@ -47,6 +47,21 @@ export function getDeviceById(params) {
     params
   })
 }
+export function getDesecabinetById(params) {
+  return request({
+    url: 'api/desecabinet/query',
+    method: 'get',
+    params
+  })
+}
+
+export function getRotarycabinetById(params) {
+  return request({
+    url: 'api/rotarycabinet/query',
+    method: 'get',
+    params
+  })
+}
 
 function getUrl(data, optTYpe) {
   let url = 'api/desecabinet/'
@@ -69,4 +84,4 @@ function getUrl(data, optTYpe) {
   return url
 }
 
-export default { add, edit, del, getSupplier, getDeviceType }
+export default { add, edit, del, getSupplier, getDeviceType, getDeviceById, getDesecabinetById, getRotarycabinetById }
diff --git a/src/views/storeManage/deviceManage/module/bindParams.vue b/src/views/storeManage/deviceManage/module/bindParams.vue
index fda0d71..fa74e0b 100644
--- a/src/views/storeManage/deviceManage/module/bindParams.vue
+++ b/src/views/storeManage/deviceManage/module/bindParams.vue
@@ -1,7 +1,7 @@
 <template>
   <!--表单组件-->
   <!-- :before-close="crud.cancelCU" -->
-  <el-dialog class="binding-params-dialog" :close-on-click-modal="false" :visible.sync="bingParamsVisible" title="绑定参数" @closed="handleClose">
+  <el-dialog class="binding-params-dialog" :close-on-click-modal="false" :visible.sync="bindParamsVisible" title="绑定参数" @closed="handleClose">
     <span class="dialog-right-top" />
     <span class="dialog-left-bottom" />
     <div class="setting-dialog">
@@ -38,7 +38,7 @@
 import crudMethod from '@/api/storeManage/deviceManage/param'
 
 export default {
-  name: 'BingParams',
+  name: 'BindParams',
   data() {
     return {
       rules: {
@@ -56,7 +56,7 @@ export default {
       form: {},
       deviceInfoId: null,
       loading: false,
-      bingParamsVisible: false
+      bindParamsVisible: false
     }
   },
   methods: {
@@ -86,6 +86,7 @@ export default {
     handleClose() {
       this.resetForm()
       this.$refs.form.clearValidate()
+      this.$emit('refresh')
     },
     resetForm() {
       this.form.paramId = ''
@@ -98,13 +99,13 @@ export default {
 
 <style lang="scss" scoped>
 .binding-params-dialog {
-  ::v-deep .el-dialog{
+  ::v-deep .el-dialog {
     width: 950px !important;
   }
-  ::v-deep .el-dialog__body{
+  ::v-deep .el-dialog__body {
     padding: 0;
   }
-  ::v-deep form{
+  ::v-deep form {
     display: flex;
     justify-content: space-around;
   }
@@ -112,9 +113,9 @@ export default {
     margin-bottom: 0;
   }
 }
-.delete-btn{
-  background-color: #F65163;
-  border-color: #F65163;
+.delete-btn {
+  background-color: #f65163;
+  border-color: #f65163;
 }
 .head-container .filter-item {
   width: 76px;
diff --git a/src/views/storeManage/deviceManage/module/deviceDetail.vue b/src/views/storeManage/deviceManage/module/deviceDetail.vue
index 88ba261..4fb7789 100644
--- a/src/views/storeManage/deviceManage/module/deviceDetail.vue
+++ b/src/views/storeManage/deviceManage/module/deviceDetail.vue
@@ -152,7 +152,7 @@
         </div>
       </div>
     </el-dialog>
-    <bindParams ref="bindingParamsDlg" />
+    <bindParams ref="bindingParamsDlg" @refresh="crud.refresh" />
     <div class="container-right" style="min-height: calc(100vh - 242px);">
       <span class="right-top-line" />
       <span class="left-bottom-line" />
@@ -256,7 +256,6 @@ export default {
         del: ['admin', 'device:del']
       },
       deleteVisible: false,
-      deleteData: {},
       selectDeviceTypeVisible: false,
       bindingMacVisible: false,
       currentMac: '',
@@ -268,10 +267,11 @@ export default {
   computed: {
     addTypeStr() {
       const addType = this.deviceTypeOptions.find(deviceType => deviceType.name === this.selectedDeviceType)
+      const preTitle = this.crud.add > CRUD.STATUS.NORMAL ? '新增' : '编辑'
       if (addType) {
-        return '新增' + addType.name
+        return preTitle + addType.name
       } else {
-        return '新增'
+        return preTitle
       }
     },
     isInsidedevices() {
@@ -379,32 +379,42 @@ export default {
     })
   },
   methods: {
-    // [CRUD.HOOK.afterSubmit]() {
-    //   this.needRefreshTree = true
-    // },
     // 设备是密集架或回转柜时，需要先处理 联动操作，回调操作 数据是null的情况
     // async
-    [CRUD.HOOK.beforeToEdit](crud, form) {
-      // if (form.deviceTypeId.name === '密集架' || form.deviceTypeId.name === '回转柜') {
-      // if (form.isLinkage === null) {
-      //   form.isLinkage = { stateType: 1, lend: false, borrow: false, inBound: false, outBound: false }
-      // }
-      // if (form.isCallback === null) {
-      //   form.isCallback = { stateType: 2, lend: false, borrow: false, inBound: false, outBound: false }
-      // }
-      // }
-      // await
-      crudDevice.getDeviceById().then((data) => {
-        crud.resetForm(JSON.parse(JSON.stringify(data)))
-        crud.status.edit = CRUD.STATUS.PREPARED
-        crud.getDataStatus(crud.getDataId(data)).edit = CRUD.STATUS.PREPARED
-      })
+    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
+            form.areaNo = data.areaNo
+            form.sumColumnNo = data.sumColumnNo
+            form.firstColumnNo = data.firstColumnNo
+            form.partNo = data.partNo
+            form.storeroomCode = data.storeroomCode
+          })
+        } else if (form.deviceTypeId.name === '回转柜') {
+          // 获取回转柜行号列号等信息
+          await crudDevice.getRotarycabinetById({ deviceInfoId: this.crud.selections[0].id }).then((data) => {
+            form.columnRowNo = data.columnRowNo
+            form.cupboardNo = data.cupboardNo
+            form.rowNo = data.rowNo
+            form.storeroomCode = data.storeroomCode
+          })
+        }
+        // 获取联动和回调结果
+        await crudDevice.getDeviceById({ deviceInfoId: this.crud.selections[0].id }).then((data) => {
+          if (data.length === 3) {
+            form.isLinkage = data.find(element => element.stateType === 1)
+            form.isCallback = data.find(element => element.stateType === 2)
+          }
+        })
+      }
+      crud.status.edit = CRUD.STATUS.PREPARED
+      crud.getDataStatus(this.crud.selections[0].id).edit = CRUD.STATUS.PREPARED
       form.supplier = form.supplierId.id
       this.selectedDeviceType = form.deviceTypeId.name
-      // crud.status.edit = CRUD.STATUS.PREPARED
-      // crud.getDataStatus(crud.getDataId(data)).edit = CRUD.STATUS.PREPARED
-      // callVmHook(crud, CRUD.HOOK.afterToEdit, crud.form)
-      // callVmHook(crud, CRUD.HOOK.afterToCU, crud.form)
       return false
     },
     [CRUD.HOOK.beforeSubmit]() {
@@ -421,12 +431,13 @@ export default {
         this.crud.query.deviceTypeId = this.deviceType
       }
     },
-    // [CRUD.HOOK.afterRefresh](crud) {
-    //   if (this.needRefreshTree) {
-    //     this.needRefreshTree = false
-    //     this.$emit('treeRefresh', crud.data)
-    //   }
-    // },
+    // 防止编辑时，isLinkage是null,isLinkage.lend报错
+    [CRUD.HOOK.afterRefresh](crud) {
+      crud.data.forEach(element => {
+        element.isLinkage = { stateType: 1, lend: null, borrow: null, inBound: null, outBound: null }
+        element.isCallback = { stateType: 2, lend: null, borrow: null, inBound: null, outBound: null }
+      })
+    },
     clickRowHandler(row) {
       this.$refs.table.toggleRowSelection(row)
     },
@@ -434,17 +445,14 @@ export default {
       this.crud.selections = val
     },
     toDelete(data) {
-      this.deleteData = data
       this.deleteVisible = true
     },
     handleConfirm() {
       this.deleteVisible = false
       this.crud.delAllLoading = true
-      const data = this.deleteData.map(item => { return item.id })
-      this.crud.doDelete(data)
+      this.crud.doDelete(this.crud.selections)
     },
     handleClose(done) {
-      this.deleteData = {}
       done()
     },
     selectDeviceType() {
@@ -479,7 +487,7 @@ export default {
       this.$refs.bindingParamsDlg.deviceInfoId = id
       paramApi.getParams({ deviceInfoId: id }).then((data) => {
         this.$refs.bindingParamsDlg.params = data
-        this.$refs.bindingParamsDlg.bingParamsVisible = true
+        this.$refs.bindingParamsDlg.bindParamsVisible = true
       })
     }
   }