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

This commit is contained in:
zhuangxinwei
2022-09-30 15:04:18 +08:00
+137 -71
View File
@@ -31,58 +31,84 @@
<div class="details-content-modular basic-information" style="border-top:none; border-bottom: none;"> <div class="details-content-modular basic-information" style="border-top:none; border-bottom: none;">
<div class="basic-information-content"> <div class="basic-information-content">
<!-- <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>--> <!-- <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
<p class=""> <el-row :gutter="5" class="">
<label style=" margin-right: 164px;">标准号</label> <el-col :span="8">
<label>标准号</label>
</el-col>
<el-col :span="16">
<span v-if="sarStandardsInfoEO.standYear">{{ <span v-if="sarStandardsInfoEO.standYear">{{
sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
}}</span> }}</span>
<span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span> <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
</p> </el-col>
</el-row>
<!-- <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>--> <!-- <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
<p><label style=" margin-right: 150px;">中文名称</label><span>{{ <el-row :gutter="5" class="">
<el-col :span="8">
<label>中文名称</label>
</el-col>
<el-col :span="16">
<span>{{
sarStandardsInfoEO.standName || '-' sarStandardsInfoEO.standName || '-'
}}</span></p> }}</span>
<p v-if="activeState"><label style=" margin-right: 150px;">英文名称</label><span>{{ </el-col>
</el-row>
<el-row v-if="activeState" :gutter="5">
<el-col :span="8">
<label>英文名称</label>
</el-col>
<el-col :span="16">
<span>{{
sarStandardsInfoEO.standEnName || '-' sarStandardsInfoEO.standEnName || '-'
}}</span></p> }}</span>
</el-col>
</el-row>
<!--发布稿必读--> <!--发布稿必读-->
<template v-for="(child, childIndex) in item.child1" v-if="child.value && child.value.length > 0"> <template v-for="(child, childIndex) in item.child1" v-if="child.value && child.value.length > 0">
<p class="files-titles" style="border-bottom: 1px solid #E5E5E5"> <el-row :gutter="5" class="files-titles" style="border-bottom: 1px solid #E5E5E5">
<el-col :span="8">
<label style="float: left">{{ child.attrName }}</label> <label style="float: left">{{ child.attrName }}</label>
</el-col>
<el-col :span="16">
<template v-if="child.value && child.value.length > 0"> <template v-if="child.value && child.value.length > 0">
<!-- 单个文件时--> <!-- 单个文件时-->
<div style="position: relative;margin-left: 19em; line-height: 32px"> <div style=" line-height: 32px">
<div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;"> <div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
<span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;"> <span v-if="child.value && child.value.length > 0 && child.value.length === 1"
<a style="font-size:0.2rem;color: #409EFF;cursor: pointer;display: inline-block" style="display: flex; align-items: center;">
<a style="font-size:0.2rem;color: #409EFF;cursor: pointer;display: inline-block;"
@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>
<!-- <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"> <div v-else-if="child.value && child.value.length > 0">
<span style="display: flex; align-items: center;"> <span style="display: flex; align-items: center;">
<a style="ffont-size:0.2rem;color: #409EFF;cursor: pointer" <a style="font-size:0.2rem;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>
</span> </span>
<!-- <span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span>-->
</div> </div>
</div> </div>
</div> </div>
</template> </template>
</p> </el-col>
</el-row>
</template> </template>
<template v-else-if="child.value === null">-</template> <template v-else-if="child.value === null">-</template>
<!--发布稿必读--> <!--发布稿必读-->
<template v-for="(child, childIndex) in item.child6" v-if="child.value && child.value.length > 0"> <template v-for="(child, childIndex) in item.child6" v-if="child.value && child.value.length > 0">
<p class="files-titles" style="border-bottom: 1px solid #E5E5E5"> <el-row :gutter="5" class="files-titles" style="border-bottom: 1px solid #E5E5E5">
<el-col :span="8">
<label style="float: left">{{ child.attrName }}</label> <label style="float: left">{{ child.attrName }}</label>
</el-col>
<el-col :span="16">
<template v-if="child.value && child.value.length > 0" > <template v-if="child.value && child.value.length > 0" >
<div style="position: relative;margin-left: 214px; line-height: 32px"> <div style="line-height: 32px">
<div v-for="(file, fileIndex) in child6Func(child.value)" style="display: flex;"> <div v-for="(file, fileIndex) in child6Func(child.value)" style="display: flex;">
<span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;"> <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;display: inline-block" <a style="font-size: 0.2rem;color: #409EFF;cursor: pointer;display: inline-block"
@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>
</span> </span>
@@ -94,18 +120,22 @@
</span> </span>
</div> </div>
</div> </div>
<el-button v-if="child.attrField === 'FBGYWBD'" @click="showItemsModel(child.attrField)" class="decomposition-btn">标准分解单 <!-- <el-button v-if="child.attrField === 'FBGYWBD'" @click="showItemsModel(child.attrField)" class="decomposition-btn">标准分解单-->
</el-button> <!-- </el-button>-->
</div> </div>
</template> </template>
<template v-else-if="child.value === null">-</template> <template v-else-if="child.value === null">-</template>
</p> </el-col>
</el-row>
</template> </template>
<template v-else-if="child.value === null">-</template> <template v-else-if="child.value === null">-</template>
<!--修订本--> <!--修订本-->
<template v-for="(child, childIndex) in item.child5"> <template v-for="(child, childIndex) in item.child5">
<p class="files-title"> <el-row :gutter="5" class="files-title">
<label style=" margin-right: 164px;">{{ child.attrName }}</label> <el-col :span="8">
<label>{{ child.attrName }}</label>
</el-col>
<el-col :span="16">
<template v-if="child.value && child.value.length > 0" <template v-if="child.value && child.value.length > 0"
v-for="(file, fileIndex) in child5Func(child.value)"> v-for="(file, fileIndex) in child5Func(child.value)">
<span> <span>
@@ -114,19 +144,23 @@
:title="file.oldFileName">{{ file.oldFileName }}</a> :title="file.oldFileName">{{ file.oldFileName }}</a>
<!-- <span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span>-->
</span> </span>
<el-button v-if="child.value && child.value.length > 1" <!-- <el-button v-if="child.value && child.value.length > 1"-->
style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.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)"> <!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
更多 <!-- 更多-->
</el-button> <!-- </el-button>-->
</template> </template>
<template v-if="child.value === null">-</template> <template v-if="child.value === null">-</template>
</p> </el-col>
</el-row>
</template> </template>
<!--勘误件--> <!--勘误件-->
<template v-for="(child, childIndex) in item.child4"> <template v-for="(child, childIndex) in item.child4">
<p class="files-title"> <el-row :gutter="5" class="files-title">
<label style=" margin-right: 164px;">{{ child.attrName }}</label> <el-col :span="8">
<label>{{ child.attrName }}</label>
</el-col>
<el-col :span="16">
<template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child4Func(child.value)"> <template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child4Func(child.value)">
<span> <span>
<a style="font-size: 16px;color: #409EFF;cursor: pointer" <a style="font-size: 16px;color: #409EFF;cursor: pointer"
@@ -134,19 +168,23 @@
:title="file.oldFileName">{{ file.oldFileName }}</a> :title="file.oldFileName">{{ file.oldFileName }}</a>
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</span> </span>
<el-button v-if="child.value && child.value.length > 1" <!-- <el-button v-if="child.value && child.value.length > 1"-->
style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.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)"> <!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
更多 <!-- 更多-->
</el-button> <!-- </el-button>-->
</template> </template>
<template v-if="child.value === null">-</template> <template v-if="child.value === null">-</template>
</p> </el-col>
</el-row>
</template> </template>
<!--增补件(必读)--> <!--增补件(必读)-->
<template v-for="(child, childIndex) in item.child3"> <template v-for="(child, childIndex) in item.child3">
<p class="files-title"> <el-row :gutter="5" class="files-title">
<label style=" margin-right: 164px;">{{ child.attrName }}</label> <el-col :span="8">
<label>{{ child.attrName }}</label>
</el-col>
<el-col :span="16">
<template v-if="child.value && child.value.length > 0" <template v-if="child.value && child.value.length > 0"
v-for="(file, fileIndex) in child3Func(child.value)"> v-for="(file, fileIndex) in child3Func(child.value)">
<span> <span>
@@ -155,40 +193,61 @@
:title="file.oldFileName">{{ file.oldFileName }}</a> :title="file.oldFileName">{{ file.oldFileName }}</a>
<!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>-->
</span> </span>
<el-button v-if="child.value && child.value.length > 1" <!-- <el-button v-if="child.value && child.value.length > 1"-->
style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.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)"> <!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
更多 <!-- 更多-->
</el-button> <!-- </el-button>-->
</template> </template>
<template v-if="child.value === null">-</template> <template v-if="child.value === null">-</template>
</p> </el-col>
</el-row>
</template> </template>
<p class="half"> <el-row :gutter="5" class="half">
<label style=" margin-right: 150px;" title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。">文本状态</label> <el-col :span="8">
<label title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。">文本状态</label>
</el-col>
<el-col :span="16">
<span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span> <span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
</p> </el-col>
<p class="half"> </el-row>
<label style=" margin-right: 150px;">发布日期</label> <el-row :gutter="5" class="half">
<el-col :span="8">
<label>发布日期</label>
</el-col>
<el-col :span="16">
<span>{{ sarStandardsInfoEO.issueTime || '-' }}</span> <span>{{ sarStandardsInfoEO.issueTime || '-' }}</span>
</p> </el-col>
<p class="half"> </el-row>
<label style=" margin-right: 150px;">标准体系</label> <el-row :gutter="5" class="half">
<el-col :span="8">
<label>标准体系</label>
</el-col>
<el-col :span="16">
<span> <span>
{{ sarStandardsInfoEO.standSystem || '-' }} {{ sarStandardsInfoEO.standSystem || '-' }}
</span> </span>
</p> </el-col>
<p class="half"> </el-row>
<label style=" margin-right: 11em;">是否纳入认证清单</label> <el-row :gutter="5" class="half">
<el-col :span="8">
<label>是否纳入认证清单</label>
</el-col>
<el-col :span="16">
<span> <span>
{{ sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' }} {{ sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' }}
</span> </span>
</p> </el-col>
</el-row>
<template v-for="(child, childIndex) in item.child2"> <template v-for="(child, childIndex) in item.child2">
<p class="half"> <el-row :gutter="5" class="half">
<label style=" margin-right: 150px;">{{ child.attrName }}</label> <el-col :span="8">
<label>{{ child.attrName }}</label>
</el-col>
<el-col :span="16">
<span>{{ child.value || '-' }}</span> <span>{{ child.value || '-' }}</span>
</p> </el-col>
</el-row>
</template> </template>
</div> </div>
</div> </div>
@@ -201,8 +260,11 @@
</div> </div>
<template v-for="(child, childIndex) in item.half" v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'"> <template v-for="(child, childIndex) in item.half" v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'">
<!-- modular-item half 代替标准编号--> <!-- modular-item half 代替标准编号-->
<div :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'" v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' "> <el-row :gutter="5" :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'" v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' ">
<el-col :span="8">
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label> <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
</el-col>
<el-col :span="16"></el-col>
<span class="modular-content-p-val" :title="child.value || '-'"> <span class="modular-content-p-val" :title="child.value || '-'">
<div v-if="child.value != null && child.value !== '' && child.value.split(',').length > 0"> <div v-if="child.value != null && child.value !== '' && child.value.split(',').length > 0">
<!--相关流程--> <!--相关流程-->
@@ -237,7 +299,7 @@
{{ '-' }} {{ '-' }}
</div> </div>
</span> </span>
</div> </el-row>
<!-- 其他项--> <!-- 其他项-->
<div v-else :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"> <div v-else :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'">
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label> <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
@@ -327,12 +389,15 @@
</template> </template>
<template v-for="(child, childIndex) in item.one" v-if="child.isShowImp === '0' && item.label == '过程稿件'"> <template v-for="(child, childIndex) in item.one" v-if="child.isShowImp === '0' && item.label == '过程稿件'">
<!-- 增补件(必读)和勘误件不放在过程稿件里了--> <!-- 增补件(必读)和勘误件不放在过程稿件里了-->
<div <el-row :gutter="5"
v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ' && child.attrField !== 'FBGYWBD' " v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ' && child.attrField !== 'FBGYWBD' "
:key="child.id" :key="child.id"
:class="'modular-item half'" :class="'modular-item half'"
> >
<el-col :span="8">
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label> <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
</el-col>
<el-col :span="16">
<span <span
v-if="child.attrType !== 'FILE'" v-if="child.attrType !== 'FILE'"
class="modular-content-p-val" class="modular-content-p-val"
@@ -352,17 +417,18 @@
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA' || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
|| child.attrField === 'JDWJ' || child.attrField === 'GLWJ'"> || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
file.oldFileName | ellipsis file.oldFileName
}}</a> }}</a>
</template> </template>
<template v-else> <template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
file.oldFileName | ellipsis file.oldFileName
}}</a> }}</a>
</template> </template>
</p> </p>
</div> </div>
</div> </el-col>
</el-row>
</template> </template>
<template <template
v-for="(child, childIndex) in item.one" v-for="(child, childIndex) in item.one"
@@ -3471,8 +3537,8 @@
a { a {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
width: calc(~'100% - 40px'); //width: calc(~'100% - 40px');
white-space: nowrap; //white-space: nowrap;
display: block; display: block;
} }
} }
@@ -3481,7 +3547,6 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 780px; max-width: 780px;
white-space: nowrap;
display: block; display: block;
} }
} }
@@ -3867,10 +3932,10 @@
line-height: 32px; line-height: 32px;
//position: relative; //position: relative;
display: inline-block; display: inline-block;
width: calc(~'100% - 225px'); //width: calc(~'100% - 225px');
& > .files-title { & > .files-title {
width: calc(~'100% - 120px'); //width: calc(~'100% - 120px');
//报批稿撑开 //报批稿撑开
//min-height: 50px; //min-height: 50px;
//line-height: 50px; //line-height: 50px;
@@ -4051,4 +4116,5 @@
::v-deep .el-drawer { ::v-deep .el-drawer {
outline: none !important; outline: none !important;
} }
</style> </style>