From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/data.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index c556696..1e14d7a 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -16,14 +16,14 @@
@refresh-change="refreshChange"
@on-load="onLoad">
<template slot-scope="scope" slot="menuLeft">
- <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status"></vci-docking-search>
+ <vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status" @getList="dockingGetList"></vci-docking-search>
</template>
</avue-crud>
</basic-container>
</template>
<script>
-import {getList} from "@/api/docking/data";
+import {getDataList} from "@/api/docking/data";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
import website from "@/config/website";
@@ -90,6 +90,7 @@
calcHeight: 0,
tip: false,
searchShow: false,
+ searchShowBtn:false,
searchMenuSpan: 6,
border: true,
index: true,
@@ -189,6 +190,12 @@
}
},
methods: {
+ dockingGetList(val){
+ this.data=val.records;
+ this.page.pageSize=val.size;
+ this.page.currentPage=val.current;
+ this.page.total=val.total;
+ },
async cellDbClick(row, column, cell, event) {
for (const key in row) {
if (key === column.property) {
@@ -236,7 +243,7 @@
query['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
+ getDataList(page.currentPage, page.pageSize, Object.assign(params,this.params, query,this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
--
Gitblit v1.9.3