From 108816cf6e7c2e211a487b4f14d6250a5bea732b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 14 九月 2023 18:28:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 37333e4..2de73b5 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -3,7 +3,7 @@
<basic-container>
<avue-crud :option="option"
:table-loading="loading"
- :data="data"
+ :data="data || getList"
:page.sync="page"
:permission="permissionList"
ref="crud"
@@ -16,7 +16,7 @@
@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>
@@ -218,6 +218,10 @@
}
},
methods: {
+ dockingGetList(val){
+ console.log(val,'val')
+ this.data=val;
+ },
async cellDbClick(row, column, cell, event) {
for (const key in row) {
if (key === column.property) {
--
Gitblit v1.9.3