From a216d2503641b1d2ae6d4a2defa870470f2737bb Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 18 九月 2023 14:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 118 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 95 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 31782b5..f3044e6 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -5,7 +5,8 @@
:visible.sync="visible"
top="0"
class="avue-dialog avue-dialog--top"
- :width="options.width|| '80%'">
+ :width="options.width|| '80%'"
+ :height="options.height|| 'auto'">
<avue-crud :option="option"
:table-loading="loading"
:data="data"
@@ -15,6 +16,7 @@
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
+ @row-click="rowClick"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@@ -24,7 +26,7 @@
</template>
</avue-crud>
<div class="avue-dialog__footer">
- <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }}</div>
+ <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }} </div>
<el-button @click="visible=false">鍙� 娑�</el-button>
<el-button @click="setValue" type="primary">纭� 瀹�</el-button>
</div>
@@ -75,6 +77,7 @@
border: true,
index: true,
selection: true,
+ reserveSelection:true,
dialogClickModal: false,
highlightCurrentRow: true,
rowKey:'oid',
@@ -85,15 +88,19 @@
},
created() {
this.getParams();
- console.log('referConfig:')
- console.log(this.referConfig)
},
mounted() {
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;
+ 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
}
+ this.$nextTick(() => {
+ this.$refs.referCrud.doLayout()
+ })
},
+
computed:{
valueInfo:function (){
return this.text ? ("宸茶缃殑鍊间负[" + this.text + "]"): '鏈缃��'
@@ -127,6 +134,12 @@
queryParams['order'] = this.options.initSort.type;//鏂规硶
queryParams['sort'] = this.options.initSort.field;//瀛楁
}
+ if(this.options.sortField){
+ queryParams['sort'] = this.options.sortField;//瀛楁
+ }
+ if(this.options.sortType){
+ queryParams['order'] = this.options.sortType;//鏂规硶
+ }
if (this.options.conditionParams) {
//璇存槑鏄墿灞曞睘鎬�
for (var key in this.options.conditionParams) {
@@ -158,6 +171,7 @@
if(this.options.displayTable){
//璇存槑鏄娇鐢ㄥ钩鍙扮殑琛ㄦ牸
getTableDefinedUrl({btmType:(this.options.referBo||this.options.referType),code:this.options.displayTable,isMuti:this.isMuti},this.tableDefinedUrl).then(result => {
+ console.log('result',result)
if(result.success){
var queryScheme = result.querySchema;
if(!validatenull(queryScheme) && validatenull(this.options.queryScheme)){
@@ -193,11 +207,16 @@
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){
+ 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,
label: item.title,
@@ -226,7 +245,6 @@
if(!tableConfig){
this.$message.error( '娌℃湁瀹氫箟鍙傜収鐨勮〃鏍奸厤缃�');
}
- this.page.pageSize=tableConfig.page.limit || 10;
if(!paramsData){
paramsData = {
currentUserReferModelKey:this.options.currentUserReferModelKey,
@@ -240,12 +258,30 @@
//璇存槑浼犻�掍簡鐨�
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 + ")")
+ }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,
label: item.title,
prop: item.field,
- formatter:item.template,
- search: true
+ formatter:formatter,
+ sortable:item.sort,
+ hide:item.hidden,
+ search: this.options.tableConfig.queryColumns.some(qItem=>{
+ return qItem.field==item.field
+ })
}
}
})
@@ -273,25 +309,41 @@
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,_indexField)=>{
+ let itemValue=item[_itemField];
+ if(itemValue==undefined || itemValue == null){
+ itemValue=item['data'][_itemField]
+ }
+ value.push( itemValue + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
})
}else {
- value.push(item[_that.props.value]);
+ let itemValue=item[_that.props.value];
+ if(itemValue==undefined || itemValue == null){
+ itemValue=item['data'][_that.props.value]
+ }
+ value.push(itemValue);
}
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)=>{
+ let itemText=item[_itemField];
+ if(itemText==undefined || itemText == null){
+ itemText=item['data'][_itemField]
+ }
+ text.push(itemText + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
})
}else{
- text.push(item[_that.props.label]);
+ let itemText=item[_that.props.label];
+ if(itemText==undefined || itemText == null){
+ itemText=item['data'][_that.props.label]
+ }
+ text.push(itemText);
}
})
-
+ let mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(this.options.mapFields)) ;
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:mapFields});
this.visible=false;
},
searchReset() {
@@ -309,6 +361,11 @@
},
sizeChange(pageSize){
this.page.pageSize = pageSize;
+ },
+ rowClick (row) {
+ this.$refs.referCrud.toggleSelection();
+ this.$refs.referCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+ this.selectionList=[row]
},
selectionChange(list) {
if (!this.isMuti && list.length > 1) {
@@ -334,10 +391,25 @@
}
}
getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
- this.data = res.data.records;
- this.page.total=res.data.total
+ let data=[]
+ if(res.data.records){
+ data = res.data.records
+ this.page.total=res.data.total ;
+ }else{
+ data = res.data.data.records;
+ this.page.total=res.data.data.total;
+ }
+ this.data=data.map(item => {
+ item.data=item.data || {}
+ return {
+ ...item
+ }
+ })
this.loading = false;
this.selectionClear();
+ }).catch(error=>{
+ this.$message.error(error);
+ this.loading = false;
});
}
--
Gitblit v1.9.3