From 2f88385ea22a783661dc537551c204c00d309f63 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 16:10:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 65 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index c78fbf7..2aa34be 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -3,7 +3,7 @@
<el-container>
<!-- 宸︿晶鑿滃崟-->
<el-aside>
- <basic-container style="overflow:hidden;">
+ <basic-container>
<div>
<div>
<div style="display: flex; flex-direction: column;">
@@ -23,6 +23,18 @@
<div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
</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)"
+ @node-click="nodeClick"
+ >
+ </avue-tree>
+ </div>
+
<!-- 鏍戣妭鐐规坊鍔犲璇濇-->
<el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
:title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
@@ -51,6 +63,16 @@
<el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" style="width: 585px"
@focus="Keyfouce"></el-input>
</el-form-item>
+ <el-form-item label="鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岋細" label-width="170px">
+ <el-switch
+ v-model="TreeAddform.codeKeyAttrValue"
+ active-text="鏄�"
+ inactive-text="鍚�"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ @change="switchChange">
+ </el-switch>
+ </el-form-item>
<el-form-item label="鐩镐技鏌ヨ瑙勫垯锛�" label-width="150px">
<el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" style="width: 585px"
@focus="simFouce"></el-input>
@@ -69,15 +91,6 @@
:nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
@referTreeForm="referTreeForm"></classifyTreeform>
</el-dialog>
-<!-- 宸︿晶鏍�-->
- <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
- :defaultExpandAll="false"
- :option="Treeoption"
- class="classifyTree"
- style="height: calc(100vh - 230px)"
- @node-click="nodeClick"
- >
- </avue-tree>
</div>
</basic-container>
</el-aside>
@@ -404,7 +417,6 @@
import {mapGetters} from "vuex";
export default {
name: "classifyTrees.vue",
- inject: ["crudTreeData"],
data() {
return {
masterRow: null,
@@ -584,7 +596,9 @@
//缂栫爜瑙勫垯
codeRuleOidName: "",
//瀛樺偍鐨勪笟鍔＄被鍨�
- btmTypeName: ""
+ btmTypeName: "",
+ codeKeyAttrValue:true,
+ isParticipateCheck:1
},
rules: {
id: [
@@ -851,6 +865,11 @@
created() {
},
methods: {
+ // switch
+ switchChange(){
+ this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue ? 1 : 0;
+ // console.log(this.TreeAddform.isParticipateCheck)
+ },
//瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
BtmEscHandler() {
this.SelectFInd = '';
@@ -925,6 +944,7 @@
this.$set(this.TreeAddform, 'codeRuleOidName', this.masterName)
this.$set(this.TreeAddform, 'codeRuleOid', this.masterOid)
this.$emit('MasterHandler', this.loneTreeNewForm)
+ this.masterRow=null;
}
},
//缂栫爜鎺ュ彛
@@ -954,6 +974,7 @@
this.KeySelectLIst = []
this.$set(this.TreeAddform, 'codeKeyAttrRepeatOidName', this.KeyName)
this.$set(this.TreeAddform, 'codeKeyAttrRepeatOid', this.KeyOid)
+ this.masterRow=null;
}
},
//鍏抽敭灞炴�ф煡璇�
@@ -998,6 +1019,7 @@
this.$set(this.TreeAddform, 'codeResembleRuleOidName', this.simName)
this.$set(this.TreeAddform, 'codeResembleRuleOid', this.simOid)
this.$emit('MasterHandler', this.loneTreeNewForm)
+ this.masterRow=null;
}
},
//鐩镐技椤规煡璇�
@@ -1043,6 +1065,7 @@
this.$set(this.TreeAddform, 'btmTypeName', this.btmName)
this.$set(this.TreeAddform, 'btmTypeId', this.btmOid)
this.$emit('MasterHandler', this.loneTreeNewForm)
+ this.masterRow=null;
}
},
//涓氬姟绫诲瀷鏌ヨ
@@ -1133,6 +1156,8 @@
TreeEscHandler() {
this.TreeAddform = {};
this.TreeAddFormVisible = false;
+ this.TreeAddform.codeKeyAttrValue = true;
+ this.TreeAddform.isParticipateCheck = 1;
// 鍏抽棴寮圭獥娓呯┖鏍￠獙
this.$refs.myForm.clearValidate();
},
@@ -1151,6 +1176,8 @@
});
Object.keys(this.TreeAddform).forEach(key => {
this.TreeAddform[key] = "";
+ this.TreeAddform.codeKeyAttrValue = true;
+ this.TreeAddform.isParticipateCheck = 1;
});
this.getAttr();
this.TreeAddFormVisible = false;
@@ -1239,7 +1266,10 @@
this.getAttr()
setTimeout(() => {
this.loading = false;
- this.nodeClickList = ""
+ this.$refs.tree.setCurrentKey(null);
+ this.nodeClickList = {}
+ this.TreeList = []
+ this.TreeFlagCode = true;
}, 600);
},
//鍚敤鍜屽仠鐢ㄩ兘鍏堝垽鏂姸鎬�
@@ -1341,6 +1371,10 @@
this.crudOid = ''
}
this.TreeList = res3.data.data;
+ if(!this.TreeList.isParticipateCheck){
+ this.$set(this.TreeList,"isParticipateCheck",1)
+ return
+ }
} catch (error) {
this.$message.error(error);
}
@@ -1626,7 +1660,7 @@
}
.el-aside {
- height: calc(100% - 30px);
+ //height: calc(100% - 30px);
}
.el-main {
@@ -1652,6 +1686,3 @@
}
</style>
-/sa[pr
-[
-syulep
--
Gitblit v1.9.3