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/vciWebReferTable.vue | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 8e83d4f..522df5b 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -87,10 +87,12 @@
},
created() {
this.getParams();
+
// console.log('referConfig:')
// console.log(this.referConfig)
},
mounted() {
+ console.log('referrTable')
if(this.referConfig.options.page){
this.page.pageSize=this.referConfig.options.page.limit || this.referConfig.options.page.pageSize;
this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
@@ -200,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,
@@ -250,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,
@@ -270,6 +281,7 @@
this.params=paramsData;
},
setValue(){
+ console.log('纭畾')
if(this.selectionList.length==0){
this.$message.warning( '娌℃湁閫夋嫨鏁版嵁');
return false;
@@ -359,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