From cfededd9721be4322e660fc879f11a806fcc7963 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期二, 20 六月 2023 17:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 9558693..348fc9b 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -27,7 +27,7 @@
</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>
@@ -38,7 +38,7 @@
import {getList,getLazyList,getTableDefinedUrl} from "@/api/refer/table";
export default {
name: "vciWebReferDefalut",
- props:["referConfig","value","text","title"],
+ props:["referConfig","value","text","title","disabled"],
data() {
return {
visible: false,
@@ -62,7 +62,7 @@
selectionList: [],
option: {
addBtn: false,
- height: this.referConfig.options.height ? this.referConfig.options.height : 475,
+ //height: this.referConfig.options.height ? this.referConfig.options.height : 475,
calcHeight: 30,
tip: false,
menu:false,
@@ -180,6 +180,7 @@
...item,
label: item.title,
prop: item.field,
+ formatter:item.template,
search: true
}
}
@@ -241,7 +242,7 @@
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
- this.onLoad(this.page, params);
+ this.onLoad(this.page);
done();
},
currentChange(currentPage){
@@ -253,24 +254,30 @@
selectionChange(list) {
if (!this.isMuti && list.length > 1) {
const nowVal = list.shift();
- this.$refs.referCrud.toggleRowSelection(nowVal, false);
+ this.$refs.referDefalutCrud.toggleRowSelection(nowVal, false);
}
this.selectionList = list
},
selectionClear() {
this.selectionList = [];
- this.$refs.referCrud.clearSelection();
+ this.$refs.referDefalutCrud.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 => {
- const data = res.data.data;
+ var query={}
+ if (this.query) {
+ for (var key in this.query) {
+ query['conditionMap["' + key + '"]'] = this.query[key];
+ }
+ }
+ getList(Object.assign(params,this.params, query,this.query),page.currentPage, page.pageSize, this.url).then(res => {
+ const data = res.data;
this.page.total = data.total;
- this.data = data.records;
+ this.data = data.data;
this.loading = false;
this.selectionClear();
});
--
Gitblit v1.9.3