From 85250c4f06947d81ff54b554e026353095850b86 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 11 九月 2023 16:33:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue index 93ed5ef..522df5b 100644 --- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue +++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue @@ -202,10 +202,9 @@ message: "璇疯緭鍏�" + item.field, trigger: "blur" }]; - /*item.formatter=function(d,thisItem){ - var vciWebComboxStore = layui.vciWebComboxStore; - return vciWebComboxStore.getComboxText(thisItem.enumCode,d[thisItem.field]); - };*/ + item.formatter=function(d){ + return d.field || d.data.field + }; } return { ...item, @@ -252,6 +251,16 @@ let formatter=item.template || item.templet; if(typeof formatter == "string" && formatter !=''){ formatter=eval("(" + formatter + ")") + }else{ + formatter=function (d){ + if(d[item.field]!=undefined){ + return d[item.field] + }else if(d.data[item.field] !=undefined){ + return d.data[item.field] + }else { + return '' + } + } } return { ...item, @@ -362,6 +371,12 @@ this.data = res.data.data.records; this.page.total=res.data.data.total; } + this.data=this.data.map(item => { + item.data=item.data || {} + return { + ...item + } + }) this.loading = false; this.selectionClear(); }).catch(error=>{ -- Gitblit v1.9.3