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 | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue index 5854b1a..0fe3d8e 100644 --- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue +++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue @@ -31,9 +31,12 @@ </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"> <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" @@ -102,7 +105,6 @@ :nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed" @referTreeForm="referTreeForm"></classifyTreeform> </el-dialog> - </div> </basic-container> </el-aside> <el-main> @@ -423,7 +425,8 @@ upVersion, stopLose, startRelease, - exportClassify + exportClassify, + flowingDependencyGen } from "@/api/template/templateAttr"; import {defaultReferDataGrid, referDataGrid} from '@/api/MasterData/master' import func from "@/util/func"; @@ -433,6 +436,7 @@ name: "classifyTrees.vue", data() { return { + activeName: 'first', masterRow: null, AddLoading: false, // 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺 @@ -817,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() { @@ -879,6 +884,21 @@ created() { }, methods: { + handleTabClick(){ + + }, + testHandler(){ + if(this.nodeClickList.length <=0 ){ + this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒') + return; + } + console.log(this.nodeClickList.oid) + flowingDependencyGen(this.nodeClickList.oid).then(res => { + this.$message.success('鎿嶄綔鎴愬姛') + }).catch(res => { + this.$message.error(res) + }) + }, // switch switchChange() { this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0; -- Gitblit v1.9.3