合并
This commit is contained in:
@ -6,7 +6,7 @@
|
|||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<div class="box_btn">
|
<div class="box_btn">
|
||||||
<file-upload :limit="1" :uploadUrl="uploadUrl" :params="uploadParams" :on-upload-success="uploadFile" :fileType="[]">
|
<file-upload :limit="1" :uploadUrl="uploadUrl" :params="uploadParams" :on-upload-success="uploadFile" :fileType="[]">
|
||||||
<el-button type="primary" style="float: left" v-hasPermi="['design:collectFile:add']">
|
<el-button type="primary" style="float: left" v-hasPermi="['design:collectFile:upload']">
|
||||||
<el-icon size="small"><Upload /></el-icon>上传文件
|
<el-icon size="small"><Upload /></el-icon>上传文件
|
||||||
</el-button>
|
</el-button>
|
||||||
</file-upload>
|
</file-upload>
|
||||||
|
@ -146,7 +146,13 @@
|
|||||||
/></el-select>
|
/></el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-if="uploadForm.type == '3'" label="蓝图" prop="fileIds">
|
<el-form-item v-if="uploadForm.type == '3'" label="蓝图" prop="fileIds">
|
||||||
<file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.fileIds"></file-upload>
|
<file-upload
|
||||||
|
:fileType="['pdf']"
|
||||||
|
:isShowTip="false"
|
||||||
|
:fileSize="100"
|
||||||
|
v-hasPermi="['system:oss:upload']"
|
||||||
|
v-model="uploadForm.fileIds"
|
||||||
|
></file-upload>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-if="uploadForm.type == '1'" label="过程图纸" prop="cancellationIds">
|
<el-form-item v-if="uploadForm.type == '1'" label="过程图纸" prop="cancellationIds">
|
||||||
<file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.cancellationIds"></file-upload>
|
<file-upload :fileType="['pdf']" :isShowTip="false" :fileSize="100" v-model="uploadForm.cancellationIds"></file-upload>
|
||||||
|
@ -198,6 +198,7 @@
|
|||||||
v-model="file"
|
v-model="file"
|
||||||
ref="uploadRef"
|
ref="uploadRef"
|
||||||
uploadUrl="/formalities/formalitiesAnnex"
|
uploadUrl="/formalities/formalitiesAnnex"
|
||||||
|
v-hasPermi="['formalities:formalitiesAnnex:add']"
|
||||||
:data="{ formalitiesId: form.id }"
|
:data="{ formalitiesId: form.id }"
|
||||||
:fileType="['pdf']"
|
:fileType="['pdf']"
|
||||||
:auto-upload="false"
|
:auto-upload="false"
|
||||||
|
@ -93,7 +93,14 @@
|
|||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-tooltip content="修改进度" placement="top">
|
<el-tooltip content="修改进度" placement="top">
|
||||||
<el-button link type="primary" icon="Edit" size="small" @click="handleProgressUpdate(scope.row)"></el-button>
|
<el-button
|
||||||
|
link
|
||||||
|
type="primary"
|
||||||
|
v-hasPermi="['patch:master:editProgress']"
|
||||||
|
icon="Edit"
|
||||||
|
size="small"
|
||||||
|
@click="handleProgressUpdate(scope.row)"
|
||||||
|
></el-button>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<el-tooltip content="删除进度" placement="top">
|
<el-tooltip content="删除进度" placement="top">
|
||||||
<el-button
|
<el-button
|
||||||
|
Reference in New Issue
Block a user