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

This commit is contained in:
396572590@qq.com
2022-07-15 16:36:35 +08:00
12 changed files with 228 additions and 188 deletions
+30 -30
View File
@@ -107,12 +107,12 @@
// menuId: 'RAFQ4N4ARF'
// },
{
title: '国内法规',
title: '国内标准',
path: '/domesticStandardsAndRegulations',
menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
},
{
title: '海外法规',
title: '海外标准',
path: '/foreignStandardsAndRegulations',
menuId: '18c1e5134ea0cf865e8960b26b81fd8c'
},
@@ -213,34 +213,34 @@
// }
]
},
{
title: '政策法规库',
path: '/policyRegulation',
'icon-class': 'el-icon-s-management',
menuId: 'asdzcfgk',
children: [
{
title: '问题项管控',
path: '/problemControl',
menuId: '50d7a0c0af4740c486100c257ae6068e'
},
{
title: '国内外政策',
path: '/nationalPolicy',
menuId: '6557e9c4ce672af71be5807052da126b'
},
{
title: '标准跟踪清单',
path: '/standardTrackingList',
menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4'
},
{
title: '政策工作组',
path: '/policyWorkGroup',
menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6'
}
]
},
// {
// title: '政策法规库',
// path: '/policyRegulation',
// 'icon-class': 'el-icon-s-management',
// menuId: 'asdzcfgk',
// children: [
// {
// title: '问题项管控',
// path: '/problemControl',
// menuId: '50d7a0c0af4740c486100c257ae6068e'
// },
// {
// title: '国内外政策',
// path: '/nationalPolicy',
// menuId: '6557e9c4ce672af71be5807052da126b'
// },
// {
// title: '标准跟踪清单',
// path: '/standardTrackingList',
// menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4'
// },
// {
// title: '政策工作组',
// path: '/policyWorkGroup',
// menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6'
// }
// ]
// },
{
title: '工作中心',
path: '/processCenter',
@@ -323,4 +323,8 @@
// }
//}
.common-tree{
height: 100%;
overflow-y: auto;
}
</style>
+4 -1
View File
@@ -320,5 +320,8 @@
// display: none;
// }
//}
.common-tree{
height: 100%;
overflow-y: auto;
}
</style>
+30 -9
View File
@@ -16,14 +16,15 @@
<el-input
v-model="filterText"
placeholder="请输入姓名"
@keyup.enter.native="searchChange"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" style="margin-top: 14px;" size="medium" @click="changeInput(filterText)">
<el-button class="common-button-primary" type="primary" style="margin-top: 14px;" size="medium" @click="searchChange">
查询
</el-button>
</el-form-item>
</el-form>
</el-form>
<el-tree
v-if="open1 && isVisible2"
node-key="id"
@@ -57,6 +58,7 @@
:props="defaultProps"
@check-change="checkChange2"
:default-checked-keys="nodeList"
:default-expanded-keys="defaultKey"
highlight-current
check-strictly
@check="drawerCheck"
@@ -132,20 +134,39 @@ export default {
}
},
methods: {
changeInput:debounce(function (val) {
if (val.length) {
searchChange(){
if (this.filterText.length) {
this.open1 = false
this.treeLoading = true
this.$http.get('SarInstitution/institution/institutionAndUser', {
userName: val
this.defaultKey = []
this.$http.get('SarInstitution/institution/getNextTwo', {
userName: this.filterText
}, {}, res => {
this.treeData1 = res.data
this.treeData1 = res
this.treeData1.forEach(item => {
this.defaultKey.push(item.id)
})
this.treeLoading = false
})
// this.$http.get('SarInstitution/institution/institutionAndUser', {
// userName: this.filterText
// }, {}, res => {
// this.treeData1 = res.data
// this.treeData1.forEach(item => {
// this.defaultKey.push(item.id)
// })
// console.log(1);
// this.getChildren()
// this.treeLoading = false
// })
} else {
this.open1 = true
}
}),
},
checkChange2 (row, type, c) {
if (this.checkBox) {
} else {
@@ -1048,6 +1048,8 @@ export default {
batchDelete () {
if (this.selectedList.length === 0) {
this.$message.error('请选择要删除的数据')
} if(this.selectedList.length > 10){
this.$message.error('批量删除仅支持10条以内')
} else {
this.$confirm('确认删除选择数据?', '确认删除', {
confirmButtonText: '确定',
@@ -100,7 +100,7 @@
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-col :span="24">
<el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
<div v-if="form.file" class="fileClass">
<div style="display: flex;align-items: center;">
@@ -125,7 +125,8 @@
v-model="form.dyhz"
style="height: 150px"
type="textarea"
:autosize="{ minRows: 1, maxRows: 20}"
:autosize="{ minRows: 1, maxRows: 5}"
resize='none'
placeholder="请输入调研回执"
clearable
></el-input>
@@ -462,6 +462,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName
this.form.date = data.date || data.form.date
@@ -79,21 +79,21 @@
</div>
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'344c9c97b581400718451e8b8a319382'">
<div class="card-box" @click="handleCreateProcess('12')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">政策征求意见流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</div>
<!-- <div class="process-name">-->
<!-- <el-card shadow="hover" v-btn-permission="'344c9c97b581400718451e8b8a319382'">-->
<!-- <div class="card-box" @click="handleCreateProcess('12')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">政策征求意见流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </div>-->
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
<div class="card-box" @click="handleCreateProcess('7')">
@@ -124,21 +124,21 @@
</div>
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'a5694521151720f41a8b22d550bf435a'">
<div class="card-box" @click="handleCreateProcess('13')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">重点认证标准/政策合规性项目审查流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</div>
<!-- <div class="process-name">-->
<!-- <el-card shadow="hover" v-btn-permission="'a5694521151720f41a8b22d550bf435a'">-->
<!-- <div class="card-box" @click="handleCreateProcess('13')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">重点认证标准/政策合规性项目审查流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </div>-->
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
<div class="card-box" @click="handleCreateProcess('11')">
@@ -154,21 +154,21 @@
</div>
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'9c8cc1b74b1caa16f34a47895b489833'">
<div class="card-box" @click="handleCreateProcess('laws1')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">政策入库流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</div>
<!-- <div class="process-name">-->
<!-- <el-card shadow="hover" v-btn-permission="'9c8cc1b74b1caa16f34a47895b489833'">-->
<!-- <div class="card-box" @click="handleCreateProcess('laws1')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">政策入库流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </div>-->
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'a151f5e2ee44f8df81e201b8696fca31'">
<div class="card-box" @click="handleCreateProcess('8')">
@@ -285,36 +285,36 @@
<div>
<el-divider content-position="left"><h2>标准化活动相关流程</h2></el-divider>
<div class="process-box">
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'b196ef0253cebd1adfc3a8432a28e377'">
<div class="card-box" @click="handleCreateProcess('17')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">政策课题入会流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</div>
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'2f2752bc8a37b87d6eaadae3fcfe61c4'">
<div class="card-box" @click="handleCreateProcess('18')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">政策课题参会流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
</div>
</el-card>
</div>
<!-- <div class="process-name">-->
<!-- <el-card shadow="hover" v-btn-permission="'b196ef0253cebd1adfc3a8432a28e377'">-->
<!-- <div class="card-box" @click="handleCreateProcess('17')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">政策课题入会流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </div>-->
<!-- <div class="process-name">-->
<!-- <el-card shadow="hover" v-btn-permission="'2f2752bc8a37b87d6eaadae3fcfe61c4'">-->
<!-- <div class="card-box" @click="handleCreateProcess('18')">-->
<!-- <div class="card-top">-->
<!-- <div class="card-top-left">-->
<!-- <img :src="getImg(Math.floor(Math.random() * 6))">-->
<!-- </div>-->
<!-- <div class="card-top-right">-->
<!-- <div class="card-top-right-text">政策课题参会流程</div>-->
<!-- <div class="card-top-right-line"></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- </div>-->
<div class="process-name">
<el-card shadow="hover" v-btn-permission="'7845345e5fa2b0a93eb0e021bd3486f1'">
<div class="card-box" @click="handleCreateProcess('20')">
@@ -3,7 +3,7 @@
<ProcessHeaderPhone toggle>
<template slot="proName">标准调研流程</template>
<template slot="proNode">批准</template>
</ProcessHeaderPhone>
</ProcessHeaderPhone>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
@@ -85,6 +85,11 @@
label="责任人"
align="center">
</el-table-column>
<el-table-column
prop="institutionName"
label="责任部门"
align="center">
</el-table-column>
<el-table-column
label="文件"
align="center">
@@ -283,12 +283,12 @@
<van-field label="模块结构单元变型号(乘用车)" v-model="form.dybxhcar" readonly placeholder="请输入模块结构单元变型号"/>
<van-field label="模块结构单元名称(乘用车)" v-model="form.dymccar" readonly placeholder="请输入模块结构单元名称" />
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="" disabled>
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
<el-select v-model="form.qcdw" placeholder="" multiple disabled>
<el-option
v-for="item in qcdwOptions"
placeholder="请选择"
@@ -310,7 +310,7 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item style="display: none" label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
<el-select v-model="form.syrz" placeholder="请选择适用认证" multiple disabled>
<el-select v-model="form.syrz" placeholder="" multiple disabled>
<el-option
v-for="item in applyAuthOptions"
placeholder="请选择"
@@ -333,7 +333,7 @@
</el-form-item>-->
<van-field v-if="form.standInData === '0'" label="我司署名人" v-model="form.wssmr" readonly placeholder="请选择我司署名人"/>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
<el-select v-model="form.cysd" placeholder="" disabled>
<el-option
v-for="item in cysdOptions"
placeholder="请选择"
@@ -344,7 +344,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" disabled v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
<el-select :popper-append-to-body="false" disabled v-model="form.cyzbpm" placeholder="" clearable>
<el-option
v-for="item in cyzbpmOptions"
placeholder="请选择"
@@ -364,7 +364,7 @@
<div class="wrap">{{form.dtbjh}}</div>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
<el-select v-model="form.cbcd" placeholder="" disabled>
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
@@ -247,6 +247,25 @@
label-width="130px"
v-if="showInfoModal"
>
<el-form-item label="所属目录" prop="treeId" class="add-form-item">
<el-select ref="treeSelect" class="tree-select" v-model="attributeEO.treeId" value-key="id" placeholder="请选择所属目录">
<el-option class="tree-select-option" :value="attributeEO.treeId" :label="attributeEO.treeName">
<el-tree
ref="tree"
node-key="id"
class="tree-line"
icon-class="icon-tree"
:indent="0"
:props="props"
:data="treeList"
:default-expanded-keys="['1']"
highlight-current
@node-click="selectTreeClick"
:filter-node-method="filterNode">
</el-tree>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label="类型"
prop="dataType"
@@ -363,8 +382,13 @@ export default {
dataTitle: '',
dataExplain: '',
attachFileId: '',
treeId: '',
treeName: ''
},
attributeEOFormRules: {
treeId: [
{required: true, message: '所属目录不能为空', trigger: 'change'},
],
dataType: [
{required: true, message: '类型不能为空', trigger: 'change'},
],
@@ -462,8 +486,15 @@ export default {
treeClick(treeNode) {
this.selectSarMenu = treeNode
this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
this.attributeEO.treeName = treeNode.name
this.searchInfo()
},
selectTreeClick(treeNode) {
this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
this.attributeEO.treeName = treeNode.name
},
// 树节点鼠标移入移出
mouseenter(data) {
if (data.name !== '我的收藏') {
@@ -706,7 +737,8 @@ export default {
dataType: '',
dataTitle: '',
attachFileId: '',
treeId: this.selectSarMenu.id
treeId: this.selectSarMenu ? this.selectSarMenu.id : this.treeList[0].id,
treeName: this.selectSarMenu ? this.selectSarMenu.name : this.treeList[0].name
}
this.fileList = []
},
@@ -743,7 +775,7 @@ export default {
saveInfo() {
this.submitLoading = true
this.$refs['attributeEO'].validate((valid) => {
if (valid && this.attributeEO.attachFileId !== '') {
if (valid) {
if (this.attributeTitle === '新增'){
this.$http.postData(
'fileMaterialCenter/file-material',
@@ -777,9 +809,7 @@ export default {
}
)
}
} else {
this.$message.error('附件不能为空')
}else{
this.submitLoading = false
}
})
@@ -792,6 +822,8 @@ export default {
dataType: '',
dataTitle: '',
attachFileId: '',
treeId: '',
treeName: ''
}
})
this.showInfoModal = false
@@ -1007,4 +1039,20 @@ export default {
background: url('~@/assets/images/shangqi/img/tree.png');
background-size: 100% 100%;
}
.upload-demo{
/deep/.el-upload-list{
height: 60vh;
overflow-y: auto;
}
}
.tree-select{
.el-select-dropdown__item{
height: auto;
line-height: normal;
}
}
.tree-select-option{
height: auto;
padding: 0;
}
</style>
@@ -68,12 +68,11 @@
</el-table>
<!--分页-->
<pagination
v-show="this.tableLoading === false"
style="position: relative;"
:page="questionSerach.page"
:total="tableTotal"
@pageChange="handleSelectPageChange"
@pageSizeChange="handleSelectPageSizeChange"></pagination>
:total="questionSerach.total"
@pageChange="pageChangeFun"
@pageSizeChange="pageSizeChangeFun"></pagination>
</div>
<!--提问弹窗 -->
<el-dialog
@@ -632,6 +631,7 @@ export default {
problemDescription: '', //关键词/问题描述
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
total: 0
},
answerList: [],
answerListDrawer: false,
@@ -900,26 +900,6 @@ export default {
standTypeChange(){
this.questionForm.classification = this.standType
},
handleClick(){
this.ansSearch()
},
sourceClick(){
this.questionSerach.classification = this.activeName
this.questionSerach.standardEncdoing = ''
this.standSearch()
},
questionClick(){
sessionStorage.setItem('queId', this.activeQue)
this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
id: this.activeQue,
state: 'yes'
},{
_this: this
}, res => {
this.answerList = res.data
}, e => {
})
},
//提问按钮
queBtn(){
this.fileList = []
@@ -963,9 +943,18 @@ export default {
problemDescription: '', //关键词/问题描述
page:1,
pageSize:this.$store.getters.userInfo.configContent,
total: 0
}
this.searchBtn()
},
pageChangeFun(page) {
this.questionSerach.page = page
this.searchBtn()
},
pageSizeChangeFun(pageSize) {
this.questionSerach.pageSize = pageSize
this.searchBtn()
},
searchBtn(){
this.questionSerach.questioner = ''
this.tableLoading = true
@@ -975,44 +964,10 @@ export default {
_this: this
}, res => {
this.tableData = res.data.records
this.tableTotal = res.total
this.questionSerach.total = res.data.total
this.tableLoading = false
})
},
//问题查询
queSearch(){
this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{
standardId: this.activestand,
classification: this.activeName,
problemDescription: this.questionSerach.problemDescription
},{
_this: this
}, res => {
this.questionsList = res.data
})
},
//查询提问标准
standSearch2(){
let qId = this.$route.query.standId
let queNumber = 0
this.standList = []
this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{
_this: this
}, res =>{
res.data.forEach(item => {
if(item.standardId === qId){
this.standList.push(item)
queNumber++
}
})
if(queNumber === 0){
this.standList = res.data
this.refreshStandMap()
}
}, e => {
})
},
//文件上传前
beforeUploadTheme(file){
console.log(file);