From 035317b63479c6a1ce12f0e5c911d5d0e7a99e9b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 25 十月 2023 22:44:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 55946d3..9474f0d 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -33,8 +33,6 @@
</el-dialog>
<avue-input v-model="text" :disabled="disabled" :placeholder="title" @click="!disabled && (visible=true)"></avue-input>
- <!--<avue-input-table ref="referTable" :props="props" :column="column" :on-load="onLoad" v-model="value" :placeholder="title" ></avue-input-table>
- -->
</div>
</template>
@@ -67,6 +65,7 @@
selectionList: [],
option: {
addBtn: false,
+ columnBtn:false,
height: this.referConfig.options.height ? this.referConfig.options.height : 475,
calcHeight: 30,
tip: false,
@@ -88,9 +87,6 @@
},
created() {
this.getParams();
-
- // console.log('referConfig:')
- // console.log(this.referConfig)
},
mounted() {
if(this.referConfig.options.page){
@@ -98,6 +94,8 @@
this.page.currentPage=this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
}else if(!validatenull(this.referConfig.options.limit)){
this.page.pageSize=this.referConfig.options.limit
+ }else if(!validatenull(this.referConfig.options.tableConfig.limit)){
+ this.page.pageSize=this.referConfig.options.tableConfig.limit
}
this.$nextTick(() => {
this.$refs.referCrud.doLayout()
@@ -133,7 +131,7 @@
queryParams['referBo'] = this.options['referBo'] || this.options['referType'];
}
queryParams['referType']= queryParams['referBo']
- if (this.options.remoteSort && this.options.initSort) {
+ if (this.options.initSort) {
queryParams['order'] = this.options.initSort.type;//鏂规硶
queryParams['sort'] = this.options.initSort.field;//瀛楁
}
@@ -248,7 +246,6 @@
if(!tableConfig){
this.$message.error( '娌℃湁瀹氫箟鍙傜収鐨勮〃鏍奸厤缃�');
}
- //this.page.pageSize=tableConfig.page.limit || 10;
if(!paramsData){
paramsData = {
currentUserReferModelKey:this.options.currentUserReferModelKey,
@@ -344,7 +341,14 @@
text.push(itemText);
}
})
- let mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(this.options.mapFields)) ;
+ let mapFields =this.referConfig.fieldMap || {};
+ try {
+ if(!validatenull(this.options.mapFields)){
+ mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(this.options.mapFields)) ;
+ }
+ }catch (e) {
+
+ }
this.value=value.join(',');
this.text=text.join(',')
this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:mapFields});
--
Gitblit v1.9.3