Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
hanshaozhuang
2022-06-22 15:04:18 +08:00
2 changed files with 10 additions and 9 deletions
@@ -366,15 +366,13 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
/>
v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"></i>
<i
title="下载带水印"
v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
/>
v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"></i>
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</span>
<!-- 多个文件-->
@@ -387,14 +385,12 @@
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
/>
v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"></i>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
/>
v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"></i>
</span>
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</div>
@@ -430,7 +426,7 @@
v-for="(child, childIndex) in item.child"
v-if="child.isShowImp === '0'"
>
<p class="half">
<p class="half" v-if="sarStandardsInfoEO.standSort && sarStandardsInfoEO.standSort.indexOf('QCBFC') !== -1 && child.attrField === 'BARQ'">
<label style=" margin-right: 150px;" :title="child.attrName">{{child.attrName}}</label>
<span :title="child.value || '-'">
<template v-if="child.value">
@@ -5163,6 +5163,11 @@ export default {
}
},
watch: {
'sarBussionessStandEO.standSort':{
handler:function(val){
this.QCBFC = !!(val && val.indexOf("QCBFC") !== -1);
}
},
'sarBussionessStandEO.QCDW'(val) {
this.filterData(val);
},