From fecc7305a48f8ce6e283434718da33e143885c75 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 四月 2024 10:03:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index 0a6ecb1..5c04b55 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -7,6 +7,7 @@
:page.sync="pageType"
:table-loading="loading"
@row-click="rowClickChange"
+ @search-change='searchChange'
@selection-change="selectChange">
<!--top鍖哄煙鎸夐挳-->
<template slot="menuLeft" slot-scope="scope">
@@ -24,7 +25,6 @@
</template>
<script>
-import {treeMenu} from '@/api/treeMyMenu'
import {validatenull} from '@/util/validate'
export default {
name: "dynamic-table",
@@ -514,7 +514,7 @@
});
},
pageType() {
- return this.areasName.indexOf('westArea') == 0 ? this.simplePage : this.page;
+ return this.areasName === 'westArea' ? this.simplePage : this.page;
}
},
watch: {
@@ -538,13 +538,6 @@
this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
}
}
- },
- sourceData:{
- handler(newval) {
- //婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
- console.log(this.areasName);
- console.log(newval);
- }
}
},
created() {
@@ -562,6 +555,10 @@
},
selectChange(row) {
this.selectList = row;
+ },
+ searchChange(form,done){
+ console.log(form)
+ done()
this.$emit("setDataStore", {
area: this.areasName,
dataStore:row
--
Gitblit v1.9.3