From 0a1e8735df28380727ff3cbabc73c71b1fdee0e1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 06 十二月 2023 22:22:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 72f90ae..0fe3d8e 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -7,45 +7,43 @@
<div>
<div>
<div style="display: flex; flex-direction: column;">
- <div style="display: flex;justify-content: space-around">
- <el-button v-if="permissionList.TreeAddStatus" plain size="mini" type="primary" @click="TreeAdd">娣诲姞
+ <div style="display: flex;">
+ <el-button v-if="permissionList.TreeAddStatus" plain size="small" type="primary" @click="TreeAdd">娣诲姞
</el-button>
- <el-button v-if="permissionList.TreeEditStatus" plain size="mini" type="primary" @click="TreeEdit">淇敼
+ <el-button v-if="permissionList.TreeEditStatus" plain size="small" type="primary" @click="TreeEdit">淇敼
</el-button>
- <el-button v-if="permissionList.TreeDelStatus" plain size="mini" type="primary" @click="TreeDel">鍒犻櫎
+ <el-button v-if="permissionList.TreeDelStatus" plain size="small" type="primary" @click="TreeDel">鍒犻櫎
+ </el-button>
+ <el-button v-if="permissionList.flushedStatus" plain size="small" type="primary" @click="flushed">鍒锋柊
</el-button>
</div>
- <div style="display: flex; margin-top: 10px;justify-content: space-around">
- <el-button v-if="permissionList.flushedStatus" plain size="mini" type="primary" @click="flushed">鍒锋柊
+ <div style="display: flex; margin-top: 10px">
+ <el-button v-if="permissionList.EnableStatus" plain size="small" type="primary" @click="Enable">鍚敤
</el-button>
- <el-button v-if="permissionList.EnableStatus" plain size="mini" type="primary" @click="Enable">鍚敤
- </el-button>
- <el-button v-if="permissionList.DeactivateStatus" plain size="mini" type="primary" @click="Deactivate">
+ <el-button v-if="permissionList.DeactivateStatus" plain size="small" type="primary" @click="Deactivate">
鍋滅敤
</el-button>
- </div>
- <div style="display: flex; margin-top: 10px;justify-content: space-around">
- <el-button v-if="permissionList.ImportExcelStatus" plain size="mini" type="primary"
+ <el-button v-if="permissionList.ImportExcelStatus" plain size="small" type="primary"
@click.native="ImportExcel">瀵煎叆
</el-button>
- <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary"
+ <el-button v-if="permissionList.ExportExcelStatus" plain size="small" type="primary"
@click="ExportExcel">瀵煎嚭
- </el-button>
- <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary"
- @click="testHandler">娴嬭瘯
</el-button>
</div>
</div>
- <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
+ <div style="display: flex;margin-top: 5px;margin-bottom: 5px">
+ <el-button v-if="permissionList.flowingBtnStuatus" plain size="mini" type="primary" @click="testHandler">娴佹按澶勭悊
+ </el-button>
</div>
</div>
+ </div>
<!-- 宸︿晶鏍�-->
- <div style="height: calc(100vh - 230px);overflow: auto;">
+ <div style="height: calc(100vh - 230px);overflow: auto">
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
:defaultExpandAll="false"
:option="Treeoption"
class="classifyTree"
- style="height: calc(100vh - 280px);"
+ style="height: calc(100vh - 280px)"
@node-click="nodeClick"
>
</avue-tree>
@@ -107,7 +105,6 @@
:nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
@referTreeForm="referTreeForm"></classifyTreeform>
</el-dialog>
- </div>
</basic-container>
</el-aside>
<el-main>
@@ -439,6 +436,7 @@
name: "classifyTrees.vue",
data() {
return {
+ activeName: 'first',
masterRow: null,
AddLoading: false,
// 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺
@@ -823,6 +821,7 @@
FindStatus: this.vaildData(this.permission.classifyTree.manage_search, false),
TemRefreshStatus: this.vaildData(this.permission.classifyTree.manage_break, false),
CloneBtnStuatus: this.vaildData(this.permission.classifyTree.manage_clone, false),
+ flowingBtnStuatus: this.vaildData(this.permission.classifyTree.tree_flowing, false),
}
},
crudTreeOption() {
@@ -885,6 +884,9 @@
created() {
},
methods: {
+ handleTabClick(){
+
+ },
testHandler(){
if(this.nodeClickList.length <=0 ){
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
--
Gitblit v1.9.3