From a79582f0c67ddc681d2804669455ae13c64de8f9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 26 十二月 2023 20:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 0fe3d8e..60eba90 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -32,28 +32,39 @@
</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 v-if="permissionList.flowingBtnStuatus" plain size="mini" type="primary" @click="flowingDependHandler">娴佹按澶勭悊
+ </el-button>
+ <el-button v-if="permissionList.classifyAuth" plain size="mini" type="primary" @click="classifyAuthHandler">鍒嗙被鎺堟潈
</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"
: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>
- <!-- 鏍戣妭鐐规坊鍔犲璇濇-->
+ <!-- 鏍戣妭鐐规坊鍔犲璇濇-->
<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>
@@ -97,7 +108,7 @@
<el-button type="primary" @click="TreeAddHandler">纭� 瀹�</el-button>
</div>
</el-dialog>
- <!-- 淇敼瀵硅瘽妗�-->
+ <!-- 淇敼瀵硅瘽妗�-->
<el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
<classifyTreeform ref="childForm" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="editTreeFLagCode"
:flag="'edit'"
@@ -105,6 +116,11 @@
:nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
@referTreeForm="referTreeForm"></classifyTreeform>
</el-dialog>
+ <!-- 鍒嗙被鎺堟潈瀵硅瘽妗�-->
+ <classify-auth-dialog
+ :visible.sync="classifyAuthVisible"
+ :classifyData="classifyData"
+ ></classify-auth-dialog>
</basic-container>
</el-aside>
<el-main>
@@ -431,8 +447,10 @@
import {defaultReferDataGrid, referDataGrid} from '@/api/MasterData/master'
import func from "@/util/func";
import {mapGetters} from "vuex";
+import ClassifyAuth from './ClassifyAuthDialog.vue';
export default {
+ components: { ClassifyAuth },
name: "classifyTrees.vue",
data() {
return {
@@ -476,6 +494,8 @@
masterOption: {
addBtn: false,
index: true,
+ refreshBtn:false,
+ columnBtn: false,
border: true,
menu: false,
height: 380,
@@ -504,6 +524,7 @@
addBtn: false,
index: true,
columnBtn: false,
+ refreshBtn:false,
border: true,
menu: false,
height: 380,
@@ -595,6 +616,8 @@
TreeEditFormVisible: false,
//娣诲姞瀵硅瘽妗�
TreeAddFormVisible: false,
+ //鍒嗙被鎺堟潈瀵硅瘽妗�
+ classifyAuthVisible: false,
//褰撳墠鐐瑰嚮椤�
nodeClickList: "",
ClonenodeClickList: "",
@@ -790,6 +813,8 @@
},
//妯℃澘绠＄悊缂栬緫
showEditBtn: false,
+ //浼犻�掔粰鍒嗙被鎺堟潈瀛愮粍浠跺璇濇鐨勫綋鍓嶉�変腑鐨勫垎绫昏妭鐐逛俊鎭�
+ classifyData: "",
}
},
watch: {},
@@ -822,6 +847,7 @@
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),
+ classifyAuth: this.vaildData(this.permission.classifyTree.classify_auth, false),
}
},
crudTreeOption() {
@@ -884,15 +910,20 @@
created() {
},
methods: {
- handleTabClick(){
-
+ // 鍒嗙被鎺堟潈瀵硅瘽妗嗘墦寮�
+ classifyAuthHandler(){
+ if(this.nodeClickList.oid === '' || this.nodeClickList.oid === undefined){
+ this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
+ return;
+ }
+ this.classifyData = this.nodeClickList;
+ this.classifyAuthVisible = true;
},
- testHandler(){
+ flowingDependHandler(){
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 => {
@@ -902,7 +933,6 @@
// switch
switchChange() {
this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0;
- // console.log(this.TreeAddform.isParticipateCheck)
},
//瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
BtmEscHandler() {
@@ -1346,7 +1376,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1389,7 +1419,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1459,7 +1489,7 @@
}
},
treeClick(e) {
- console.log(e);
+ // console.log(e);
},
//鍩烘湰淇℃伅琛ㄥ崟鍒锋柊
referTreeForm() {
--
Gitblit v1.9.3