From c765af29dff89c216cab16cab45ddab19821236d Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 01 十二月 2023 12:36:35 +0800
Subject: [PATCH] 字符集查询接口bug修复

---
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue |   37 +++++++++++++++++++++++++++----------
 1 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
index f21526d..d609062 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTreeform.vue
@@ -20,14 +20,14 @@
           <el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
           <el-button size="small"  type="primary" plain @click="SelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
         </template>
-        <avue-crud :data="masterData" :option="Option" @row-click="masterSelect">
+        <avue-crud :data="masterData" :option="attrOption" @row-click="masterSelect">
           <template slot="radio" slot-scope="{row}">
             <el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
             </el-radio>
           </template>
         </avue-crud>
         <div style="height: 30px">
-          <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.coderuleoidName}}]</div>
+          <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.codeRuleOidName}}]</div>
           <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
             <el-button type="primary" size="small" @click="MasterHandlerClick">纭畾</el-button>
             <el-button  size="small" @click="masterEscHandler">鍙栨秷</el-button>
@@ -49,14 +49,14 @@
           <el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
           <el-button size="small"  type="primary" plain @click="KeySelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
         </template>
-        <avue-crud :data="KeyData" :option="Option" @row-click="KeySelect">
+        <avue-crud :data="KeyData" :option="attrOption" @row-click="KeySelect">
           <template slot="radio" slot-scope="{row}">
             <el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
             </el-radio>
           </template>
         </avue-crud>
         <div style="height: 30px">
-          <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.codekeyattrrepeatoidName}}]</div>
+          <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.codeKeyAttrRepeatOidName}}]</div>
           <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
             <el-button type="primary" size="small" @click="KeyHandlerClick">纭畾</el-button>
             <el-button  size="small" @click="KeyEscHandler">鍙栨秷</el-button>
@@ -78,7 +78,7 @@
           <el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
           <el-button size="small"  type="primary" plain @click="SimSelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
         </template>
-        <avue-crud :data="simData" :option="Option"@row-click="simSelect">
+        <avue-crud :data="simData" :option="attrOption"@row-click="simSelect">
           <template slot="radio" slot-scope="{row}">
             <el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
             </el-radio>
@@ -194,7 +194,7 @@
           }
         ]
       },
-      Option:{
+      attrOption:{
         addBtn:false,
         columnBtn:false,
         index:true,
@@ -309,7 +309,7 @@
           },
           {
             label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
-            prop:"codekeyattrrepeatoidName",
+            prop:"codeKeyAttrRepeatOidName",
             labelWidth:128,
             disabled: true,
           },
@@ -319,6 +319,23 @@
             labelWidth:128,
             disabled: true,
           },
+          {
+            label: '鏄惁鍙備笌鍏抽敭灞炴�ф牎楠�',
+            prop: 'isParticipateCheck',
+            type: 'switch',
+            activeColor: "#13ce66",
+            inactiveColor: "#ff4949",
+            labelWidth:160,
+            disabled: true,
+            dicData: [{
+              label: '鍚�',
+              value: 0
+            }, {
+              label: '鏄�',
+              value: 1
+            }
+            ]
+          }
         ]
       },
 
@@ -380,7 +397,7 @@
             },
             {
               label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
-              prop:"codekeyattrrepeatoidName",
+              prop:"codeKeyAttrRepeatOidName",
               labelWidth:128,
               focus:this.Keyfouce,
               readonly: true,
@@ -533,8 +550,8 @@
       }else {
         this.KeydialogVisible=false;
         this.KeySelectLIst=[]
-        this.$set(this.loneTreeNewForm,'codekeyattrrepeatoidName',this.KeyName)
-        this.$set(this.loneTreeNewForm,'codekeyattrrepeatoid',this.KeyOid)
+        this.$set(this.loneTreeNewForm,'codeKeyAttrRepeatOidName',this.KeyName)
+        this.$set(this.loneTreeNewForm,'codeKeyAttrRepeatOid',this.KeyOid)
         this.$emit('MasterHandler',this.loneTreeNewForm)
       }
     },

--
Gitblit v1.9.3