From 52ffefd06e59cbd56c1a919972866592379cfed2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 21 九月 2023 11:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 165 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 126 insertions(+), 39 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 20bcad7..65775e1 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="referConfig.options.width|| '80%'">
+ :width="options.width|| '80%'"
+ :height="options.height|| 'auto'">
<avue-crud :option="option"
:table-loading="loading"
:data="data"
@@ -15,21 +16,23 @@
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
+ @row-click="rowClick"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
+ <template slot="icon" slot-scope="scope">
+ <i :class="scope.row.icon" style="font-size:24px"></i>
+ </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>
</el-dialog>
- <avue-input v-model="text" :placeholder="title" @click="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" :placeholder="title" @click="!disabled && (visible=true)"></avue-input>
</div>
</template>
@@ -38,11 +41,11 @@
import {getList,getLazyList,getTableDefinedUrl} from "@/api/refer/table";
export default {
name: "vciWebReferTable",
- props:["referConfig","value","text","title"],
+ props:["referConfig","value","text","title","disabled"],
data() {
return {
visible: false,
- options: this.referConfig.options,
+ options: this.referConfig.options || {},
isMuti: ("true" == this.referConfig.options.isMuti || this.referConfig.options.isMuti == true || this.referConfig.options.muti == true) ? true : false,
props: {
value: this.referConfig.valueField || this.referConfig.options.valueField || 'oid',
@@ -56,16 +59,10 @@
page: {
pageSize: 10,
currentPage: 1,
- total: 0
+ total: this.referConfig.options.data?this.referConfig.options.data.length :0
},
data:this.referConfig.options.data || [],
selectionList: [],
- objTree: {//鐢ㄤ簬琛ㄦ牸鏍戯紝鐩墠杩樻病鍔犱笂浣跨敤
- keyId: 'oid',//鏍戝舰id瀛楁鍚嶇О
- keyPid: 'parentSaleProduct',//鏍戝舰鐖秈d瀛楁鍚嶇О
- title: 'id',//浠ユ爲褰㈠紡鏄剧ず鐨勫瓧娈�
- defaultShow: false//榛樿鎶樺彔
- },
option: {
addBtn: false,
height: this.referConfig.options.height ? this.referConfig.options.height : 475,
@@ -78,19 +75,32 @@
border: true,
index: true,
selection: true,
+ reserveSelection:true,
dialogClickModal: false,
highlightCurrentRow: true,
+ rowKey:'oid',
+ rowParentKey:'parentSaleProduct',
column: []
}
};
},
created() {
this.getParams();
- console.log('referConfig:')
- console.log(this.referConfig)
},
mounted() {
+ if(this.referConfig.options.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(!validatenull(this.referConfig.options.tableConfig.limit)){
+ this.page.pageSize=this.referConfig.options.tableConfig.limit
+ }
+ this.$nextTick(() => {
+ this.$refs.referCrud.doLayout()
+ })
},
+
computed:{
valueInfo:function (){
return this.text ? ("宸茶缃殑鍊间负[" + this.text + "]"): '鏈缃��'
@@ -120,9 +130,15 @@
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;//瀛楁
+ }
+ if(this.options.sortField){
+ queryParams['sort'] = this.options.sortField;//瀛楁
+ }
+ if(this.options.sortType){
+ queryParams['order'] = this.options.sortType;//鏂规硶
}
if (this.options.conditionParams) {
//璇存槑鏄墿灞曞睘鎬�
@@ -155,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)){
@@ -190,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,
@@ -223,7 +245,6 @@
if(!tableConfig){
this.$message.error( '娌℃湁瀹氫箟鍙傜収鐨勮〃鏍奸厤缃�');
}
- this.page.pageSize=tableConfig.page.limit || 10;
if(!paramsData){
paramsData = {
currentUserReferModelKey:this.options.currentUserReferModelKey,
@@ -237,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
+ })
}
}
})
@@ -255,10 +294,10 @@
},
setValue(){
if(this.selectionList.length==0){
- this.$message.error( '娌℃湁閫夋嫨鏁版嵁');
+ this.$message.warning( '娌℃湁閫夋嫨鏁版嵁');
return false;
}else if(this.selectionList.length>1 && !this.isMuti){
- this.$message.error( '姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
+ this.$message.warning( '姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
return false;
}
@@ -270,25 +309,48 @@
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 =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});
+ 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() {
@@ -298,7 +360,7 @@
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
- this.onLoad(this.page, params);
+ this.onLoad(this.page);
done();
},
currentChange(currentPage){
@@ -306,6 +368,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) {
@@ -321,15 +388,35 @@
refreshChange() {
this.onLoad(this.page, this.query);
},
- onLoad(page, params = this.params) {
+ onLoad(page, params={}) {
if(this.url){
this.loading = true;
- getList(Object.assign(params, this.query),page.currentPage, page.pageSize, this.url).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
+ var query={}
+ if (this.query) {
+ for (var key in this.query) {
+ query['conditionMap["' + key + '"]'] = this.query[key];
+ }
+ }
+ getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
+ 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