Merge remote-tracking branch 'origin/project1' into project1

src/api/equipment/equipmentAbandonment.js

@@ -77,9 +77,9 @@ export function changeRoleStatus(businessId, flag) {
 }
 
 // 删除角色
-export function delRole(roleId) {
+export function delEquipment(equipmentId) {
     return request({
-      url: '/system/role/deleteLogical/' + roleId,
+      url: '/wbwarehouse/deleteLogical/' + equipmentId,
       method: 'delete'
   })
 }

src/views/equipment/equipmentAbandonment.vue

@@ -224,7 +224,7 @@ import {
   updateRole
 } from '@/api/system/role'
 import {listCheck} from '@/api/equipment/check'
-
+import {delEquipment} from  '../../api/equipment/equipmentAbandonment'
 import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
 import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
@@ -676,13 +676,15 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const roleIds = row.businessId || this.ids
+      console.log(row)
+      const EquipmentIds = row.businessId || this.ids
       this.$confirm('是否确认操作？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return delRole(roleIds)
+        console.log(row)
+        return delEquipment(EquipmentIds)
       }).then(() => {
         this.getList()
         this.$message({