From 8310a8fb31e4a82cbbb8bb512e9815709f23d441 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 11 七月 2023 19:08:02 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 23167e8..c659dfa 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -3,8 +3,8 @@
<el-container>
<!-- 宸︿晶鑿滃崟-->
<el-aside >
- <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;"@click.native="handleClickOutside" >
- <div @click.native="handleClickOutside">
+ <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;">
+ <div>
<div>
<div style="display: flex;justify-content: space-around">
<el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞</el-button>
@@ -33,7 +33,7 @@
<el-form-item label="缂栫爜瑙勫垯锛�" label-width="150px">
<el-input v-model="TreeAddform.codeRuleOidName" autocomplete="off" style="width: 585px" @focus="CodeFoucus"></el-input>
</el-form-item>
- <el-form-item label="涓氬姟绫诲瀷锛�" label-width="150px" v-if="TreeFlag==false">
+ <el-form-item label="涓氬姟绫诲瀷锛�" label-width="150px" v-if="TreeFlagCode==false">
<el-input v-model="TreeAddform.btmTypeName" autocomplete="off" style="width: 585px" @focus="btmFoucus"></el-input>
</el-form-item>
<el-form-item label="鍏抽敭灞炴�ф煡璇㈣鍒欙細" label-width="150px">
@@ -52,7 +52,7 @@
</el-dialog>
<!-- 淇敼瀵硅瘽妗�-->
<el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
- <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="TreeFlag" ::nodeClickList="nodeClickList"></classifyTreeform>
+ <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="TreeFlagCode" ::nodeClickList="nodeClickList"></classifyTreeform>
</el-dialog>
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false"
:option="Treeoption"
@@ -330,7 +330,7 @@
data() {
return {
//鏍戣妭鐐规樉绀洪殣钘�
- TreeFlag:false,
+ TreeFlagCode:false,
//缂栫爜瑙勫垯
MasterdialogVisible:false,
masterData:[],
@@ -633,6 +633,10 @@
if (e.target.nodeName !== 'SPAN') {
this.$refs.tree.setCurrentKey(null)
this.nodeClickList = {}
+ this.TreeList=[]
+ this.TreeFlagCode=false
+ console.log('鍚嶵reeList',this.TreeList)
+ console.log('鍚巒odeClickList',this.nodeClickList)
}
}, true)
},
@@ -682,18 +686,6 @@
}
},
methods: {
- //鏍戣妭鐐瑰け鍘荤劍鐐�
- handleClickOutside(event) {
- const treeElement = this.$refs.tree.$el;
- const targetElement = event.target;
- if (!treeElement.contains(targetElement)) {
- // 鍦ㄦ爲缁勪欢澶栭儴鐐瑰嚮锛屾竻绌洪�夋嫨鐘舵��
- // this.nodeClickList=[];
- // this.CloneTreeAvueform={}
- console.log(this.nodeClickList )
- console.log(this.CloneTreeAvueform)
- }
- },
//缂栫爜瑙勫垯澶辩劍
CodeFoucus(){
this.MasterdialogVisible=true;
@@ -1039,7 +1031,7 @@
},
//淇敼鍥炲～
TreeEdit() {
- if (this.nodeClickList == "") {
+ if ( Object.keys(this.nodeClickList).length<1) {
this.$message({
type: 'warning',
message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
@@ -1119,9 +1111,8 @@
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
//瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
- console.log('鏍�',data)
if(data.parentId == ""){
- this.TreeFlag=true;
+ this.TreeFlagCode=true;
}
this.nodeClickList = data
this.ProData=[]
--
Gitblit v1.9.3