From 6732cd7a4e0fd7ea083d4ae11254bde35adb1ee4 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 17 十一月 2023 01:39:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 3a5e81f..69351e6 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -29,6 +29,7 @@
:defaultExpandAll="false"
:option="Treeoption"
class="classifyTree"
+ style="height: calc(100vh - 280px)"
@node-click="nodeClick"
>
</avue-tree>
@@ -61,6 +62,16 @@
<el-form-item label="鍏抽敭灞炴�ф煡璇㈣鍒欙細" label-width="150px">
<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"
@@ -585,7 +596,9 @@
//缂栫爜瑙勫垯
codeRuleOidName: "",
//瀛樺偍鐨勪笟鍔＄被鍨�
- btmTypeName: ""
+ btmTypeName: "",
+ codeKeyAttrValue:true,
+ isParticipateCheck:1
},
rules: {
id: [
@@ -852,6 +865,11 @@
created() {
},
methods: {
+ // switch
+ switchChange(){
+ this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0;
+ // console.log(this.TreeAddform.isParticipateCheck)
+ },
//瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
BtmEscHandler() {
this.SelectFInd = '';
@@ -1136,7 +1154,13 @@
},
//鏍戣妭鐐瑰彇娑堜簨浠�
TreeEscHandler() {
- this.TreeAddform = {};
+ for (let key in this.TreeAddform) {
+ if (key !== 'codeKeyAttrValue' && key !== 'isParticipateCheck') {
+ this.TreeAddform[key] = "";
+ }
+ }
+ this.TreeAddform.codeKeyAttrValue = true;
+ this.TreeAddform.isParticipateCheck = 1;
this.TreeAddFormVisible = false;
// 鍏抽棴寮圭獥娓呯┖鏍￠獙
this.$refs.myForm.clearValidate();
@@ -1156,6 +1180,8 @@
});
Object.keys(this.TreeAddform).forEach(key => {
this.TreeAddform[key] = "";
+ this.TreeAddform.codeKeyAttrValue = true;
+ this.TreeAddform.isParticipateCheck = 1;
});
this.getAttr();
this.TreeAddFormVisible = false;
@@ -1244,7 +1270,10 @@
this.getAttr()
setTimeout(() => {
this.loading = false;
- this.nodeClickList = ""
+ this.$refs.tree.setCurrentKey(null);
+ this.nodeClickList = {}
+ this.TreeList = []
+ this.TreeFlagCode = true;
}, 600);
},
//鍚敤鍜屽仠鐢ㄩ兘鍏堝垽鏂姸鎬�
@@ -1346,6 +1375,10 @@
this.crudOid = ''
}
this.TreeList = res3.data.data;
+ if(this.TreeList.isParticipateCheck === null || this.TreeList.isParticipateCheck === undefined ||this.TreeList.isParticipateCheck === ""){
+ this.$set(this.TreeList,"isParticipateCheck",1)
+ return
+ }
} catch (error) {
this.$message.error(error);
}
@@ -1656,4 +1689,4 @@
width: 500px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3