Merge remote-tracking branch 'origin/main'

This commit is contained in:
2024-10-12 08:46:45 +08:00
2 changed files with 119 additions and 13 deletions
@@ -81,7 +81,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never" style="margin:10px 10px 0 10px">
<table-tool :label="( checkData.unionname ? checkData.unionname : '全部分工会' ) + '资料列表'" :app="this">
<template #func>
<el-button v-if="checkData.unionname" type="primary" size="small" @click="exportAllFileByUnionId">导出全部资料</el-button>
<el-button v-if="checkData.id" type="primary" size="small" @click="exportAllFileByUnionId">导出全部资料</el-button>
</template>
</table-tool>
<el-table :data="tableData" @sort-change='pageOrder' height="626">
@@ -102,13 +102,17 @@ layout("/layouts/platform.html"){
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{type:'view',data:scope.row}">
预览
预览资料
</el-dropdown-item>
<el-dropdown-item
v-if="(${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')})"
:command="{type:'edit',data:scope.row}">
编辑
</el-dropdown-item>
<el-dropdown-item
:command="{type:'download',data:scope.row}">
导出附件
</el-dropdown-item>
<el-dropdown-item
v-if="(${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')})"
:command="{type:'delete',data:scope.row}">
@@ -140,8 +144,8 @@ layout("/layouts/platform.html"){
<el-form-item label="上传人">
<el-input readonly value="${@shiro.getPrincipalProperty('username')}"></el-input>
</el-form-item>
<el-form-item label="所属工会">
<el-input readonly :value="checkData.unionname ? checkData.unionname : '${@shiro.getPrincipalProperty('union').getUnionname()}'"></el-input>
<el-form-item label="资料归属工会">
<el-input readonly :value="checkData.id ? checkData.unionname : '${@shiro.getPrincipalProperty('union').getUnionname()}'"></el-input>
</el-form-item>
<el-form-item prop="revelName" label="资料名称">
<el-input placeholder="请填写工作资料名称" v-model="formData.revelName"></el-input>
@@ -167,9 +171,9 @@ layout("/layouts/platform.html"){
</el-form>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="addDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="doAdd">确 定</el-button>
</span>
<el-button @click="addDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="doAdd">确 定</el-button>
</span>
</el-dialog>
<el-dialog title="编辑资料" :visible.sync="editDialogVisible">
@@ -177,6 +181,9 @@ layout("/layouts/platform.html"){
<el-form-item label="上传人">
<el-input readonly v-model="formData.username"></el-input>
</el-form-item>
<el-form-item label="资料归属工会">
<el-input readonly v-model="formData.belongToUnionName"></el-input>
</el-form-item>
<el-form-item prop="revelName" label="资料名称">
<el-input placeholder="请填写工作资料名称" v-model="formData.revelName"></el-input>
</el-form-item>
@@ -191,7 +198,12 @@ layout("/layouts/platform.html"){
</el-select>
</el-form-item>
<el-form-item prop="files" label="附件上传">
<file-upload :files.sync="formData.files"></file-upload>
<file-upload :files.sync="formData.files" card
:type="['doc','docx','xls','xlsx','pdf','ppt', 'jpg', 'png', 'jpeg']">
<template #el-upload__tip>
</template>
</file-upload>
<div class="el-upload__tip">可上传照片、文档等资料</div>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -288,6 +300,8 @@ layout("/layouts/platform.html"){
const url = '/platform/wakeshome/data/revel/exportAllFileByUnionId?unionId=' + unionId + '&unionName=' + unionName
window.open(url)
},
exportAllFileById(data) {
window.open('/platform/wakeshome/data/revel/exportAllFileById?id=' + data.id)
},
async handleNodeClick(data, node) {
this.checkData = data
@@ -312,8 +326,8 @@ layout("/layouts/platform.html"){
this.openEdit(data)
} else if (type === 'delete') {
this.doDelete(data.id)
} else if (type === 'audit') {
this.doAudit(data.id)
} else if (type === 'download') {
this.exportAllFileById(data)
}
},
doDelete(id) {