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/ThemeClassifyTreeform.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
index 332b207..5e5bcce 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,23 @@
focus: this.simFouce,
readonly: true,
},
-
+ {
+ label: '鏄惁鍙備笌鍏抽敭灞炴�ф牎楠�',
+ prop: 'isParticipateCheck',
+ type: 'switch',
+ activeColor: "#13ce66",
+ inactiveColor: "#ff4949",
+ labelWidth:160,
+ value:1,
+ dicData: [{
+ label: '鍚�',
+ value: 0
+ }, {
+ label: '鏄�',
+ value: 1
+ }
+ ]
+ }
]
}
@@ -399,7 +417,7 @@
watch:{
TreeFlag:{
handler(newval,oldval){
- console.log(newval)
+ // console.log(newval)
}
}
},
@@ -461,7 +479,7 @@
//缂栫爜瑙勫垯鏌ヨ
SelectFindeHandler(){
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.MasterdefaultRend(masterParameter)
},
//缂栫爜瑙勫垯澶辩劍
@@ -524,7 +542,7 @@
//鍏抽敭灞炴�ф煡璇�
KeySelectFindeHandler(){
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.KeydefaultRend(masterParameter)
},
//鍏抽敭灞炴�ф帴鍙�
@@ -568,7 +586,7 @@
//鐩镐技椤规煡璇�
SimSelectFindeHandler(){
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.simdefaultRend(masterParameter)
},
//鐩镐技椤瑰閫�
@@ -612,7 +630,7 @@
//涓氬姟绫诲瀷鏌ヨ
BtmSelectFindeHandler(){
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
this.btmdefaultRend(masterParameter);
},
//涓氬姟绫诲瀷澶氶��
--
Gitblit v1.9.3