From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/resource/attach.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/resource/attach.vue b/Source/UBCS-WEB/src/views/resource/attach.vue
index 59e2475..03253a7 100644
--- a/Source/UBCS-WEB/src/views/resource/attach.vue
+++ b/Source/UBCS-WEB/src/views/resource/attach.vue
@@ -20,7 +20,7 @@
<el-button type="primary"
size="small"
plain
- v-if="permission.attach_upload"
+ v-if="permissionList.upload"
icon="el-icon-upload2"
@click="handleUpload">涓� 浼�
</el-button>
@@ -28,7 +28,7 @@
size="small"
icon="el-icon-delete"
plain
- v-if="permission.attach_delete"
+ v-if="permissionList.delBtn"
@click="handleDelete">鍒� 闄�
</el-button>
</template>
@@ -36,7 +36,7 @@
<el-button type="text"
icon="el-icon-download"
size="small"
- v-if="permission.attach_download"
+ v-if="permissionList.download"
@click="handleDownload(scope.row)">涓嬭浇
</el-button>
</template>
@@ -73,8 +73,9 @@
attachBox: false,
selectionList: [],
option: {
+ columnBtn:false,
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -160,7 +161,7 @@
propsHttp: {
res: 'data'
},
- action: "/api/blade-resource/oss/endpoint/put-file-attach"
+ action: "/api/ubcs-resource/oss/endpoint/put-file-attach"
}
]
}
@@ -173,7 +174,9 @@
addBtn: false,
editBtn: false,
viewBtn: false,
- delBtn: this.vaildData(this.permission.attach_delete, false)
+ delBtn: this.vaildData(this.permission.resource_attach.attach_delete, false),
+ upload: this.vaildData(this.permission.resource_attach.attach_upload, false),
+ download: this.vaildData(this.permission.resource_attach.attach_download, false),
};
},
ids() {
--
Gitblit v1.9.3