From 4cd479485aded3de0b52abe37097a04105bad3ed Mon Sep 17 00:00:00 2001 From: ludc Date: 星期一, 11 九月 2023 15:01:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue index 727d79a..8422b43 100644 --- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue +++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue @@ -158,22 +158,34 @@ label: '鑻辨枃鍚嶇О', sortable: true, width: 150, - search: true + search: true, + formatter:function (d){ + return d.id || d.data.id + } }, { prop: 'name', label: '涓枃鍚嶇О', sortable: true, width: 150, - search: true + search: true, + formatter:function (d){ + return d.name || d.data.name + } }, { prop: 'description', label: '鎻忚堪', - width: 250 + width: 250, + formatter:function (d){ + return d.description || d.data.description + } }, { prop: 'secretGradeText', label: '瀵嗙骇', width: 60, - hidden: (!this.controllerSecret) + hidden: (!this.controllerSecret), + formatter:function (d){ + return d.secretGradeText || d.data.secretGradeText + } }]; } else { this.option.column = this.options.tableConfig.cols.map(item => { @@ -181,6 +193,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, @@ -295,6 +317,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