From 375041c3d6d2ecb2228dcaa3cbefa079da40a8dd Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 24 八月 2023 15:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index d74fc46..7e53e35 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -16,6 +16,7 @@
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
+ @row-click="rowClick"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@@ -83,8 +84,6 @@
},
created() {
this.getParams();
- // console.log('referConfig:')
- // console.log(this.referConfig)
},
mounted() {
if(this.referConfig.options.page){
@@ -179,12 +178,18 @@
} else {
this.option.column = this.options.tableConfig.cols.map(item => {
if (item.field != 'LAY_TABLE_INDEX' && item.field != 'LAY_CHECKED') {
+ let formatter=item.template || item.templet;
+ if(typeof formatter == "string" && formatter !=''){
+ formatter=eval("(" + formatter + ")")
+ }
return {
...item,
label: item.title,
prop: item.field,
- formatter:item.template,
- search: true
+ formatter:formatter,
+ search:this.options.tableConfig.queryColumns.some(qItem=>{
+ return qItem.field==item.field
+ })
}
}
})
@@ -235,7 +240,7 @@
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});
+ this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:this.referConfig.fieldMap});
this.visible=false;
},
searchReset() {
@@ -253,6 +258,11 @@
},
sizeChange(pageSize){
this.page.pageSize = pageSize;
+ },
+ rowClick (row) {
+ this.$refs.referDefalutCrud.toggleSelection();
+ this.$refs.referDefalutCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+ this.selectionList=[row]
},
selectionChange(list) {
if (!this.isMuti && list.length > 1) {
@@ -278,8 +288,8 @@
}
}
getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url, this.method).then(res => {
- this.data = res.data.records;
- this.page.total=res.data.total
+ this.data = res.data.records || res.data.data.records;
+ this.page.total=res.data.total || res.data.data.total;
this.loading = false;
this.selectionClear();
}).catch(error=>{
--
Gitblit v1.9.3