Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -65,26 +65,26 @@
|
||||
}}</span></p>
|
||||
<!--发布稿(必读)-->
|
||||
<template v-for="(child, childIndex) in item.child1">
|
||||
<div class="files-title" style="border-bottom: 1px solid #E5E5E5">
|
||||
<div class="files-titles" style="border-bottom: 1px solid #E5E5E5">
|
||||
<label style="margin-right: 164px;">{{ child.attrName }}</label>
|
||||
<template v-if="child.value && child.value.length > 0"
|
||||
v-for="(file, fileIndex) in child1Func(child.value)">
|
||||
<template v-if="child.value && child.value.length > 0">
|
||||
<!-- 单个文件时-->
|
||||
<div v-for="(file, fileIndex) in child1Func(child.value)">
|
||||
<span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
|
||||
<a style="font-size: 16px;color: #409EFF;cursor: pointer;"
|
||||
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
|
||||
:title="file.oldFileName">{{ file.oldFileName }}</a>
|
||||
<i
|
||||
title="下载"
|
||||
@click="downloadFile(file.id)"
|
||||
class="icon-download"
|
||||
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
|
||||
<a style="font-size: 16px;color: #409EFF;cursor: pointer;"
|
||||
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
|
||||
:title="file.oldFileName">{{ file.oldFileName }}</a>
|
||||
<i
|
||||
title="下载"
|
||||
@click="downloadFile(file.id)"
|
||||
class="icon-download"
|
||||
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
|
||||
/>
|
||||
<i
|
||||
title="下载带水印"
|
||||
@click="downloadFileByWater(file.id, file.fileSuffix)"
|
||||
class="icon-download2"
|
||||
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
|
||||
<i
|
||||
title="下载带水印"
|
||||
@click="downloadFileByWater(file.id, file.fileSuffix)"
|
||||
class="icon-download2"
|
||||
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
|
||||
/>
|
||||
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
|
||||
</span>
|
||||
@@ -116,10 +116,9 @@
|
||||
@click="showItemsModel(child.attrField)"
|
||||
class="decomposition-btn"
|
||||
style="right:62px"
|
||||
icon="icon-separate"
|
||||
>标准分解单
|
||||
</el-button>
|
||||
|
||||
</div>
|
||||
<!-- <el-button v-if="child.value && child.value.length > 1"-->
|
||||
<!-- style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
|
||||
<!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
|
||||
@@ -158,7 +157,6 @@
|
||||
@click="showItemsModel(child.attrField)"
|
||||
class="decomposition-btn"
|
||||
style="right:62px"
|
||||
icon="icon-separate"
|
||||
>标准分解单
|
||||
</el-button>
|
||||
<el-button v-if="child.value && child.value.length > 1"
|
||||
@@ -201,7 +199,6 @@
|
||||
@click="showItemsModel(child.attrField)"
|
||||
class="decomposition-btn"
|
||||
style="right:62px"
|
||||
icon="icon-separate"
|
||||
>标准分解单
|
||||
</el-button>
|
||||
<el-button v-if="child.value && child.value.length > 1"
|
||||
@@ -244,7 +241,6 @@
|
||||
@click="showItemsModel(child.attrField)"
|
||||
class="decomposition-btn"
|
||||
style="right:62px"
|
||||
icon="icon-separate"
|
||||
>标准分解单
|
||||
</el-button>
|
||||
<el-button v-if="child.value && child.value.length > 1"
|
||||
@@ -620,7 +616,6 @@
|
||||
:key="index"
|
||||
@click="showItemsModel(child.attrField)"
|
||||
class="decomposition-btn"
|
||||
icon="icon-separate"
|
||||
>标准分解单
|
||||
</el-button>
|
||||
|
||||
@@ -726,7 +721,6 @@
|
||||
:key="index"
|
||||
@click="showItemsModel(child.attrField)"
|
||||
class="decomposition-btn"
|
||||
icon="icon-separate"
|
||||
>标准分解单
|
||||
</el-button>
|
||||
|
||||
@@ -3889,6 +3883,15 @@ export default {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
.files-titles {
|
||||
a {
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
width: calc(~'100% - 40px');
|
||||
white-space: nowrap;
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
/deep/ .el-icon-circle-close:before {
|
||||
margin-left: 250px;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user