release-v1.0 #1

Merged
panchichun merged 57 commits from release-v1.0 into main 2024-09-13 17:04:18 +08:00
4 changed files with 11 additions and 9 deletions
Showing only changes of commit efe5304bc1 - Show all commits

View File

@ -22,7 +22,7 @@
<el-table :data="attachmentList" style="width: 100%">
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
<el-table-column label="附件名称" prop="fileName" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" width="100px">
<el-table-column label="操作" align="center" width="150px">
<template slot-scope="scope">
<el-button
size="mini"
@ -31,8 +31,8 @@
v-if="previewAuth(scope.row)"
@click="handlePreview(scope.row)"
>预览</el-button>
<!-- <el-button type="text" icon="el-icon-download" v-if="isShowOperation(scope.row) && !detailBoolean"
@click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>-->
<el-button type="text" icon="el-icon-download" v-if="form.downloadStatus"
@click="handleDownload(scope.row)" v-loading="loadingDownload">下载</el-button>
</template>
</el-table-column>
</el-table><!--el-table-->

View File

@ -37,7 +37,7 @@
</div>
<div class="sr">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置111</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</div>
</div>
</el-form>
@ -97,7 +97,7 @@
<!-- 工具详情对话框 -->
<el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" :show-close="false"
<el-drawer :visible.sync="detailDrawerOpen" :modal-append-to-body="false" :show-close="false" :wrapperClosable="false"
size="80%" class="no-padding" :close-on-press-escape="false" @close="handleCloseDetail()">
<template #title>
<span>{{toolTitle}}</span>

View File

@ -533,9 +533,9 @@ export default {
if(row.recordStatus=='done'){
result = true;
}
/* if(row.isHasApplyUse){
if(row.isHasApplyUse){
result = false;
} */
}
return result;
},
/**=============================申请使用End================================*/

View File

@ -49,7 +49,7 @@
<span>{{ parseTime(scope.row.createDate) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100px">
<el-table-column label="操作" align="center" width="150px">
<template slot-scope="scope">
<el-button
size="mini"
@ -58,7 +58,9 @@
v-if="previewAuth(scope.row)"
@click="handlePreview(scope.row)"
>预览</el-button>
<!-- <e-button type="text" icon="el-icon-download" v-if="isDownload && detailData.downloadStatus" @click="handleDownload(scope.row)" v-loading="loadingDownload">下载</e-button>-->
<el-button type="text" icon="el-icon-download" v-if="detailData.downloadStatus" @click="handleDownload(scope.row)" v-loading="loadingDownload">
下载
</el-button>
</template>
</el-table-column>
</el-table><!--el-table-->