From 0aacd98062f9914243fdd0a3ad9b3cd9d496191d Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 10 七月 2023 02:57:54 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Tree/attrCrud.vue |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 63aa823..b361ff8 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -270,12 +270,12 @@
                     @blur="saveRows"></el-input>
           <el-input-number size="small" controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
                            @blur="saveRows" :style="{width:(item.width-10)+'px'}"></el-input-number>
-          <el-select v-model="row[item.prop]" filterable  allow-create  default-first-option slot="prepend" v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " @focus="DataChangeHandler(item.editConfig,index)">
+          <el-select v-model="row[item.prop]" filterable  allow-create  default-first-option slot="prepend" v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " @visible-change="DataChangeHandler($event,item.editConfig,index)">
             <el-option
               v-for="optionItem in item.data"
-              :key="optionItem.key"
-              :label="optionItem.value"
-              :value="optionItem.key">
+              :key="optionItem.dictValue"
+              :label="optionItem.dictValue"
+              :value="optionItem.dictValue">
             </el-option>
           </el-select>
           <el-switch
@@ -304,6 +304,7 @@
 
 <script>
 import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto,listByFlag} from '@/api/template/templateAttr'
+import {getList} from "@/api/refer/table";
 
 export default {
   name: "attrCrud .vue",
@@ -1390,10 +1391,13 @@
 
     },
     //鏃堕棿涓嬫媺鏍煎紡
-    DataChangeHandler(editConfig,index){
+    DataChangeHandler($event,editConfig,index){
+      let that=this;
+      if(!$event){
+        return;
+      }
       listByFlag(editConfig.extraParams).then(res=>{
-        console.log(res);
-        this.option.column[index].data=res;
+        that.option.column[index].data=res.data.data;
       })
     },
     //灞炴�у垎缁勬寜閽�

--
Gitblit v1.9.3