Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -352,69 +352,69 @@
|
|||||||
<div class="details-content-modular basic-information" style="margin-bottom: 0">
|
<div class="details-content-modular basic-information" style="margin-bottom: 0">
|
||||||
<div class="basic-information-content">
|
<div class="basic-information-content">
|
||||||
<p class=""><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
|
<p class=""><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
|
||||||
<template v-for="(child, childIndex) in item.child1">
|
<p><template v-for="(child, childIndex) in item.child1" >
|
||||||
<div class="files-title" style="border-bottom: 1px solid #E5E5E5">
|
<div class="files-title">
|
||||||
<label style="float: left;min-height: 43px;line-height: 43px;">{{ child.attrName }}</label>
|
<label style="float: left;min-height: 43px;line-height: 43px;" >{{ child.attrName }}</label>
|
||||||
<template style="margin-left: 220px;">
|
<template style="margin-left: 220px;">
|
||||||
<div style="position: relative;margin-left: 214px;min-height: 42px;">
|
<div style="position: relative;margin-left: 214px;min-height: 42px;">
|
||||||
<div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex">
|
<div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex">
|
||||||
<!-- 单个文件-->
|
<!-- 单个文件-->
|
||||||
<span v-if="child.value && child.value.length > 0 && child.value.length === 1">
|
<span v-if="child.value && child.value.length > 0 && child.value.length === 1">
|
||||||
<a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis50 }}</a>
|
<a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis50 }}</a>
|
||||||
<i
|
<i
|
||||||
title="下载"
|
title="下载"
|
||||||
@click="downloadFile(file.id)"
|
@click="downloadFile(file.id)"
|
||||||
class="icon-download"
|
class="icon-download"
|
||||||
v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
|
v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
|
||||||
/>
|
/>
|
||||||
<i
|
<i
|
||||||
title="下载带水印"
|
title="下载带水印"
|
||||||
v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
|
v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
|
||||||
@click="downloadFileByWater(file.id, file.fileSuffix)"
|
@click="downloadFileByWater(file.id, file.fileSuffix)"
|
||||||
class="icon-download2"
|
class="icon-download2"
|
||||||
v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
|
v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
|
||||||
/>
|
/>
|
||||||
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
|
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
|
||||||
</span>
|
</span>
|
||||||
<!-- 多个文件-->
|
<!-- 多个文件-->
|
||||||
<div v-else-if="child.value && child.value.length > 0" style="line-height: 50px;">
|
<div v-else-if="child.value && child.value.length > 0" style="line-height: 50px;">
|
||||||
<span>
|
<span>
|
||||||
<a style="font-size: 16px;color: #409EFF;cursor: pointer"
|
<a style="font-size: 16px;color: #409EFF;cursor: pointer"
|
||||||
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
|
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
|
||||||
:title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
|
:title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
|
||||||
<i
|
<i
|
||||||
title="下载"
|
title="下载"
|
||||||
@click="downloadFile(file.id)"
|
@click="downloadFile(file.id)"
|
||||||
class="icon-download"
|
class="icon-download"
|
||||||
v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
|
v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
|
||||||
/>
|
/>
|
||||||
<i
|
<i
|
||||||
title="下载带水印"
|
title="下载带水印"
|
||||||
@click="downloadFileByWater(file.id, file.fileSuffix)"
|
@click="downloadFileByWater(file.id, file.fileSuffix)"
|
||||||
class="icon-download2"
|
class="icon-download2"
|
||||||
v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
|
v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
|
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
|
||||||
|
</div>
|
||||||
|
<!-- <el-button-->
|
||||||
|
<!-- v-if="child.attrField === itemNam "-->
|
||||||
|
<!-- v-for="(itemNam,index) in itemExistList"-->
|
||||||
|
<!-- :key="index"-->
|
||||||
|
<!-- @click="showItemsModel(child.attrField)"-->
|
||||||
|
<!-- class="decomposition-btn"-->
|
||||||
|
<!-- style="right:62px"-->
|
||||||
|
<!-- icon="icon-separate"-->
|
||||||
|
<!-- >标准分解单-->
|
||||||
|
<!-- </el-button>-->
|
||||||
|
<!-- <el-button v-if="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)">更多</el-button>-->
|
||||||
</div>
|
</div>
|
||||||
<!-- <el-button-->
|
|
||||||
<!-- v-if="child.attrField === itemNam "-->
|
|
||||||
<!-- v-for="(itemNam,index) in itemExistList"-->
|
|
||||||
<!-- :key="index"-->
|
|
||||||
<!-- @click="showItemsModel(child.attrField)"-->
|
|
||||||
<!-- class="decomposition-btn"-->
|
|
||||||
<!-- style="right:62px"-->
|
|
||||||
<!-- icon="icon-separate"-->
|
|
||||||
<!-- >标准分解单-->
|
|
||||||
<!-- </el-button>-->
|
|
||||||
<!-- <el-button v-if="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)">更多</el-button>-->
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<template v-if="child.value === null" >-</template>
|
<template v-if="child.value === null" >-</template>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template></p>
|
||||||
<p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
|
<p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
|
||||||
<p v-if="activeState" style="border-bottom: none;"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
|
<p v-if="activeState" style="border-bottom: none;"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
|
||||||
<p class="half">
|
<p class="half">
|
||||||
|
|||||||
@@ -1059,6 +1059,8 @@
|
|||||||
<el-upload
|
<el-upload
|
||||||
multiple
|
multiple
|
||||||
drag
|
drag
|
||||||
|
:limit="8"
|
||||||
|
:on-exceed="handleExceed"
|
||||||
:file-list="fileList"
|
:file-list="fileList"
|
||||||
:action="fileUrl"
|
:action="fileUrl"
|
||||||
ref="importfile"
|
ref="importfile"
|
||||||
@@ -1921,6 +1923,10 @@ export default {
|
|||||||
// },
|
// },
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
//限制上传文件个数
|
||||||
|
handleExceed (files, fileList) {
|
||||||
|
this.$message.warning(`当前限制选择 8 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
|
||||||
|
},
|
||||||
// 标准来源改变事件
|
// 标准来源改变事件
|
||||||
standInChange(val) {
|
standInChange(val) {
|
||||||
this.verifySarStandard = false
|
this.verifySarStandard = false
|
||||||
|
|||||||
@@ -1375,6 +1375,8 @@
|
|||||||
<el-upload
|
<el-upload
|
||||||
multiple
|
multiple
|
||||||
drag
|
drag
|
||||||
|
:limit="8"
|
||||||
|
:on-exceed="handleExceed"
|
||||||
:file-list="fileList"
|
:file-list="fileList"
|
||||||
:action="fileUrl"
|
:action="fileUrl"
|
||||||
ref="importfile"
|
ref="importfile"
|
||||||
@@ -1837,6 +1839,10 @@ export default {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
//限制上传文件个数
|
||||||
|
handleExceed (files, fileList) {
|
||||||
|
this.$message.warning(`当前限制选择 8 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
|
||||||
|
},
|
||||||
// 标准来源改变事件
|
// 标准来源改变事件
|
||||||
standInChange(val) {
|
standInChange(val) {
|
||||||
this.verifySarStandard = false
|
this.verifySarStandard = false
|
||||||
|
|||||||
@@ -538,7 +538,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-back
|
|
||||||
show-transfer
|
show-transfer
|
||||||
show-submit
|
show-submit
|
||||||
:transfer-loading="isTransfer"
|
:transfer-loading="isTransfer"
|
||||||
|
|||||||
Reference in New Issue
Block a user