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:
宋伟佳
2022-03-23 14:25:14 +08:00
parent 63d7c54b4a e1d50081eb
commit dc7cee1a39
9 changed files with 2845 additions and 2822 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForAllStandards.vue
+1 -1
View File
@@ -283,7 +283,7 @@ export default {
} }
if (this.selectedListRep.length + textArr.length > 20) { if (this.selectedListRep.length + textArr.length > 20) {
return this.$message({ return this.$message({
message: '代替标准号最多选择20项', message: '标准号最多选择20项',
type: 'warning' type: 'warning'
}) })
} }
src/pages/details/otherBussStandardDetails/index.vue
+60 -51
View File
@@ -351,63 +351,65 @@
<template v-if = "item.label === '基础信息'"> <template v-if = "item.label === '基础信息'">
<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="" style="color: #C42626;"><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"> <template v-for="(child, childIndex) in item.child1">
<div class="files-title" style="border-bottom: 1px solid #E5E5E5"> <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
<label style=" margin-right: 172px;">{{ child.attrName }}</label> <label style="float: left;">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)"> <div style="margin-left: 220px;">
<!-- 单个文件--> <div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="line-height: 50px;">
<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 }}</a> <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>
<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"> <div v-else-if="child.value && child.value.length > 0" style="line-height: 50px;">
<span style="margin-left: 19%"> <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 }}</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> </div>
<!-- <el-button--> <!-- <el-button-->
<!-- v-if="child.attrField === itemNam "--> <!-- v-if="child.attrField === itemNam "-->
<!-- v-for="(itemNam,index) in itemExistList"--> <!-- v-for="(itemNam,index) in itemExistList"-->
<!-- :key="index"--> <!-- :key="index"-->
<!-- @click="showItemsModel(child.attrField)"--> <!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"--> <!-- class="decomposition-btn"-->
<!-- style="right:62px"--> <!-- style="right:62px"-->
<!-- icon="icon-separate"--> <!-- icon="icon-separate"-->
<!-- >标准分解单--> <!-- >标准分解单-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"--> <!-- <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>--> <!-- class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>-->
</template> </div>
</div>
<template v-if="child.value === null" >-</template> <template v-if="child.value === null" >-</template>
</div> </div>
</template> </template>
@@ -416,16 +418,16 @@
<p class="half"> <p class="half">
<label style=" margin-right: 156px;" <label style=" margin-right: 156px;"
title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定" title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
>文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.textStatusBussShow || '-' }}</span> >文本状态</label><span>{{ sarStandardsInfoEO.textStatusBussShow || '-' }}</span>
</p> </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.issueTime || '-' }}</span></p>
<p class="half" style=""><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p> <p class="half" style=""><label style=" margin-right: 122px;">企标实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
<template <template
v-for="(child, childIndex) in item.child" v-for="(child, childIndex) in item.child"
v-if="child.isShowImp === '0'" v-if="child.isShowImp === '0'"
> >
<p class="half"> <p class="half">
<label style=" margin-right: 157px;" :title="child.attrName">{{child.attrName}}</label> <label style=" margin-right: 150px;" :title="child.attrName">{{child.attrName}}</label>
<span :title="child.value || '-'"> <span :title="child.value || '-'">
<template v-if="child.value"> <template v-if="child.value">
{{ child.value }} {{ child.value }}
@@ -525,7 +527,7 @@
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 | ellipsis50}}</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>-->
@@ -1321,6 +1323,13 @@ export default {
return value.slice(0,12) + '...' return value.slice(0,12) + '...'
} }
return value return value
},
ellipsis50 (value) {
if (!value) return ''
if (value.length > 50) {
return value.slice(0,50) + '...'
}
return value
} }
}, },
data () { data () {
@@ -3404,11 +3413,11 @@ export default {
min-height: 50px; min-height: 50px;
line-height: 50px; line-height: 50px;
font-size: 16px; font-size: 16px;
color: #999999; color: #333333;
word-break: break-all; word-break: break-all;
//overflow: hidden; overflow: hidden;
//white-space: nowrap; white-space: nowrap;
//text-overflow: ellipsis; text-overflow: ellipsis;
} }
.modular-content-p-flies{ .modular-content-p-flies{
position: relative; position: relative;
src/pages/details/otherStandardDetails/index.vue
+12 -5
View File
@@ -66,15 +66,15 @@
<!--发布稿（必读）--> <!--发布稿（必读）-->
<template v-for="(child, childIndex) in item.child1"> <template v-for="(child, childIndex) in item.child1">
<div class="files-titles" style="border-bottom: 1px solid #E5E5E5"> <div class="files-titles" style="border-bottom: 1px solid #E5E5E5">
<label style="margin-right: 164px;">{{ child.attrName }}</label> <label style="float: left">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0"> <template v-if="child.value && child.value.length > 0">
<!-- 单个文件时--> <!-- 单个文件时-->
<div style="position: relative;"> <div style="position: relative;margin-left: 214px;">
<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" style="display: flex; align-items: center;">
<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 }}</a> :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
@@ -91,10 +91,10 @@
</span> </span>
<!-- 多个文件时--> <!-- 多个文件时-->
<div v-else-if="child.value && child.value.length > 0"> <div v-else-if="child.value && child.value.length > 0">
<span style="margin-left: 19%;display: flex; align-items: center;"> <span style="display: flex; align-items: center;">
<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 }}</a> :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
<i <i
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
@@ -1784,6 +1784,13 @@ export default {
return value.slice(0, 12) + '...' return value.slice(0, 12) + '...'
} }
return value return value
},
ellipsis50 (value) {
if (!value) return ''
if (value.length > 50) {
return value.slice(0,50) + '...'
}
return value
} }
}, },
data() { data() {
src/pages/processCenter/pages/processList/index.vue
+117 -111
View File
@@ -1,111 +1,117 @@
<!-- 流程中心 --> <!-- 流程中心 -->
<template> <template>
<div class="processCenter"> <div class="processCenter">
<panel-header :tabs="tabsList" @activated="showComponent" :active="active"></panel-header> <panel-header :tabs="tabsList" @activated="showComponent" :active="active"></panel-header>
<panel-content> <panel-content>
<transition enter-active-class="" leave-active-class=""> <transition enter-active-class="" leave-active-class="">
<components :is="active"></components> <components :is="active"></components>
</transition> </transition>
</panel-content> </panel-content>
</div> </div>
</template> </template>
<script> <script>
import ProcessCenter from './tabComponents/processCenter' import ProcessCenter from './tabComponents/processCenter'
import AlreadyProcess from './tabComponents/alreadyProcess' import AlreadyProcess from './tabComponents/alreadyProcess'
import AlreadySend from './tabComponents/alreadySend' import AlreadySend from './tabComponents/alreadySend'
import MonitorProcess from './tabComponents/monitorProcess' import MonitorProcess from './tabComponents/monitorProcess'
import TaskDraft from './tabComponents/taskDraft' import TaskDraft from './tabComponents/taskDraft'
import NewProcess from './tabComponents/newProcess' import NewProcess from './tabComponents/newProcess'
export default { export default {
name: 'index', name: 'index',
data() { data() {
return { return {
active: 'ProcessCenter', active: 'ProcessCenter',
} }
}, },
computed: { computed: {
tabsList() { tabsList() {
const list = [ const list = [
{ {
title: '待办流程', title: '待办流程',
name: 'ProcessCenter' name: 'ProcessCenter',
}, permission:'4219fdb5e33dbbc84d845af98c947e66'
{ },
title: '已办流程', {
name: 'AlreadyProcess' title: '已办流程',
}, name: 'AlreadyProcess',
{ permission:'4f71b81686079ba2b7e3739d3994e0af'
title: '已发流程', },
name: 'AlreadySend' {
}, title: '已发流程',
{ name: 'AlreadySend',
title: '监控流程', permission:'b9abd00768c8ed97be89547c2da3f0eb'
name: 'MonitorProcess', },
}, {
{ title: '监控流程',
title: '草稿', name: 'MonitorProcess',
name: 'TaskDraft' permission:'e1eb3e91143c1cf356889e013e698672'
}, },
{ {
title: '新建流程', title: '草稿',
name: 'NewProcess' name: 'TaskDraft',
}, permission:'fa19fb2dc2cf3055a64732dab6c40cb9'
] },
{
return list.filter(item => { title: '新建流程',
if (item.permission) { name: 'NewProcess',
return this.$hasPermission(item.permission) permission:'b53e6722b33a37c0fa2d87a9b06cca40'
} else { },
return true ]
}
}) return list.filter(item => {
} if (item.permission) {
}, return this.$hasPermission(item.permission)
methods: { } else {
/** return true
* @description: 边栏收缩 }
* @author: chenxiaoxi })
* @date: 2018-09-18 11:11:46 }
*/ },
// tabs 切换事件 methods: {
showComponent(name) { /**
if (this.active !== name) { * @description: 边栏收缩
this.active = name * @author: chenxiaoxi
const location = this.$router.replace({query: {tabsName: name}}) * @date: 2018-09-18 11:11:46
} */
// this.$route.query = {tabsName2: name} // tabs 切换事件
// this.$router.push('/processCenter/' + name) showComponent(name) {
} if (this.active !== name) {
}, this.active = name
components: { const location = this.$router.replace({query: {tabsName: name}})
ProcessCenter, }
AlreadyProcess, // this.$route.query = {tabsName2: name}
AlreadySend, // this.$router.push('/processCenter/' + name)
MonitorProcess, }
TaskDraft, },
NewProcess components: {
// SideBar, ProcessCenter,
// MyProcess AlreadyProcess,
}, AlreadySend,
watch: {}, MonitorProcess,
mounted() { TaskDraft,
if (this.$route.query.tabsName) { NewProcess
this.active = this.$route.query.tabsName // SideBar,
} else { // MyProcess
this.$router.replace({query: {tabsName: this.active}}) },
} watch: {},
this.$store.commit('setDetailMap', '') mounted() {
} if (this.$route.query.tabsName) {
} this.active = this.$route.query.tabsName
</script> } else {
this.$router.replace({query: {tabsName: this.active}})
<style lang="less" scoped> }
.processCenter { this.$store.commit('setDetailMap', '')
position: relative; }
height: 100%; }
background-color: #fff; </script>
}
</style> <style lang="less" scoped>
.processCenter {
position: relative;
height: 100%;
background-color: #fff;
}
</style>
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+1379 -1377
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+5 -5
View File
@@ -640,7 +640,7 @@
<el-input <el-input
v-model="sarBussionessStandEO.CYCVPPSBMBUSS" v-model="sarBussionessStandEO.CYCVPPSBMBUSS"
placeholder="选择VPPS编码" placeholder="选择VPPS编码"
@click.native="choiceZRR2('car', '乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input> @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
</el-form-item> </el-form-item>
</el-tooltip> </el-tooltip>
</template> </template>
@@ -1224,11 +1224,11 @@
<el-form-item label="体系类别" class="add-form-item form-item-disabled"> <el-form-item label="体系类别" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input> <el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled"> <el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="sarBussionessSearch.VPPSBMBUSS" v-model="sarBussionessSearch.CYCVPPSBMBUSS"
placeholder="选择VPPS编码" placeholder="选择关联模块--乘用车VPPS编码"
@click.native="choiceZRR2('car', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,true)"></el-input> @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+1206 -1206
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/nonConfomity/pages/keyIssues.vue
+65 -65
View File
@@ -1,65 +1,65 @@
<!--重点问题项管控--> <!--重点问题项管控-->
<template> <template>
<div id="key-issues"> <div id="key-issues">
<div class="non-content"> <div class="non-content">
<el-tabs v-model="keynoteActiveName" @tab-click="handleClick"> <el-tabs v-model="keynoteActiveName" @tab-click="handleClick">
<el-tab-pane label="事业部" name="cause"> <el-tab-pane label="事业部" name="cause">
<business-division></business-division> <business-division></business-division>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="产品规划部" name="product"> <el-tab-pane label="产品规划部" name="product">
<product-department></product-department> <product-department></product-department>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import businessDivision from "@/pages/regulatoryRepository/nonConfomity/pages/businessDivision"; import businessDivision from "@/pages/regulatoryRepository/nonConfomity/pages/businessDivision";
import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/productDepartment"; import productDepartment from "@/pages/regulatoryRepository/nonConfomity/pages/productDepartment";
export default { export default {
name: "keyIssues", name: "keyIssues",
props:['keynoteActiveName'], props:['keynoteActiveName'],
components: { components: {
businessDivision, businessDivision,
productDepartment, productDepartment,
}, },
data() { data() {
return { return {
activeName:'cause', activeName:'cause',
} }
}, },
methods: { methods: {
handleClick(tab, event) { handleClick(tab, event) {
console.log(tab, event); console.log(tab, event);
} }
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
#key-issues { #key-issues {
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #FFFFFF; background-color: #FFFFFF;
.non-content { .non-content {
height: 100%; height: 100%;
/deep/ .el-tabs { /deep/ .el-tabs {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.el-tabs__content { .el-tabs__content {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
.el-tab-pane { .el-tab-pane {
height: 100%; height: 100%;
} }
} }
} }
} }
.el-tabs__nav { .el-tabs__nav {
margin-left:20px; margin-left:20px;
} }
} }
</style> </style>
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
-1
View File
@@ -114,7 +114,6 @@
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="content"
align="center" align="center"
label="修改意见内容(包括理由或依据)" label="修改意见内容(包括理由或依据)"
> >