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 | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 8cbc96c..0fe3d8e 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -2,49 +2,48 @@
<template>
<el-container>
<!-- 宸︿晶鑿滃崟-->
- <el-aside style="width: 20%;">
+ <el-aside>
<basic-container>
- <el-collapse accordion>
- <el-collapse-item style="padding-left: 3px;">
- <template slot="title">
- <div style="display: flex;justify-content: space-around;">
- <el-button v-if="permissionList.TreeAddStatus" plain size="mini" type="primary" @click="TreeAdd">娣诲姞
+ <div>
+ <div>
+ <div style="display: flex; flex-direction: column;">
+ <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="mini" type="primary" @click="flushed">鍒锋柊
+ <el-button v-if="permissionList.flushedStatus" plain size="small" type="primary" @click="flushed">鍒锋柊
</el-button>
</div>
- </template>
- <div>
- <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>
- <el-button v-if="permissionList.ImportExcelStatus" plain size="mini" type="primary"
- @click.native="ImportExcel">瀵煎叆
- </el-button>
- <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary"
- @click="ExportExcel">瀵煎嚭
+ <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.DeactivateStatus" plain size="small" type="primary" @click="Deactivate">
+ 鍋滅敤
+ </el-button>
+ <el-button v-if="permissionList.ImportExcelStatus" plain size="small" type="primary"
+ @click.native="ImportExcel">瀵煎叆
+ </el-button>
+ <el-button v-if="permissionList.ExportExcelStatus" plain size="small" type="primary"
+ @click="ExportExcel">瀵煎嚭
+ </el-button>
+ </div>
+ </div>
+ <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 style="margin-top: 10px;margin-bottom: 10px">
- <el-button v-if="permissionList.ExportExcelStatus" plain size="mini" type="primary" @click="testHandler">娴佹按澶勭悊
- </el-button>
- </div>
- </el-collapse-item>
- </el-collapse>
-
+ </div>
+ </div>
<!-- 宸︿晶鏍�-->
- <div style="height: calc(100vh - 194px);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>
@@ -822,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() {
--
Gitblit v1.9.3