From eab19be5f39c7fb5f528be1340206fe789426552 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 九月 2023 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 7e53e35..727d79a 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -222,19 +222,19 @@
this.selectionList.forEach((item,_index) =>{
if(isMutiValue){
var valueFieldArray = _that.props.value.split(",");
- valueFieldArray.forEach((_indexField,_itemField)=>{
- value.push( item[_itemField] + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
+ valueFieldArray.forEach((_itemField,_indexFiel)=>{
+ value.push( (item[_itemField] || item['data'][_itemField]) + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
})
}else {
- value.push(item[_that.props.value]);
+ value.push(item[_that.props.value] || item['data'][_that.props.value]);
}
if(isMutiRaw) {
var rawFieldArray = _that.props.label.split(",");
- rawFieldArray.forEach((_indexField,_itemField)=>{
- text.push(item[_itemField] + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
+ rawFieldArray.forEach((_itemField,_indexField)=>{
+ text.push((item[_itemField] || item['data'][_itemField]) + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
})
}else{
- text.push(item[_that.props.label]);
+ text.push(item[_that.props.label] || item['data'][_that.props.label]);
}
})
@@ -288,8 +288,13 @@
}
}
getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url, this.method).then(res => {
- this.data = res.data.records || res.data.data.records;
- this.page.total=res.data.total || res.data.data.total;
+ if(res.data.records){
+ this.data = res.data.records
+ this.page.total=res.data.total ;
+ }else{
+ this.data = res.data.data.records;
+ this.page.total=res.data.data.total;
+ }
this.loading = false;
this.selectionClear();
}).catch(error=>{
--
Gitblit v1.9.3