FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yanyizhou
2021-11-09 17:13:12 +08:00
parent e246f8ae7c c2b33c76a4
commit 0987ea02d0
15 changed files with 321 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/roleManage/index.vue
+2
View File
@@ -538,6 +538,7 @@ export default {
}) })
}, },
closeDialog() { closeDialog() {
this.treeData2 = []
this.modalshowflag = false this.modalshowflag = false
}, },
confirmDialog() { confirmDialog() {
@@ -548,6 +549,7 @@ export default {
if (res.ok) { if (res.ok) {
this.$message.success('设置权限成功') this.$message.success('设置权限成功')
this.modalshowflag = false this.modalshowflag = false
this.treeData2 = []
} }
}) })
}, },
src/pages/details/otherBussStandardDetails/index.vue
+12 -7
View File
@@ -6,8 +6,8 @@
<span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span> <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>
</div> </div>
<!--主体内容--> <!--主体内容-->
<div class="details-content"> <div class="details-content" style="position: relative">
<div class="details-content-modular basic-information"> <div class="details-content-modular basic-information" style="border-top: 2px dashed #D1D1D1;">
</div> </div>
<div <div
class="details-content-modular clearfix" class="details-content-modular clearfix"
@@ -16,6 +16,16 @@
v-if="item.isShowImp === '0'" v-if="item.isShowImp === '0'"
> >
<el-collapse v-model="activeNames" @change="handleChange"> <el-collapse v-model="activeNames" @change="handleChange">
<div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
style="border-top:none;position: absolute;right: 36px;">
<div class="modular-header" style="height: 50px;">
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
</div>
</div>
</div>
<el-collapse-item :name="item.label" @click.native="handleChange1(item.label)"> <el-collapse-item :name="item.label" @click.native="handleChange1(item.label)">
<template slot="title"> <template slot="title">
<div class="modular-header" v-if="item.label !== '基础信息'"> <div class="modular-header" v-if="item.label !== '基础信息'">
@@ -25,11 +35,6 @@
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div> <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
<!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>--> <!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>-->
<!-- </div>--> <!-- </div>-->
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
</div>
</div> </div>
</template> </template>
<div class="modular-content"> <div class="modular-content">
src/pages/details/otherLawsStandDetails/index.vue
+231 -116
View File
@@ -6,8 +6,8 @@
<span>{{sarStandardsInfoEO.lawsNumber}}-{{sarStandardsInfoEO.lawsYear}} 《{{sarStandardsInfoEO.lawsName}}》 企标详情</span> <span>{{sarStandardsInfoEO.lawsNumber}}-{{sarStandardsInfoEO.lawsYear}} 《{{sarStandardsInfoEO.lawsName}}》 企标详情</span>
</div> </div>
<!--主体内容--> <!--主体内容-->
<div class="details-content"> <div class="details-content" style="position: relative">
<div class="details-content-modular basic-information"> <div class="details-content-modular basic-information" style="border-top: 2px dashed #D1D1D1;">
</div> </div>
<div <div
class="details-content-modular clearfix" class="details-content-modular clearfix"
@@ -15,141 +15,156 @@
:key="index" :key="index"
v-if="item.isShowImp === '0'" v-if="item.isShowImp === '0'"
> >
<div class="modular-header" v-if="item.label !== '基础信息'"> <el-collapse v-model="activeNames" @change="handleChange">
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div> <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
</div> style="border-top:none;position: absolute;right: 36px;border: none">
<div class="modular-header" v-if="item.label === '基础信息'"> <div class="modular-header" style="height: 50px;">
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div> <div class="modular-header-btn">
<!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>--> <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<!-- </div>--> <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<div class="modular-header-btn"> <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button> </div>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button> </div>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
</div> </div>
</div> <el-collapse-item :name="item.label" @click.native="handleChange1(item.label)">
<div class="modular-content"> <template slot="title">
<template v-if = "item.label === '基础信息'"> <div class="modular-header" v-if="item.label !== '基础信息'">
<div class="details-content-modular basic-information" style="margin-bottom: 0"> <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
<div class="basic-information-content"> </div>
<p style="color: #C42626;" class="half"><label style=" margin-right: 157px;">政策编号</label><span>{{ sarStandardsInfoEO.lawsNumber }}</span></p> <div class="modular-header" v-if="item.label === '基础信息'">
<p class="half"><label style=" margin-right: 157px;">政策文号</label><span>{{ sarStandardsInfoEO.lawsNo || '-' }}</span></p> <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
<p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.lawsName || '-' }}</span></p> <!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>-->
<p style="border: none;"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.lawsEnName || '-' }}</span></p> <!-- </div>-->
<p class="half"><label style=" margin-right: 157px;">发文日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p> </div>
<p class="half"><label style=" margin-right: 157px;">发文单位</label><span>{{ sarStandardsInfoEO.issueCompany || '-' }}</span></p> </template>
<p class="half"><label style=" margin-right: 157px;">发文单位</label><span>{{ sarStandardsInfoEO.issueCompany || '-' }}</span></p> <div class="modular-content">
<p class="half"><label style=" margin-right: 120px;">征集意见周期</label><span>{{ sarStandardsInfoEO.commentCycleStart || '' }} - {{sarStandardsInfoEO.commentCycleEnd || ''}}</span></p> <template v-if = "item.label === '基础信息'">
<p class="half"> <div class="details-content-modular basic-information" style="margin-bottom: 0;border: none">
<label style=" margin-right: 156px;" <div class="basic-information-content">
title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定" <p style="color: #C42626;" class="half"><label style=" margin-right: 157px;">政策编号</label><span>{{ sarStandardsInfoEO.lawsNumber }}</span></p>
>文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span> <p class="half"><label style=" margin-right: 157px;">政策文号</label><span>{{ sarStandardsInfoEO.lawsNo || '-' }}</span></p>
</p> <p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.lawsName || '-' }}</span></p>
<p class="half"><label style=" margin-right: 157px;">信息简报</label><span>{{ sarStandardsInfoEO.lawsBulletin || '-' }}</span></p> <p v-if="activeState" style=""><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.lawsEnName || '-' }}</span></p>
<p class="half"><label style=" margin-right: 157px;">适用区域</label><span>{{ sarStandardsInfoEO.lawsSyqy || '-' }}</span></p> <p class="half"><label style=" margin-right: 157px;">发文日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
<p class="half"><label style=" margin-right: 157px;">适用车型</label><span>{{ sarStandardsInfoEO.lawsSycx || '-' }}</span></p> <p class="half"><label style=" margin-right: 157px;">发文单位</label><span>{{ sarStandardsInfoEO.issueCompany || '-' }}</span></p>
<p class="half"><label style=" margin-right: 97px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess || '-' }}</span></p> <p class="half"><label style=" margin-right: 157px;">发文单位</label><span>{{ sarStandardsInfoEO.issueCompany || '-' }}</span></p>
<p class="half"><label style=" margin-right: 97px;">福田转发通知文号</label><span>{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}</span></p> <p class="half"><label style=" margin-right: 120px;">征集意见周期</label><span>{{ sarStandardsInfoEO.commentCycleStart || '' }} - {{sarStandardsInfoEO.commentCycleEnd || ''}}</span></p>
<p class="half"><label style=" margin-right: 192px;">年度</label><span>{{ sarStandardsInfoEO.lawsYear || '-' }}</span></p> <p class="half">
<p class="half"><label style=" margin-right: 192px;">标签</label><span>{{ sarStandardsInfoEO.lawsLabel || '-' }}</span></p> <label style=" margin-right: 156px;"
<p class="half"><label style=" margin-right: 192px;">备注</label><span>{{ sarStandardsInfoEO.lawsRemark || '-' }}</span></p> title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
<p class="half"><label style=" margin-right: 192px;"></label><span></span></p> >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
</div> </p>
</div> <p class="half"><label style=" margin-right: 157px;">信息简报</label><span>{{ sarStandardsInfoEO.lawsBulletin || '-' }}</span></p>
</template> <p class="half"><label style=" margin-right: 157px;">适用区域</label><span>{{ sarStandardsInfoEO.lawsSyqy || '-' }}</span></p>
<template <p class="half"><label style=" margin-right: 157px;">适用车型</label><span>{{ sarStandardsInfoEO.lawsSycx || '-' }}</span></p>
v-for="(child, childIndex) in item.child" <p class="half"><label style=" margin-right: 97px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess || '-' }}</span></p>
v-if="child.isShowImp === '0'" <p class="half"><label style=" margin-right: 97px;">福田转发通知文号</label><span>{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}</span></p>
> <p class="half"><label style=" margin-right: 192px;">年度</label><span>{{ sarStandardsInfoEO.lawsYear || '-' }}</span></p>
<div <p class="half"><label style=" margin-right: 192px;">标签</label><span>{{ sarStandardsInfoEO.lawsLabel || '-' }}</span></p>
:key="childIndex" <p class="half"><label style=" margin-right: 192px;">备注</label><span>{{ sarStandardsInfoEO.lawsRemark || '-' }}</span></p>
class="modular-item" <template v-for="(child, childIndex) in item.child2">
:class="halfClass(child, item.child[childIndex + 1], childIndex)" <p class="half">
> <label style=" margin-right: 156px;">{{child.attrName}}</label>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label> <span>{{ child.value || '-' }}</span>
<span </p>
v-if="child.attrField === 'ZYQCR'" </template>
class="modular-content-p-val clearfix" </div>
:title="child.value || '-'" </div>
</template>
<template
v-for="(child, childIndex) in item.child"
v-if="child.isShowImp === '0'"
> >
<div
:key="childIndex"
:class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"
>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<span
v-if="child.attrField === 'ZYQCR'"
class="modular-content-p-val clearfix"
:title="child.value || '-'"
>
<template v-if="child.value"> <template v-if="child.value">
{{ child.value }} {{ child.value }}
<put-question-button <put-question-button
style="float: right;" style="float: right;"
:resId="sarStandardsInfoEO.id" :resId="sarStandardsInfoEO.id"
:resType="saveStandType" :resType="saveStandType"
></put-question-button> ></put-question-button>
</template> </template>
<template v-else> <template v-else>
{{ '-' }} {{ '-' }}
</template> </template>
</span> </span>
<!--规范性引用文件--> <!--规范性引用文件-->
<template v-else-if="child.attrField === 'GFXYYWJ' && child.value"> <template v-else-if="child.attrField === 'GFXYYWJ' && child.value">
<p class="modular-content-p-val"> <p class="modular-content-p-val">
<span v-for="(item, index) in child.value.split(',')" :key="index"> <span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a> <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
</span> </span>
</p> </p>
</template> </template>
<!--相关流程--> <!--相关流程-->
<template v-else-if="child.attrField === 'XGLC' && child.value"> <template v-else-if="child.attrField === 'XGLC' && child.value">
<p class="modular-content-p-val"> <p class="modular-content-p-val">
<span v-for="(item, index) in child.value.split(',')" :key="index"> <span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a> <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
</span> </span>
</p> </p>
</template> </template>
<!--相关计划--> <!--相关计划-->
<template v-else-if="child.attrField === 'XGJH' && child.value"> <template v-else-if="child.attrField === 'XGJH' && child.value">
<span <span
v-if="child.value.length === 0" v-if="child.value.length === 0"
class="modular-content-p-val" class="modular-content-p-val"
:title="'-'" :title="'-'"
> >
{{ '-' }} {{ '-' }}
</span> </span>
<p v-else class="modular-content-p-val"> <p v-else class="modular-content-p-val">
<span v-for="(item, index) in child.value" :key="index"> <span v-for="(item, index) in child.value" :key="index">
<a @click="showXGJH(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">查看计划</a> <a @click="showXGJH(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">查看计划</a>
</span> </span>
</p> </p>
</template> </template>
<span <span
v-else-if="child.attrField === 'SVPPS'" v-else-if="child.attrField === 'SVPPS'"
class="modular-content-p-val" class="modular-content-p-val"
:title="child.tips || '-'" :title="child.tips || '-'"
> >
{{ !child.value || child.value === 'null' ? '-' : child.value }} {{ !child.value || child.value === 'null' ? '-' : child.value }}
</span> </span>
<span <span
v-else-if="child.attrType !== 'FILE'" v-else-if="child.attrType !== 'FILE'"
class="modular-content-p-val" class="modular-content-p-val"
:title="child.value || '-'" :title="child.value || '-'"
> >
{{ child.value || '-' }} {{ child.value || '-' }}
</span> </span>
<div v-else class="modular-content-p-flies"> <div v-else class="modular-content-p-flies">
<p <p
class="files-title" class="files-title"
v-for="(file, fileIndex) in child.value" v-for="(file, fileIndex) in child.value"
:key="fileIndex" :key="fileIndex"
> >
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a> <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/> <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/>
<i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/> <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span> <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</p> </p>
<!-- <el-button--> <!-- <el-button-->
<!-- @click="showItemsModel(child.attrField)"--> <!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"--> <!-- class="decomposition-btn"-->
<!-- icon="icon-separate"--> <!-- icon="icon-separate"-->
<!-- >标准分解单</el-button>--> <!-- >标准分解单</el-button>-->
</div> </div>
</div> </div>
</template> </template>
</div> </div>
</el-collapse-item>
</el-collapse>
</div> </div>
</div> </div>
<div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png"></div> <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png"></div>
@@ -886,13 +901,26 @@ export default {
components: { components: {
PutQuestionButton PutQuestionButton
}, },
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 12) {
return value.slice(0,12) + '...'
}
return value
}
},
data () { data () {
return { return {
activeNames: ['基础信息'],
activeState: false,
visiblePlanCheck: false, visiblePlanCheck: false,
form: {}, form: {},
relateDialog: false, relateDialog: false,
relateDialog1: false,
relateList: [], relateList: [],
relateNowList: [], relateNowList: [],
relateNowList1: [],
sarType: sarType, sarType: sarType,
loading: true, loading: true,
showItemInfoModal: false, showItemInfoModal: false,
@@ -1091,6 +1119,14 @@ export default {
watch: { watch: {
}, },
methods: { methods: {
handleChange(val) {
console.log(val)
},
handleChange1(val) {
if(val && val === '基础信息'){
this.activeState = true
}
},
getPlanStatusName(status) { getPlanStatusName(status) {
switch (status) { switch (status) {
case "1": case "1":
@@ -2064,16 +2100,39 @@ export default {
}) })
}) })
displayLocation.forEach(location => { displayLocation.forEach(location => {
// 动态属性字段-SYRZ 单独添加至基础信息
const list2 = displayLocation.filter ( item => item.label === '适用范围');
if(location.label === '基础信息' && list2 && list2.length > 0){
if (!list2[0].child) {
location['child2'] = []
}else {
const childList = list2[0].child.filter ( item => item.attrField === 'YYRZLAWS');
location['child2'] = childList
}
}
const child = location.child || [] const child = location.child || []
const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'] const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM']
const fieldsIsTextAreaOrFile = child.filter(field => { const fieldsIsTextAreaOrFile = child.filter(field => {
return !halfType.includes(field.attrType) return field.attrField !== 'YYRZLAWS' && !halfType.includes(field.attrType)
}) })
const fieldOthers = child.filter(field => { const fieldOthers = child.filter(field => {
return halfType.includes(field.attrType) return halfType.includes(field.attrType)
}) })
location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum')) location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
}) })
for (let i = 0; i < displayLocation.length; i++) {
// sss
if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
if(childList.length === 0){
displayLocation.splice(i,1)
}
}
}
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false this.loading = false
@@ -2097,6 +2156,62 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
/deep/ .el-collapse{
border: none;
}
/deep/ .el-collapse-item__wrap{
border: none;
}
/deep/ .decomposition-btn {
position: absolute;
top: 6px;
right: 0;
padding: 0 10px;
height: 30px;
line-height: 30px;
font-size: 14px;
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
/deep/ .icon-separate {
display: inline-block;
margin-right: 3px;
width: 16px;
height: 16px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: center center;
vertical-align: sub;
background-image: url("~assets/images/shangqi/standardDetails/separate.png");
}
}
/deep/ .icon-download {
display: inline-block;
margin-left: 3px;
width: 18px;
height: 16px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: center center;
vertical-align: sub;
cursor: pointer;
background-image: url("~assets/images/shangqi/img/download.png");
}
/deep/ .icon-download2 {
display: inline-block;
margin-left: 3px;
width: 18px;
height: 16px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: center center;
vertical-align: sub;
cursor: pointer;
background-image: url("~assets/images/shangqi/img/download2.png");
}
.other-standard-details{ .other-standard-details{
padding: 15px 30px 0; padding: 15px 30px 0;
width: 1200px; width: 1200px;
@@ -2120,6 +2235,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
width: 100%;
height: 50px; height: 50px;
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
.modular-header-title{ .modular-header-title{
@@ -2134,7 +2250,8 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
background-position: center center; background-position: center center;
background-image: url("~assets/images/shangqi/standardDetails/modular-title.png"); background-image: url("~assets/images/shangqi/standardDetails/modular-title.png");
vertical-align: top; position: relative;
top: 2px;
} }
& > span{ & > span{
padding-left: 10px; padding-left: 10px;
@@ -2201,8 +2318,8 @@ export default {
.modular-content-p-name{ .modular-content-p-name{
display: inline-block; display: inline-block;
width: 220px; width: 220px;
height: 50px; height: 43px;
line-height: 50px; line-height: 43px;
font-size: 16px; font-size: 16px;
color: #333333; color: #333333;
vertical-align: top; vertical-align: top;
@@ -2282,16 +2399,14 @@ export default {
} }
} }
.basic-information{ .basic-information{
/*border-top: 2px dashed #D1D1D1;*/
border-bottom: 2px dashed #D1D1D1;
.modular-header{ .modular-header{
height: 60px; height: 60px;
border-bottom: none; border-bottom: none;
} }
.basic-information-content{ .basic-information-content{
& > p{ & > p{
min-height: 55px; min-height: 43px;
line-height: 55px; line-height: 43px;
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
} }
} }
src/pages/details/otherStandardDetails/index.vue
+18 -20
View File
@@ -8,7 +8,7 @@
}}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 标准详情</span> }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 标准详情</span>
</div> </div>
<!--主体内容--> <!--主体内容-->
<div class="details-content"> <div class="details-content" style="position: relative">
<div class="details-content-modular basic-information"> <div class="details-content-modular basic-information">
</div> </div>
<div <div
@@ -18,25 +18,24 @@
v-if="item.isShowImp === '0'" v-if="item.isShowImp === '0'"
> >
<el-collapse v-model="activeNames" @change="handleChange"> <el-collapse v-model="activeNames" @change="handleChange">
<div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
style="border-top:none;position: absolute;right: 36px;">
<div class="modular-header" style="height: 50px;">
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)"
title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off"
:loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
<!-- <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
<!-- <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
</div>
</div>
</div>
<el-collapse-item :name="item.label" @click.native="handleChange1(item.label)"> <el-collapse-item :name="item.label" @click.native="handleChange1(item.label)">
<template slot="title"> <template slot="title">
<div class="modular-header" v-if="item.label === '基础信息'"> <div class="modular-header" v-if="item.label === '基础信息'">
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div> <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
<div class="details-content-modular basic-information" style="border-top:none">
<div class="modular-header">
<!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>基础信息</span>-->
<!-- </div>-->
<div class="modular-header-btn">
<el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)"
title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off"
:loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
<!-- <el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>-->
<!-- <el-button class="relation-btn" @click="showItemsModel()">标准分解单</el-button>-->
</div>
</div>
</div>
</div> </div>
<div class="modular-header" v-if="item.label !== '基础信息'"> <div class="modular-header" v-if="item.label !== '基础信息'">
<div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div> <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
@@ -121,9 +120,8 @@
</p> </p>
<template v-for="(child, childIndex) in item.child2"> <template v-for="(child, childIndex) in item.child2">
<p class="half"> <p class="half">
<label style=" margin-right: 143px;">{{child.attrName}}</label><span> <label style=" margin-right: 143px;">{{child.attrName}}</label>
{{ child.value || '-' }} <span>{{ child.value || '-' }}</span>
</span>
</p> </p>
</template> </template>
<!-- <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>--> <!-- <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
@@ -3145,7 +3143,7 @@
if (['DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'].includes(field.attrType)) { if (['DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'].includes(field.attrType)) {
half.push(field) half.push(field)
} else { } else {
if(field.attrField && field.attrField !== 'FBGBJBD'){ if(field.attrField && field.attrField !== 'FBGBJBD' && field.attrField !== 'SYRZ'){
one.push(field) one.push(field)
} }
} }
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+3 -1
View File
@@ -402,7 +402,9 @@
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-show="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled"> <!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
<!-- ************************************** 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-input <el-input
disabled disabled
style="display: none;" style="display: none;"
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+3 -1
View File
@@ -347,7 +347,9 @@
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled"> <!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)"> <div v-if="jdwjFileMap.length>0" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
{{value.name}} {{value.name}}
</div> </div>
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+3 -1
View File
@@ -261,7 +261,9 @@
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled"> <!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<div v-if="form.jdwjName" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)"> <div v-if="form.jdwjName" v-for="(value,index) in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
{{value.name}} {{value.name}}
</div> </div>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+3 -1
View File
@@ -647,7 +647,9 @@
</el-button> </el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-show="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled"> <!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-input <el-input
disabled disabled
style="display: none;" style="display: none;"
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+3 -1
View File
@@ -254,7 +254,9 @@
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled"> <!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')"> <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
{{ form.jdwjName }} {{ form.jdwjName }}
</div> </div>
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+17 -2
View File
@@ -38,7 +38,7 @@ export default {
other: false, other: false,
library: false, library: false,
list: [], list: [],
tabValue: "listOfCountries", tabValue: "",
menuName: ["国家/地区清单", "车型类别清单", "重点标准跟踪清单", "其他清单", "项目清单"] menuName: ["国家/地区清单", "车型类别清单", "重点标准跟踪清单", "其他清单", "项目清单"]
}; };
}, },
@@ -79,7 +79,22 @@ export default {
} }
} }
}); });
this.list = list if(this.country === true){
this.tabValue = "listOfCountries"
return;
}else if(this.project === true){
this.tabValue = "listProject"
return;
}else if(this.tracking === true){
this.tabValue = "listTracking"
return;
}else if(this.other === true){
this.tabValue = "listOther"
return;
}else if(this.library === true){
this.tabValue = "localProductsOrProjectLibrary"
return;
}
}, },
beforeRouteLeave(to, from, next) { beforeRouteLeave(to, from, next) {
const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "LocalProductDetail", "OtherAddEit"]; const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "LocalProductDetail", "OtherAddEit"];
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -3126,7 +3126,7 @@ export default {
}, },
// 查询二级菜单 // 查询二级菜单
selectMenu() { selectMenu() {
this.$http.get('sarResource/ts-resource/getList', { this.$http.get('sarResource/ts-resource/getListStand', {
sorDivide: 'INLAND_STAND', sorDivide: 'INLAND_STAND',
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1
View File
@@ -281,6 +281,7 @@
@selection-change="standSelectChange" @selection-change="standSelectChange"
> >
<el-table-column <el-table-column
v-if="isPermission('374205ce36a859a158ca4db196d151b7,784d26f527a659eefe84d5e5a53deb96')>0"
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+3 -1
View File
@@ -181,7 +181,9 @@
@selection-change="standSelectChange" @selection-change="standSelectChange"
> >
<el-table-column <el-table-column
type="selection" v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbj,fd83032ae5f41a0021b00e93c88edbbe')>0"
type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -2916,7 +2916,7 @@ export default {
}, },
// 查询二级菜单 // 查询二级菜单
selectMenu() { selectMenu() {
this.$http.get('sarResource/ts-resource/getList', { this.$http.get('sarResource/ts-resource/getListStand', {
sorDivide: 'FOREIGN_STAND', sorDivide: 'FOREIGN_STAND',
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+20 -4
View File
@@ -855,7 +855,9 @@ export default {
// 项目分类数组 // 项目分类数组
notProjectData: [], notProjectData: [],
projectData: [] projectStatus: [],
projectData: [],
notProjectStatus: [],
}; };
}, },
methods: { methods: {
@@ -879,7 +881,7 @@ export default {
// 获取标准类别List数据 // 获取标准类别List数据
getAllInforList() { getAllInforList() {
this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => { this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this }, res => {
this.xmztOptions = res.data.XMZT; // this.xmztOptions = res.data.XMZT;
this.scxxOptions = res.data.SCXX; this.scxxOptions = res.data.SCXX;
this.countryList = res.data.COUNTRY; this.countryList = res.data.COUNTRY;
this.energyKindOptions = res.data.ENERGYTYPES; this.energyKindOptions = res.data.ENERGYTYPES;
@@ -1213,10 +1215,12 @@ export default {
if (this.localProTableSearch.prodectCode === "Maintenance") { if (this.localProTableSearch.prodectCode === "Maintenance") {
this.localProTableList = res.data.Maintenance.records; this.localProTableList = res.data.Maintenance.records;
this.productTypeOptions = this.projectData this.productTypeOptions = this.projectData
this.xmztOptions = this.projectStatus
this.total = res.data.Maintenance.total; this.total = res.data.Maintenance.total;
} else if (this.localProTableSearch.prodectCode === "notMaintenance") { } else if (this.localProTableSearch.prodectCode === "notMaintenance") {
this.localProTableList = res.data.notMaintenance.records; this.localProTableList = res.data.notMaintenance.records;
this.productTypeOptions = this.notProjectData this.productTypeOptions = this.notProjectData
this.xmztOptions = this.notProjectStatus
this.total = res.data.notMaintenance.total; this.total = res.data.notMaintenance.total;
} }
// this.localProTableList.map((item) => { // this.localProTableList.map((item) => {
@@ -1546,18 +1550,30 @@ export default {
}, },
selectSort() { selectSort() {
solostarData().then(res=>{ solostarData().then(res=>{
res.data.MaintenanceProjectStatus.forEach((item, index)=>{ res.data.MaintenanceProjectClassification.forEach((item, index)=>{
this.projectData.push({ this.projectData.push({
label: item, label: item,
value: index value: index
}) })
}) })
res.data.notMaintenanceProjectStatus.forEach((item, index)=>{ res.data.MaintenanceProjectStatus.forEach((item, index)=>{
this.projectStatus.push({
label: item,
value: index
})
})
res.data.notMaintenanceProjectClassification.forEach((item, index)=>{
this.notProjectData.push({ this.notProjectData.push({
label: item, label: item,
value: index value: index
}) })
}) })
res.data.notMaintenanceProjectStatus.forEach((item, index)=>{
this.notProjectStatus.push({
label: item,
value: index
})
})
}) })
} }
}, },