diff --git a/package.json b/package.json
index a0a97aa6..7f0ff02f 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
"url": "http://192.168.0.56:3000/bonus/Bonus-Cloud.git"
},
"dependencies": {
- "@riophae/vue-treeselect": "0.4.0",
+ "@riophae/vue-treeselect": "^0.4.0",
"axios": "0.24.0",
"china-area-data": "^5.0.1",
"clipboard": "2.0.8",
diff --git a/src/api/EquipmentLedger/index.js b/src/api/EquipmentLedger/index.js
index a2aa3155..dd5ea96a 100644
--- a/src/api/EquipmentLedger/index.js
+++ b/src/api/EquipmentLedger/index.js
@@ -49,4 +49,5 @@ export const delDevice = (ids) => {
url: '/material-mall/device/delDevice/'+ids,
method: 'post',
})
+
}
diff --git a/src/views/EquipmentTypeConfig/index.vue b/src/views/EquipmentTypeConfig/index.vue
index 1d0c5f75..209e91c7 100644
--- a/src/views/EquipmentTypeConfig/index.vue
+++ b/src/views/EquipmentTypeConfig/index.vue
@@ -1,136 +1,1028 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
+
+
+
+
-
-
- 新增
-
-
-
- 修改
-
-
-
- 删除
-
-
-
- 导出
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 修改
+
+ 删除
+
+
+ 更多
+
+ 数据权限
+
+ 分配用户
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.createTime) }}
-
-
-
-
- 修改
-
- 删除
-
-
- 更多
-
- 数据权限
-
- 分配用户
-
-
-
-
-
-
-
@@ -476,15 +492,12 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
- // 过滤掉不可选的行（虽然界面上不可选，但为了安全起见还是过滤一次）
+ // 过滤掉不可选的行
const validSelection = selection.filter(row => this.checkSelectable(row));
-
- // 更新选中的roleId数组
this.ids = validSelection.map(item => item.roleId);
- // 更新单选和多选状态
this.single = validSelection.length !== 1;
this.multiple = !validSelection.length;
- },
+ },
// 更多操作触发
handleCommand(command, row) {
switch (command) {
@@ -637,7 +650,6 @@ export default {
return !(row.roleId === 1 || row.isBuiltIn === '0');
},
-
getRowClassName(row) {
return !this.checkSelectable(row) ? 'disabled-row' : '';
},
@@ -645,8 +657,79 @@ export default {
}
+