From 0a3b4bac16a4cf49deaddc6b4f3a2aeee90e9061 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 21 五月 2024 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/common/operation.vue | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/views/common/operation.vue b/src/views/common/operation.vue
index cef559f..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"
>
@@ -97,6 +97,15 @@
},
{
minWidth: '100',
+ prop: 'remark',
+ label: '澶囨敞',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ }/*,
+ {
+ minWidth: '100',
prop: 'productionCounting',
label: '鏄惁鎶ュ伐',
sort: true,
@@ -159,7 +168,7 @@
optList: () => {
return this.getChangeList()
}
- }
+ } */
]
},
addOrUpdateVisible: false,
@@ -177,6 +186,9 @@
},
components: {
ttable
+ },
+ mounted(){
+ this.options.multiSelect = this.multiSelect
},
methods: {
saveSelectRow() {
@@ -219,6 +231,9 @@
this.getData()
})
}
+ },
+ multiSelect(){
+ this.options.multiSelect = this.multiSelect
}
}
}
--
Gitblit v1.9.3