From 6b0cdda642b2a598d4db46d9e5142943af3312dd Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Sat, 8 Jan 2022 10:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=20sxm=202022-1-8=20=2010:42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/common/Chooselist.vue   | 13 ++++++++++++-
 src/views/modules/sys/language/common.vue |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/common/Chooselist.vue b/src/views/modules/common/Chooselist.vue
index f824385..3a92206 100644
--- a/src/views/modules/common/Chooselist.vue
+++ b/src/views/modules/common/Chooselist.vue
@@ -111,6 +111,7 @@ export default {
         let length = end - start
         let columns = data.data.sqlcode.trim().substring(start + 6, length).trim()
         let props = columns.split(",")
+
         props.forEach((item, index) => {
           let name = '信息列'
           switch (index) {
@@ -127,8 +128,18 @@ export default {
               name = this.baseListData.caption4
               break;
           }
+          let index1 = item.indexOf(" as ");
+          let index2 = item.indexOf(".");
+          let l = item.length
+          let prop = item
+          if (index1> 0){
+            prop = item.substring(index1+3,l).trim()
+          }
+          if (index1<0 && index2>0){
+            prop = item.substring(index2+1,l)
+          }
           let column = {
-            "columnProp": item.trim(),
+            "columnProp":prop,
             "columnLabel": name,
             "columnHidden": false,
             "columnImage": false,
diff --git a/src/views/modules/sys/language/common.vue b/src/views/modules/sys/language/common.vue
index 3de076b..a38c6e1 100644
--- a/src/views/modules/sys/language/common.vue
+++ b/src/views/modules/sys/language/common.vue
@@ -504,7 +504,7 @@ export default {
     // 获取基础数据列表
     getBaseList(){
       this.$nextTick(() => {
-        this.$refs.baseList.init(1003,'fdsa')
+        this.$refs.baseList.init(18,'fdsa')
       })
     },
     // 打印方式