From 6cfb1670e56aa394b7f668daf9adf01cc965ecc9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 十二月 2023 11:45:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 70 +++++++++++++++++------------------
1 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 8cbc96c..91b2025 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 - 290px)"
@node-click="nodeClick"
>
</avue-tree>
@@ -54,7 +53,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>
@@ -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() {
@@ -892,7 +892,6 @@
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
return;
}
- console.log(this.nodeClickList.oid)
flowingDependencyGen(this.nodeClickList.oid).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
}).catch(res => {
@@ -902,7 +901,6 @@
// switch
switchChange() {
this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0;
- // console.log(this.TreeAddform.isParticipateCheck)
},
//瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
BtmEscHandler() {
@@ -1346,7 +1344,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1389,7 +1387,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1459,7 +1457,7 @@
}
},
treeClick(e) {
- console.log(e);
+ // console.log(e);
},
//鍩烘湰淇℃伅琛ㄥ崟鍒锋柊
referTreeForm() {
--
Gitblit v1.9.3