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') }) }, // 打印方式