From b51951257f62c38c9f157830e254b8ef6ae1404a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 17 十一月 2023 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
index 7079d17..f21526d 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
@@ -172,6 +172,7 @@
],
SelectValue:'id',
btmOption:{
+ columnBtn:false,
addBtn:false,
index:true,
border:true,
@@ -195,6 +196,7 @@
},
Option:{
addBtn:false,
+ columnBtn:false,
index:true,
border:true,
menu:false,
@@ -258,7 +260,7 @@
option: {
submitBtn:false,
emptyBtn:false,
-
+ columnBtn:false,
column: [
{
label: '涓婚搴�/鍒嗙被缂栧彿',
@@ -390,7 +392,22 @@
focus: this.simFouce,
readonly: true,
},
-
+ {
+ label: '鏄惁鍙備笌鍏抽敭灞炴�ф牎楠�',
+ prop: 'isParticipateCheck',
+ type: 'switch',
+ activeColor: "#13ce66",
+ inactiveColor: "#ff4949",
+ labelWidth:160,
+ dicData: [{
+ label: '鍚�',
+ value: 0
+ }, {
+ label: '鏄�',
+ value: 1
+ }
+ ]
+ }
]
}
@@ -399,7 +416,7 @@
watch:{
TreeFlag:{
handler(newval,oldval){
- console.log(newval)
+ // console.log(newval)
}
}
},
--
Gitblit v1.9.3