From c958ebb34b91f17e52bcc9ca5de11e8087affda5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 18 十月 2023 11:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 5b22a87..2a2a987 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -69,11 +69,12 @@
:nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
@referTreeForm="referTreeForm"></classifyTreeform>
</el-dialog>
+<!-- 宸︿晶鏍�-->
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
:defaultExpandAll="false"
:option="Treeoption"
class="classifyTree"
- style="height: calc(100vh - 230px);"
+ style="height: calc(100vh - 230px)"
@node-click="nodeClick"
>
</avue-tree>
@@ -142,7 +143,7 @@
<avue-tree ref="cloneTree" v-model="TreeAvueform" v-loading="loading" :data="Treedata"
:defaultExpandAll="false"
:option="Treeoption"
- style="height: 50.5vh;margin-right: 10px"
+ style="height: 50.5vh;margin-right: 10px;width: 300px"
@node-click="ClonenodeClick"
>
</avue-tree>
@@ -475,6 +476,7 @@
Option: {
addBtn: false,
index: true,
+ columnBtn:false,
border: true,
menu: false,
height: 380,
@@ -666,6 +668,7 @@
CloneSelect: [],
//鍏嬮殕妯℃澘option
ClonecrudTreeOption: {
+ columnBtn:false,
index: true,
border: true,
menu: false,
@@ -780,6 +783,7 @@
return {
index: true,
border: true,
+ columnBtn:false,
height: 180,
addBtn: this.Formlist.length <= 0 && this.nodeClickList != "",
editBtn: false,
@@ -895,7 +899,7 @@
//缂栫爜瑙勫垯鏌ヨ
SelectFindeHandler() {
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.MasterdefaultRend(masterParameter)
},
//缂栫爜瑙勫垯纭畾
@@ -944,7 +948,7 @@
//鍏抽敭灞炴�ф煡璇�
KeySelectFindeHandler() {
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.KeydefaultRend(masterParameter)
},
//鍏抽敭灞炴�ф帴鍙�
@@ -988,7 +992,7 @@
//鐩镐技椤规煡璇�
SimSelectFindeHandler() {
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.simdefaultRend(masterParameter)
},
// 鐩镐技椤瑰閫�
@@ -1033,7 +1037,7 @@
//涓氬姟绫诲瀷鏌ヨ
BtmSelectFindeHandler() {
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.btmdefaultRend(masterParameter);
},
//涓氬姟绫诲瀷澶氶��
--
Gitblit v1.9.3