From 584ae5476c319cd1551a97b64c01ee1e5e5ff5a6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 25 十月 2023 15:46:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/task.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index 31e4f0d..51132be 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -20,7 +20,8 @@
size="small"
plain
icon="el-icon-refresh-right"
- @click="handleSend">鎵嬪姩鎺ㄩ��
+ v-if="permission.task.task_sendPush"
+ @click="handleSend" >鎵嬪姩鎺ㄩ��
</el-button>
<div style="float: right;margin-left: 10px">
<vci-docking-search :formInline="formInline" :SearchObject="SearchObject" :page="page" :status="status" @getList="dockingGetList"></vci-docking-search>
@@ -120,9 +121,11 @@
option: {
height:'auto',
calcHeight: 0,
+ columnBtn:false,
tip: false,
searchShow: false,
- searchMenuSpan: 6,
+ searchShowBtn:false,
+ // searchMenuSpan: 6,
border: true,
index: true,
viewBtn: true,
--
Gitblit v1.9.3