From bd059ca9afcd5577664d17ca690149bde17602e2 Mon Sep 17 00:00:00 2001
From: yuyu <1981343953@qq.com>
Date: 星期三, 23 八月 2023 15:06:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/standardLibrary/index.vue | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index 274125d..11a71b7 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -523,9 +523,26 @@
this.isAllSelect = row.isChecked;
this.toggleSelect(row, row.isChecked, "tr");
});
+
if (row.isChecked === true) {
- this.deleteList.push(row.id);
+ if (row.children !== undefined) {
+ row.children.forEach((i) => {
+ this.deleteList.push(i.id);
+ });
+ } else {
+ this.deleteList.push(row.id);
+ }
} else if (row.isChecked === false) {
+ if (row.children !== undefined) {
+ row.children.forEach((i) => {
+ this.deleteList.findIndex((c, index) => {
+ if (c === i.id) {
+ this.deleteList.splice(index, 1);
+ return;
+ }
+ });
+ });
+ }
this.deleteList.findIndex((c, index) => {
if (c === row.id) {
this.deleteList.splice(index, 1);
@@ -533,7 +550,6 @@
}
});
}
- console.log(`output->this.deleteList`, this.deleteList);
},
//閫掑綊瀛愮骇
toggleSelect(data, flag, type) {
@@ -574,6 +590,7 @@
message: res.message,
type: "success",
});
+ this.selectProductModelTable();
});
},
},
@@ -611,13 +628,14 @@
.library-bom {
// padding-right: 10px;
width: 300px;
- // height: 100%;
- max-height: 100%;
+ height: 100%;
+ // max-height: 100%;
// margin-right: 12px;
// overflow-y: scroll;
.el-tree {
// margin-top:
width: 100%;
+ overflow: scroll;
::v-deep .el-tree-node__content {
height: 24px !important;
font-size: 18px;
@@ -687,17 +705,17 @@
flex-direction: column;
justify-content: space-between;
- .el-table {
- // flex: 1;
- // max-height: 680px;
- // overflow-y: scroll;
- }
- > div:nth-child(3) {
- // height: 20px;
- display: flex;
- justify-content: end;
- margin: 10px 0;
- }
+ // .el-table {
+ // flex: 1;
+ // max-height: 680px;
+ // overflow-y: scroll;
+ // }
+ >div:nth-child(3){
+ // height: 20px;
+ display: flex;
+ justify-content: end;
+ margin: 10px 0;
+ }
}
}
}
--
Gitblit v1.9.3