From c2427c65298db2ea18c9ecc1c1829afe52bdc28e Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 08 十月 2023 11:00:40 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index afdf3a2..2ef787b 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>
@@ -895,7 +896,7 @@
//缂栫爜瑙勫垯鏌ヨ
SelectFindeHandler() {
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.MasterdefaultRend(masterParameter)
},
//缂栫爜瑙勫垯纭畾
@@ -944,7 +945,7 @@
//鍏抽敭灞炴�ф煡璇�
KeySelectFindeHandler() {
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.KeydefaultRend(masterParameter)
},
//鍏抽敭灞炴�ф帴鍙�
@@ -988,7 +989,7 @@
//鐩镐技椤规煡璇�
SimSelectFindeHandler() {
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.simdefaultRend(masterParameter)
},
// 鐩镐技椤瑰閫�
@@ -1033,7 +1034,7 @@
//涓氬姟绫诲瀷鏌ヨ
BtmSelectFindeHandler() {
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.btmdefaultRend(masterParameter);
},
//涓氬姟绫诲瀷澶氶��
@@ -1072,7 +1073,6 @@
})
//璋冪敤淇敼灞炴�у悕鏂规硶
this.ModifyProperties(this.CloneTreedata, 'name', 'label');
- console.log(this.CloneTreedata)
this.CloneTreedata = this.CloneTreedata.map(item => {
if (item.attributes.lcStatus === "Disabled") {
item.label += '銆愬仠鐢ㄣ��';
@@ -1297,7 +1297,6 @@
},
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
- console.log(data);
//鎿嶄綔鏂板鍜屼慨鏀圭殑涓氬姟绫诲瀷闅愯棌
this.TreeFlagCode = !data;
this.editTreeFLagCode = !data.parentId;
@@ -1519,9 +1518,6 @@
const {id, name} = row[0];
this.CloneModel = {id, name};
this.CloneSelect[0].codeclassifyoid = this.nodeClickList.oid;
- console.log('row', row)
- console.log('CloneSelect', this.CloneSelect)
- console.log('CloneModel', this.CloneModel)
},
//鍏嬮殕琛ㄥ崟鎻愪氦
Clonesubmit(row, done) {
--
Gitblit v1.9.3