From 4fae15f72f9367f8b9c544ce539d58f5a59aaf2f Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 06 九月 2023 13:22:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
src/views/standardLibrary/index.vue | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index 9dea403..e694db0 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -2,10 +2,10 @@
<div class="standard-library-main">
<div class="content-main">
<div class="library-bom" style="width: 300px">
- <el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
+ <el-input clearable v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
<el-button type="text">鍏ㄩ儴</el-button>
<el-tree ref="tree" style="width: 100%" class="filter-tree" :data="standardTree" :props="defaultProps"
- node-key="id" highlight-current default-expand-all :filter-node-method="filterNode"
+ node-key="id" :highlight-current="true" :default-expand-all="true" :filter-node-method="filterNode"
:render-content="renderContent" @node-click="nodeClick" />
</div>
<div class="library-table" style="width: 80%">
@@ -108,6 +108,7 @@
export default {
data() {
return {
+ filterNodeData: [],
options: [],
versionValue: "",
deleteList: [],
@@ -131,12 +132,18 @@
formTypeOptions: [],
addTreeForm: {
addTypeArr: [],
+ specificationsName: ""
}
};
},
watch: {
filterText(val) {
this.$refs.tree.filter(val);
+ },
+ addTreeFormVisible(newVal){
+ if(newVal === false){
+ this.clear();
+ }
}
},
created() {
@@ -224,7 +231,7 @@
})
.catch(() => {});
},
- filterNode(value, data) {
+ filterNode(value, data,node) {
if (!value) return true;
return data.name.indexOf(value) !== -1;
},
@@ -277,6 +284,7 @@
//TODO handle the exception
}
});
+
},
getDefault(arr, index) {
for (const item of arr) {
@@ -343,26 +351,10 @@
}) {
// 鍒ゆ柇鏄惁鏄埗鑺傜偣鎴栨枃浠跺す
const isFolder = "children" in data;
- return ( <
- span class = "tree-node" > {
- isFolder ? ( <
- i class = {
- node.expanded ?
- "el-icon-folder-opened blue-folder" : "el-icon-folder blue-folder"
- } >
- <
- /i>
- ) : ( <
- i class = "el-icon-document blue-folder" > < /i>
- )
- } <
- div class = "tree-lable" > [{
- node.level
- }] {
- data.name
- } <
- /div> < /
- span >
+ return ( <span class="tree-node"> {
+ isFolder ? ( <i class = {node.expanded ?"el-icon-folder-opened blue-folder" : "el-icon-folder blue-folder"} ></i>
+ ) : ( <i class = "el-icon-document blue-folder" > </i>)
+ } <div class = "tree-lable" > [{node.level}] {data.name} </div> </span>
);
},
async subAddTreeForm() {
--
Gitblit v1.9.3