From c3cb8a6ad58160f3f4bc5a8e7670b4c62ceca920 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 18 十月 2023 21:32:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
index aaf7255..05d7ba3 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: '涓婚搴�/鍒嗙被缂栧彿',
@@ -461,7 +463,7 @@
     //缂栫爜瑙勫垯鏌ヨ
     SelectFindeHandler(){
       const masterParameter = {};
-      masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+      masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
       this.MasterdefaultRend(masterParameter)
     },
     //缂栫爜瑙勫垯澶辩劍
@@ -496,6 +498,7 @@
         referType:'coderule',
         isMuti:'false',
         'conditionMap["lcstatus"]':'Released',
+        'limit':'-1',
         ...masterParameter
       }).then(res=>{
         this.masterData=res.data.records;
@@ -523,7 +526,7 @@
     //鍏抽敭灞炴�ф煡璇�
     KeySelectFindeHandler(){
       const masterParameter = {};
-      masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+      masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
       this.KeydefaultRend(masterParameter)
     },
     //鍏抽敭灞炴�ф帴鍙�
@@ -532,6 +535,7 @@
         referType:'codekeyattrrepeat',
         isMuti:'false',
         'conditionMap["lcstatus"]':'Enabled',
+        'limit':'-1',
         ...masterParameter
       }).then(res=>{
         this.KeyData=res.data.records;
@@ -566,7 +570,7 @@
     //鐩镐技椤规煡璇�
     SimSelectFindeHandler(){
       const masterParameter = {};
-      masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+      masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
       this.simdefaultRend(masterParameter)
     },
     //鐩镐技椤瑰閫�
@@ -582,6 +586,7 @@
         referType:'coderesemblerule',
         isMuti:'false',
         'conditionMap["lcstatus"]':'Enabled',
+        'limit':'-1',
         ...masterParameter
       }).then(res=>{
         this.simData=res.data.records;
@@ -601,7 +606,7 @@
       }else {
         this.BtmdialogVisible=false;
         this.btmSelectList=[]
-        this.$set(this.loneTreeNewForm,'btmTypeName',this.btmName ||this.btmOid)
+        this.$set(this.loneTreeNewForm,'btmTypeName',this.btmName ||this.btmId)
         this.$set(this.loneTreeNewForm,'btmTypeId',this.btmId)
         this.$emit('MasterHandler',this.loneTreeNewForm)
       }
@@ -609,7 +614,7 @@
     //涓氬姟绫诲瀷鏌ヨ
     BtmSelectFindeHandler(){
       const masterParameter = {};
-      masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+      masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
       this.btmdefaultRend(masterParameter);
     },
     //涓氬姟绫诲瀷澶氶��
@@ -621,7 +626,7 @@
     },
     //涓氬姟绫诲瀷鎺ュ彛
     btmdefaultRend(masterParameter){
-      referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
+      referDataGrid({valueField:'id',isMuti:'false','limit':'-1',...masterParameter}).then(res=>{
         this.BtmData=res.data.data.records
       })
     }

--
Gitblit v1.9.3