From 421ddd26a852c46e703391bddda6638956468582 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 十二月 2023 15:29:13 +0800
Subject: [PATCH] 参照referConfig为空报错处理
---
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index c088933..04575e8 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -29,9 +29,7 @@
</div>
</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>
- -->
+ <avue-input v-model="text" :disabled="disabled" :readonly="true" :placeholder="title" @click="!disabled && (visible=true)" ></avue-input>
</div>
</template>
@@ -40,7 +38,7 @@
import {getList,getLazyList,getTableDefinedUrl} from "@/api/refer/table";
export default {
name: "vciWebReferDefalut",
- props:["referConfig","value","text","title","disabled"],
+ props:["referConfig","value","text","title","disabled","referType"],
data() {
return {
visible: false,
@@ -57,6 +55,7 @@
query: {},
loading: false,
page: {
+ layout: this.referType === "master" ? "total,pager,prev, next,jumper" : "total,pager,prev, next,jumper,sizes",
pageSize: 10,
currentPage: 1,
total: this.referConfig.options.data?this.referConfig.options.data.length :0
@@ -65,6 +64,7 @@
selectionList: [],
option: {
addBtn: false,
+ columnBtn:false,
//height: this.referConfig.options.height ? this.referConfig.options.height : 475,
calcHeight: 30,
tip: false,
@@ -86,11 +86,13 @@
this.getParams();
},
mounted() {
- if(this.referConfig.options.tableConfig.page){
- this.page.pageSize=this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
- 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
+ if (this.referConfig.options.tableConfig && this.referConfig.options.tableConfig.page) {
+ this.page.pageSize = this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
+ 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 (this.referConfig.options.tableConfig && !validatenull(this.referConfig.options.tableConfig.limit)) {
+ this.page.pageSize = this.referConfig.options.tableConfig.limit;
}
},
computed:{
@@ -122,7 +124,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;//瀛楁
}
@@ -286,11 +288,14 @@
text.push(itemText);
}
})
- let mapFields;
- if (this.options.mapFields == "") {
- mapFields = this.referConfig.fieldMap;
- } else {
- 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(',')
--
Gitblit v1.9.3