From 4e5223ed1c6db17c39e82158354d593957bc3c3e Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期五, 04 八月 2023 12:08:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue index 54d9a47..13f9b79 100644 --- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue +++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue @@ -427,7 +427,7 @@ label: '鑻辨枃鍚嶇О' } ], - SelectValue:"", + SelectValue:"id", SelectFInd:"", addFlag:false, // 琛ㄦ牸褰撳墠琛宨d @@ -672,11 +672,7 @@ } }, watch:{ - TreeFlagCode:{ - handler(newval,oldval){ - console.log('TreeFlagCode',newval) - } - } + }, //tab鏍忛粯璁ゆ槸琛ㄦ牸 mounted() { @@ -753,6 +749,8 @@ }, methods: { + // 鍏抽棴寮圭獥 + /** 瀵煎叆 */ ImportExcel(){ this.ThemeImportVisible=true; @@ -787,15 +785,11 @@ 'conditionMap[id]':this.SelectFInd } this.MasterdefaultRend(masterParameter); - this.SelectValue="" - this.SelectFInd="" }else if(this.SelectValue == 'name'){ const masterParameter={ 'conditionMap[name]':this.SelectFInd } this.MasterdefaultRend(masterParameter) - this.SelectValue="" - this.SelectFInd="" } }, //缂栫爜瑙勫垯纭畾 @@ -846,15 +840,11 @@ 'conditionMap[id]':this.SelectFInd } this.KeydefaultRend(masterParameter); - this.SelectValue=""; - this.SelectFInd=""; }else if(this.SelectValue == 'name'){ const masterParameter={ 'conditionMap[name]':this.SelectFInd } this.KeydefaultRend(masterParameter) - this.SelectValue="" - this.SelectFInd="" } }, //鍏抽敭灞炴�ф帴鍙� @@ -899,15 +889,11 @@ 'conditionMap[id]':this.SelectFInd } this.simdefaultRend(masterParameter); - this.SelectValue="" - this.SelectFInd="" }else if(this.SelectValue == 'name'){ const masterParameter={ 'conditionMap[name]':this.SelectFInd } this.simdefaultRend(masterParameter) - this.SelectValue="" - this.SelectFInd="" } }, // 鐩镐技椤瑰閫� @@ -952,15 +938,11 @@ 'conditionMap[id]':this.SelectFInd } this.btmdefaultRend(masterParameter); - this.SelectValue="" - this.SelectFInd="" }else if(this.SelectValue == 'name'){ const masterParameter={ 'conditionMap[name]':this.SelectFInd } this.btmdefaultRend(masterParameter); - this.SelectValue=""; - this.SelectFInd=""; } }, //涓氬姟绫诲瀷澶氶�� @@ -1226,6 +1208,7 @@ this.editTreeFLagCode = !data.parentId; this.nodeClickList = data; this.selectRow = 0; + this.crudArray=[] try { this.requestCount += 1; const [res1, res2, res3] = await Promise.all([ @@ -1444,7 +1427,7 @@ this.CloneinnerVisible=false this.CloneVisible=false this.$message.success("澶嶅埗鎴愬姛") - this.CrudRend() + this.TemRefresh(); done(row) }).catch(res=>{ done(res) -- Gitblit v1.9.3