From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/common/operation.vue | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/views/common/operation.vue b/src/views/common/operation.vue
index 6c75fdd..85af14d 100644
--- a/src/views/common/operation.vue
+++ b/src/views/common/operation.vue
@@ -17,7 +17,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="commonOperationTable"
>
@@ -90,6 +90,15 @@
minWidth: '100',
prop: 'name',
label: '宸ュ簭鍚嶇О',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '100',
+ prop: 'remark',
+ label: '澶囨敞',
sort: true,
isTrue: true,
isSearch: true,
@@ -178,6 +187,9 @@
components: {
ttable
},
+ mounted(){
+ this.options.multiSelect = this.multiSelect
+ },
methods: {
saveSelectRow() {
if (this.multiSelect) {
@@ -219,6 +231,9 @@
this.getData()
})
}
+ },
+ multiSelect(){
+ this.options.multiSelect = this.multiSelect
}
}
}
--
Gitblit v1.9.3