From 02611cd19ef961dedee41f74eb3df13b002993aa Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 十二月 2023 17:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 72f90ae..40de37c 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -7,47 +7,54 @@
<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 - 290px)"
@node-click="nodeClick"
>
+ <template slot-scope="{ node, data }" class="el-tree-node__label">
+ <el-tooltip :content="$createElement('div', { domProps: { innerHTML: node.label } })" class="item" effect="dark"
+ open-delay="500"
+ placement="right-start">
+ <span style="font-size: 14px;">
+ {{ (node || {}).label }}
+ </span>
+ </el-tooltip>
+ </template>
</avue-tree>
</div>
@@ -55,7 +62,7 @@
<el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
:title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
style="width: 1700px;margin: auto">
- <el-form ref="myForm" :model="TreeAddform" :rules="rules">
+ <el-form ref="myForm" :model="TreeAddform" :rules= "rules">
<el-form-item :label="this.TreeFlag ? '鍒嗙被缂栧彿锛�' :'涓婚搴撶紪鍙凤細'" label-width="150px" prop="id"
style="display: inline-block">
<el-input v-model="TreeAddform.id" autocomplete="off" style="width: 170px"></el-input>
@@ -107,7 +114,6 @@
:nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
@referTreeForm="referTreeForm"></classifyTreeform>
</el-dialog>
- </div>
</basic-container>
</el-aside>
<el-main>
@@ -439,6 +445,7 @@
name: "classifyTrees.vue",
data() {
return {
+ activeName: 'first',
masterRow: null,
AddLoading: false,
// 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺
@@ -478,6 +485,8 @@
masterOption: {
addBtn: false,
index: true,
+ refreshBtn:false,
+ columnBtn: false,
border: true,
menu: false,
height: 380,
@@ -506,6 +515,7 @@
addBtn: false,
index: true,
columnBtn: false,
+ refreshBtn:false,
border: true,
menu: false,
height: 380,
@@ -823,6 +833,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,12 +896,14 @@
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 => {
@@ -900,7 +913,6 @@
// switch
switchChange() {
this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0;
- // console.log(this.TreeAddform.isParticipateCheck)
},
//瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
BtmEscHandler() {
@@ -1344,7 +1356,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1387,7 +1399,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1457,7 +1469,7 @@
}
},
treeClick(e) {
- console.log(e);
+ // console.log(e);
},
//鍩烘湰淇℃伅琛ㄥ崟鍒锋柊
referTreeForm() {
--
Gitblit v1.9.3