From e90fea95905f523d278c7e10a181ddbc47e74c2b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 九月 2023 15:44:58 +0800
Subject: [PATCH] 集成日志bug
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 66 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index f71cc78..d1cf586 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -5,7 +5,7 @@
:visible.sync="visible"
top="0"
class="avue-dialog avue-dialog--top"
- :width="referConfig.options.width|| '80%'">
+ :width="options.width|| '80%'">
<avue-crud :option="option"
:table-loading="loading"
:data="data"
@@ -15,6 +15,7 @@
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
+ @row-click="rowClick"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@@ -24,13 +25,13 @@
</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 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>
@@ -41,11 +42,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',
@@ -75,6 +76,7 @@
border: true,
index: true,
selection: true,
+ reserveSelection:true,
dialogClickModal: false,
highlightCurrentRow: true,
rowKey:'oid',
@@ -85,8 +87,8 @@
},
created() {
this.getParams();
- console.log('referConfig:')
- console.log(this.referConfig)
+ // console.log('referConfig:')
+ // console.log(this.referConfig)
},
mounted() {
if(this.referConfig.options.page){
@@ -94,6 +96,7 @@
this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
}
},
+
computed:{
valueInfo:function (){
return this.text ? ("宸茶缃殑鍊间负[" + this.text + "]"): '鏈缃��'
@@ -158,6 +161,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)){
@@ -240,12 +244,18 @@
//璇存槑浼犻�掍簡鐨�
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
+ })
}
}
})
@@ -273,7 +283,7 @@
this.selectionList.forEach((item,_index) =>{
if(isMutiValue){
var valueFieldArray = _that.props.value.split(",");
- valueFieldArray.forEach((_indexField,_itemField)=>{
+ valueFieldArray.forEach((_itemField,_indexFiel)=>{
value.push( item[_itemField] + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
})
}else {
@@ -281,7 +291,7 @@
}
if(isMutiRaw) {
var rawFieldArray = _that.props.label.split(",");
- rawFieldArray.forEach((_indexField,_itemField)=>{
+ rawFieldArray.forEach((_itemField,_indexField)=>{
text.push(item[_itemField] + (_that.referConfig.textSep?_that.referConfig.textSep:' ')) ;
})
}else{
@@ -291,7 +301,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() {
@@ -301,7 +311,7 @@
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
- this.onLoad(this.page, params);
+ this.onLoad(this.page);
done();
},
currentChange(currentPage){
@@ -309,6 +319,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) {
@@ -319,20 +334,33 @@
},
selectionClear() {
this.selectionList = [];
- this.$refs.referCrud.clearSelection();
+ this.$refs.referCrud.toggleSelection();
},
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 => {
- debugger;
- this.page.total = res.total;
- this.data = res.data;
+ 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 => {
+ if(res.data.records){
+ this.data = res.data.records
+ this.page.total=res.data.total ;
+ }else{
+ this.data = res.data.data.records;
+ this.page.total=res.data.data.total;
+ }
this.loading = false;
this.selectionClear();
+ }).catch(error=>{
+ this.$message.error(error);
+ this.loading = false;
});
}
--
Gitblit v1.9.3