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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-07-15 23:31:20 +08:00
parent 7e123b6f2c f3c88cc475
commit ab25da191e
26 changed files with 704 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+10 -4
View File
@@ -1,5 +1,5 @@
<template>
<div id="app" ref="appView">
<div id="app">
<!-- <router-view v-if="!isBoolean"/>-->
<span v-if="this.$route.name === 'Login'|| !isBoolean">
<router-view />
@@ -34,7 +34,7 @@
<nav-menu></nav-menu>
<div class="sub-container" style="margin-left: 60px">
<div class="container-box">
<router-view/>
<router-view ref="appView1"/>
</div>
</div>
</el-main>
@@ -70,7 +70,7 @@
<nav-menu></nav-menu>
<div class="sub-container" style="margin-left: 200px">
<div class="container-box">
<router-view/>
<router-view ref="appView2"/>
</div>
</div>
</el-main>
@@ -104,9 +104,15 @@ export default {
},
methods: {
handleRefreshTable() {
this.$nextTick(() => {
// 获取页面中已注册过ref的所有的子组件。
let refList = this.$refs.appView.$refs;
let refList = ''
if(this.$refs.appView1){
refList = this.$refs.appView1.$children[0].$refs;
}else{
refList = this.$refs.appView2.$children[0].$refs;
}
if (refList) {
for (let i of Object.keys(refList)) {
// 根据doLayout方法判断子组件是不是el-table
src/components/navMenu/index.vue
+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',
src/components/treeSelect/treeSelectModule.vue
+4
View File
@@ -323,4 +323,8 @@
// }
//}
.common-tree{
height: 100%;
overflow-y: auto;
}
</style>
src/components/treeSelect/treeSelectNew.vue
+4 -1
View File
@@ -320,5 +320,8 @@
// display: none;
// }
//}
.common-tree{
height: 100%;
overflow-y: auto;
}
</style>
src/components/workTree/index.vue
+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 {
src/pages/localTool/standAutoSplit/index.vue
+2
View File
@@ -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: '确定',
src/pages/processCenter/pages/components/ProcessHeader.vue
+14 -3
View File
@@ -36,12 +36,23 @@ export default {
methods: {
handleBack() {
if (this.$store.state.detailMap !== '') {
this.$router.push({
path: this.$store.state.detailMap,
query: {
let queryParam = {}
if(this.$route.query.bpnId){
queryParam = {
bpnId: this.$route.query.bpnId,
prcNum: this.$store.getters.getHandleInfo.prcNum || '',
tabsName: this.$store.getters.getHandleInfo.tabsName || ''
}
}else {
queryParam = {
bpnId: this.$route.query.bpnId,
prcNum: this.$store.getters.getHandleInfo.prcNum || '',
tabsName: this.$store.getters.getHandleInfo.tabsName || ''
}
}
this.$router.push({
path: this.$store.state.detailMap,
query: queryParam
})
this.$store.commit('setDetailMap', '')
} else {
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+3 -2
View File
@@ -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>
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+1
View File
@@ -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
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+1 -1
View File
@@ -2267,7 +2267,7 @@ export default {
bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
this.form.textStatus = this.form.textStatus === 'jjxoynfepp' ? '' : this.form.textStatus
this.form.textStatus = this.form.textStatus === 'jjxoynfepp' || this.form.textStatus === 'vsaga7nwub' ? '' : this.form.textStatus
this.getListTree(bringData)
this.form.standId = bringData.id
if (this.form.country) {
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+1 -1
View File
@@ -698,7 +698,7 @@
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard || !disabledXX"
v-show="verifySarStandard && !disabledXX"
show-save
show-submit
:submitLoading="isSubmit"
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+1 -1
View File
@@ -681,7 +681,7 @@
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard || !disabledXX"
v-show="verifySarStandard && !disabledXX"
show-save
show-submit
:submitLoading="isSubmit"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+2 -2
View File
@@ -23,7 +23,7 @@
></el-input>
</el-form-item>
<el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
<el-select disabled v-model="qbfsForm.bussSort" filterable placeholder="请选择企标类别" style="width: 100%;">
<el-option
v-for="(item, index) in standSortOptions"
:key="index"
@@ -497,7 +497,7 @@ export default {
}
this.qbfsForm.rqbName = this.selectList[0].rqbName
this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
this.qbfsForm.isRelate = this.selectList[0].isRelate
this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate
this.qbfsForm.useLevel = this.selectList[0].useLevel
this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
this.qbfsForm.technologic = this.selectList[0].technologic
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+2
View File
@@ -596,6 +596,8 @@ export default {
}
})
}else {
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
}
},
methods: {
src/pages/processCenter/pages/creatProcess/zcch/step1.vue
+57 -6
View File
@@ -75,7 +75,7 @@
clearable
></el-input>
<div v-if="rhform.modelList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in rhform.modelList" :key="index" @click="fileUpload" style="margin-right: 5px;">
<div v-for="(item, index) in rhform.modelList" :key="index" @click="handleFilePreview(item)" style="margin-right: 5px;">
{{ item.name }}
</div>
</div>
@@ -251,7 +251,7 @@
align="center">
<template slot-scope="scope">
<div v-if="scope.row.data.length > 0" class="fileClass">
<div v-for="(item, index) in scope.row.data" :key="index" @click="fileUpload2(scope.$index)" style="margin-right: 5px;">
<div v-for="(item, index) in scope.row.data" :key="index" @click="handleFilePreview(item)" style="margin-right: 5px;">
{{ item.name }}
</div>
</div>
@@ -392,7 +392,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst } from "api/process";
import { saveTaskFirst,taskDel,queryTaskFirst } from "api/process";
export default {
name: "zcchStep1",
@@ -652,6 +652,24 @@
})
this.data2[this.fileIndex].dataName = list
},
// 文件预览及下载
handleFilePreview(file) {
let attId = ""
if(file && file.id){
attId = file.id
}else {
attId = file.response.data.id
}
if (this.preview) {
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.$preview(attId)
}
},
fileUpload() {
this.fileMadel = true
},
@@ -748,8 +766,17 @@
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '18'
this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '18',
json: JSON.stringify({
form: this.rhform,
roleForm: this.roleForm,
commentText: this.commentText,
data1: this.data1,
data2: this.data2,
})
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.rhform, this.roleForm)
@@ -763,6 +790,14 @@
}, {}, res => {
if (res.success) {
this.$message.success('流程发起成功')
if (this.$route.query.bpnId !== '') {
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push('/processCenter')
this.isSubmit = false
} else {
@@ -822,8 +857,24 @@
this.roleForm.presidentIdName = data[0].name
}
}, // 选择人员确认事件
getTaskId() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.rhform = JSON.parse(JSON.stringify(mes.form))
this.data1 = mes.data1
this.data2 = mes.data2
this.roleForm = mes.roleForm
this.commentText = mes.commentText
})
},
},
mounted() {}
mounted() {
if(this.$route.query.bpnId){
this.getTaskId()
}
}
};
</script>
src/pages/processCenter/pages/creatProcess/zcrh/step1.vue
+57 -6
View File
@@ -53,7 +53,7 @@
clearable
></el-input>
<div v-if="rhform.modelList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in rhform.modelList" :key="index" @click="fileUpload" style="margin-right: 5px;">
<div v-for="(item, index) in rhform.modelList" :key="index" @click="handleFilePreview(item)" style="margin-right: 5px;cursor: pointer">
{{ item.name }}
</div>
</div>
@@ -229,7 +229,7 @@
align="center">
<template slot-scope="scope">
<div v-if="scope.row.data.length > 0" class="fileClass">
<div v-for="(item, index) in scope.row.data" :key="index" @click="fileUpload2(scope.$index)" style="margin-right: 5px;">
<div v-for="(item, index) in scope.row.data" :key="index" @click="handleFilePreview(item)" style="margin-right: 5px;cursor: pointer">
{{ item.name }}
</div>
</div>
@@ -381,7 +381,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst } from "api/process";
import { saveTaskFirst,taskDel,queryTaskFirst } from "api/process";
export default {
name: "zcrhStep1",
@@ -631,6 +631,24 @@
})
this.data2[this.fileIndex].dataName = list
},
// 文件预览及下载
handleFilePreview(file) {
let attId = ""
if(file && file.id){
attId = file.id
}else {
attId = file.response.data.id
}
if (this.preview) {
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.$preview(attId)
}
},
fileUpload() {
this.fileMadel = true
},
@@ -727,8 +745,17 @@
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '17'
this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '17',
json: JSON.stringify({
form: this.rhform,
roleForm: this.roleForm,
commentText: this.commentText,
data1: this.data1,
data2: this.data2,
})
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.rhform, this.roleForm)
@@ -742,6 +769,14 @@
}, {}, res => {
if (res.success) {
this.$message.success('流程发起成功')
if (this.$route.query.bpnId !== '') {
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push('/processCenter')
this.isSubmit = false
} else {
@@ -801,8 +836,24 @@
this.roleForm.presidentIdName = data[0].name
}
}, // 选择人员确认事件
getTaskId() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.rhform = JSON.parse(JSON.stringify(mes.form))
this.data1 = mes.data1
this.data2 = mes.data2
this.roleForm = mes.roleForm
this.commentText = mes.commentText
})
},
},
mounted() {}
mounted() {
if(this.$route.query.bpnId){
this.getTaskId()
}
}
};
</script>
src/pages/processCenter/pages/newProcess/index.vue
+75 -75
View File
@@ -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')">
src/pages/processCenter/pages/phone/bzdy/step9.vue
+6 -1
View File
@@ -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">
src/pages/processCenter/pages/phone/bzrk/step2.vue
+6 -6
View File
@@ -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>
src/pages/processCenter/pages/phone/bzzqyj/step6.vue
-1
View File
@@ -188,7 +188,6 @@
<div v-html="itermsConditionsTitle"></div>
</van-dialog>
<phone-role
check-more
role-title="选择审批领导"
:is-show-phone.sync="modalshowflag"
@checkedRole="checkedRole2"
src/pages/regulatoryRepository/dataCenter/index.vue
+54 -5
View File
@@ -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'},
],
@@ -461,9 +485,16 @@ export default {
},
treeClick(treeNode) {
this.selectSarMenu = treeNode
this.dataCenterSearch.treeId = treeNode.id
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,6 +737,8 @@ export default {
dataType: '',
dataTitle: '',
attachFileId: '',
treeId: this.selectSarMenu ? this.selectSarMenu.id : this.treeList[0].id,
treeName: this.selectSarMenu ? this.selectSarMenu.name : this.treeList[0].name
}
this.fileList = []
},
@@ -742,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',
@@ -776,9 +809,7 @@ export default {
}
)
}
} else {
this.$message.error('附件不能为空')
}else{
this.submitLoading = false
}
})
@@ -791,6 +822,8 @@ export default {
dataType: '',
dataTitle: '',
attachFileId: '',
treeId: '',
treeName: ''
}
})
this.showInfoModal = false
@@ -1006,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>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+110 -8
View File
@@ -1122,7 +1122,8 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@sort-change="sortChangeConfig"
@selection-change="selectConfigStandChange">
@select="handleSelectConfigStand"
@select-all="selectConfigStandAll">
<el-table-column
type="selection"
align="center">
@@ -1185,6 +1186,36 @@
:total="configTotal"
@pageChange="configuraPageChange"
@pageSizeChange="configuraPageSizeChange"></pagination>
<div class="divDel">
<div class="divDel_title">已选标准</div>
<div class="divDel_box">
<el-tag
v-for="tag in selectConfigStandList"
:key="tag.id"
size="mini"
@close="handleTagClose(tag)"
closable>
<a v-if="tag.standYear && textStatusMap[tag.textStatus] === '废止' || textStatusMap[tag.textStatus] === '被代替'"
class="table-jump" style="color: #F56C6C"
@click="handlePreview(tag)">{{ tag.standSortShow }} {{
tag.standNumber
}}-{{ tag.standYear }}</a>
<a v-else-if="tag.standYear && textStatusMap[tag.textStatus] === '参考' "
class="table-jump" style="color: #98E165"
@click="handlePreview(tag)">{{ tag.standSortShow }} {{
tag.standNumber
}}-{{ tag.standYear }}</a>
<a v-else-if="tag.standYear" class="table-jump" style="color: #333333"
@click="handlePreview(tag)">{{ tag.standSortShow }} {{
tag.standNumber
}}-{{ tag.standYear }}</a>
<a v-else @click="handlePreview(tag)" class="table-jump" style="color: #333333">
{{ tag.standSortShow }}
{{ tag.standNumber }}</a>
</el-tag>
<!-- <el-tag v-show="delList.length > 0 && !checkBox" type="danger" closable size="mini" @close="handleCloseAll()">全部删除</el-tag>-->
</div>
</div>
</div>
<div class="demo-drawer-footer">
<el-button
@@ -2925,6 +2956,8 @@ export default {
configStandList: [],
configStandtotal: 0,
selectConfigStand: [],
selectConfigStandList: [],
selectConfigStandMap: new Map(),
collectBtn: false,
formFieldList: [],
reloadAddForm: false,
@@ -4719,6 +4752,13 @@ export default {
this.configStandList = res.data.list
this.configTotal = res.data.count
this.selectConfigStand = []
this.$nextTick(()=>{
this.configStandList.forEach(item=>{
if(this.selectConfigStandMap.get(item.id)){
this.$refs.selection.toggleRowSelection(item,true)
}
})
})
}, e => {
})
},
@@ -5265,6 +5305,8 @@ export default {
cancelConfigStand() {
this.configStandFlag = false
this.selectConfigStand = []
this.selectConfigStandList = []
this.selectConfigStandMap = new Map()
},
// 表对应标准移除分类到
deleteStandFromKind(flag, item) {
@@ -5348,10 +5390,47 @@ export default {
this.sarConfigStandSearch.page = 1
this.selectConfiguraStand()
},
selectConfigStandChange(alldata) {
this.selectConfigStand = []
for (let i = 0; i < alldata.length; i++) {
this.selectConfigStand.push(alldata[i].id)
// 已选标准-删除
handleTagClose(row){
this.handleSelectConfigStand({},row)
this.$refs.selection.toggleRowSelection(row,false)
},
// 配置标准弹窗-表格-单选
handleSelectConfigStand(selection, row){
if(this.selectConfigStandMap.get(row.id)){
this.selectConfigStandMap.delete(row.id)
for(let i=0; i<this.selectConfigStandList.length; i++){
if(this.selectConfigStandList[i].id === row.id){
this.selectConfigStandList.splice(i,1)
return
}
}
}else{
this.selectConfigStandMap.set(row.id,row)
this.selectConfigStandList.push(row)
}
},
// 配置标准弹窗-表格-全选
selectConfigStandAll(selection) {
if(selection.length !== 0 ){
for (let i = 0; i < selection.length; i++) {
if(!this.selectConfigStandMap.get(selection[i].id)){
this.selectConfigStandList.push(selection[i])
this.selectConfigStandMap.set(selection[i].id, selection[i])
}
}
}else{
for(let i=0; i<this.configStandList.length; i++){
this.selectConfigStandMap.delete(this.configStandList[i].id)
}
if(this.selectConfigStandMap.size === 0){
this.selectConfigStandList = []
}else{
this.selectConfigStandList = []
this.selectConfigStandMap.forEach(item=>{
this.selectConfigStandList.push(item)
})
}
}
},
// 配置标准-表格排序
@@ -5409,14 +5488,17 @@ export default {
saveConfigStand() {
let search = {}
search.menuId = this.selectSarMenu.id
if (this.selectConfigStand.length === 0) {
if (this.selectConfigStandList.length === 0) {
this.$message({
showClose: true,
message: '请至少选择一条标准',
type: 'warning'
})
} else {
search.idlist = this.selectConfigStand
search.idlist = []
for (let i = 0; i < this.selectConfigStandList.length; i++) {
search.idlist.push(this.selectConfigStandList[i].id)
}
this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, {
_this: this,
loading: 'isSubmit'
@@ -6324,7 +6406,7 @@ export default {
.el-drawer__wrapper {
.demo-drawer-content {
.drawer-content {
height: calc(~'100% - 52px - 56px');
height: calc(~'100% - 52px - 56px - 100px');
flex: auto;
display: flex;
flex-direction: column;
@@ -6358,4 +6440,24 @@ export default {
.classDisplay {
display: none;
}
.divDel {
border-top: 1px solid #000;
height: 100px;
.divDel_title {
margin: 10px;
}
.divDel_box {
height: 55px;
padding: 0px;
display: flex;
flex-wrap: wrap;
overflow: auto;
margin: 10px;
align-content: flex-start;
span {
margin: 0px 5px 5px 0;
}
}
}
</style>
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+95 -9
View File
@@ -965,7 +965,8 @@
border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
@sort-change="sortChangeConfig"
@selection-change="selectConfigStandChange">
@select="handleSelectConfigStand"
@select-all="selectConfigStandAll">
<el-table-column
type="selection"
width="55"
@@ -1018,6 +1019,20 @@
@pageChange="configuraPageChange"
@pageSizeChange="configuraPageSizeChange"></pagination>
<loading :loading="configLoading">加载中...</loading>
<div class="divDel">
<div class="divDel_title">已选标准</div>
<div class="divDel_box">
<el-tag
v-for="tag in selectConfigStandList"
:key="tag.id"
size="mini"
@close="handleTagClose(tag)"
closable>
{{tag.standCode}}
</el-tag>
<!-- <el-tag v-show="delList.length > 0 && !checkBox" type="danger" closable size="mini" @close="handleCloseAll()">全部删除</el-tag>-->
</div>
</div>
</div>
<div class="demo-drawer-footer">
<el-button
@@ -2320,6 +2335,8 @@ export default {
configStandtotal: 0,
height: null,
selectConfigStand: [],
selectConfigStandList: [],
selectConfigStandMap: new Map(),
configLoading: false, // 配置表格加载中
searchConfigNodes: [], // 责任部门树结构
zNodesSItem: [],
@@ -3374,6 +3391,8 @@ export default {
this.sarConfigStandSearch.replaceStandNum = ''
this.configPage = 1
this.selectConfigStand = []
this.selectConfigStandList = []
this.selectConfigStandMap = new Map()
},
async saveConfStand(item) {
if(item.menuId && item.menuId !== ''){
@@ -3401,14 +3420,17 @@ export default {
search.menuId = this.selectSarMenu.id
search.menuName = this.selectSarMenu.menuName
search.treeType = this.selectSarMenu.treeType
if (this.selectConfigStand.length === 0) {
if (this.selectConfigStandList.length === 0) {
this.$message({
showClose: true,
message: '请至少选择一条标准',
type: 'warning'
})
} else {
search.idlist = this.selectConfigStand
search.idlist = []
for (let i = 0; i < this.selectConfigStandList.length; i++) {
search.idlist.push(this.selectConfigStandList[i].id)
}
this.$http.postData('lawss/sarBussionessStand/saveStandardsMenu', search, {
_this: this,
loading: 'isSubmit'
@@ -3459,13 +3481,50 @@ export default {
}
this.selectConfiguraStand()
},
// 表格
selectConfigStandChange(alldata) {
this.selectConfigStand = []
for (let i = 0; i < alldata.length; i++) {
this.selectConfigStand.push(alldata[i].id)
// 已选标准-删除
handleTagClose(row){
this.handleSelectConfigStand({},row)
this.$refs.selection.toggleRowSelection(row,false)
},
// 配置标准弹窗-表格-单选
handleSelectConfigStand(selection, row){
if(this.selectConfigStandMap.get(row.id)){
this.selectConfigStandMap.delete(row.id)
for(let i=0; i<this.selectConfigStandList.length; i++){
if(this.selectConfigStandList[i].id === row.id){
this.selectConfigStandList.splice(i,1)
return
}
}
}else{
this.selectConfigStandMap.set(row.id,row)
this.selectConfigStandList.push(row)
}
},
// 配置标准弹窗-表格-全选
selectConfigStandAll(selection) {
if(selection.length !== 0 ){
for (let i = 0; i < selection.length; i++) {
if(!this.selectConfigStandMap.get(selection[i].id)){
this.selectConfigStandList.push(selection[i])
this.selectConfigStandMap.set(selection[i].id, selection[i])
}
}
}else{
for(let i=0; i<this.configStandList.length; i++){
this.selectConfigStandMap.delete(this.configStandList[i].id)
}
if(this.selectConfigStandMap.size === 0){
this.selectConfigStandList = []
}else{
this.selectConfigStandList = []
this.selectConfigStandMap.forEach(item=>{
this.selectConfigStandList.push(item)
})
}
}
},
SearchTreeConfigDblClick(treeId, treeNode) {
this.sarConfigStandSearch.responsibleUnit = treeNode.id
this.sarConfigStandSearch.orgName = treeNode.name
@@ -4555,6 +4614,13 @@ export default {
this.configStandList = res.data.list
this.configTotal = res.data.count
this.selectConfigStand = []
this.$nextTick(()=>{
this.configStandList.forEach(item=>{
if(this.selectConfigStandMap.get(item.id)){
this.$refs.selection.toggleRowSelection(item,true)
}
})
})
}, e => {
})
},
@@ -5578,7 +5644,7 @@ export default {
.el-drawer__wrapper {
.demo-drawer-content {
.drawer-content {
//height: calc(~'100% - 52px - 56px');
height: calc(~'100% - 52px - 56px - 100px');
flex: auto;
display: flex;
flex-direction: column;
@@ -5607,4 +5673,24 @@ export default {
::v-deep .el-drawer {
outline: none !important;
}
.divDel {
border-top: 1px solid #000;
height: 100px;
.divDel_title {
margin: 10px;
}
.divDel_box {
height: 55px;
padding: 0px;
display: flex;
flex-wrap: wrap;
overflow: auto;
margin: 10px;
align-content: flex-start;
span {
margin: 0px 5px 5px 0;
}
}
}
</style>
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+15 -1
View File
@@ -832,7 +832,21 @@
}
},
props: {},
watch: {},
watch: {
'addForm.esMatingRelations': {
handler: function(val) {
if(val && val !== ''){
if(val.indexOf(",") !== -1){
const list = val.split(",")
const filterList = list.filter(s => s !== 'null');
this.addForm.esMatingRelations = filterList.join(",");
}else if(val === 'null'){
this.addForm.esMatingRelations = "";
}
}
}
},
},
methods: {
workChange (data) {
this.workGroupList = data
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+110 -8
View File
@@ -1499,7 +1499,8 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
height="100%"
@selection-change="selectConfigStandChange">
@select="handleSelectConfigStand"
@select-all="selectConfigStandAll">
<el-table-column
type="selection"
width="55"
@@ -1556,6 +1557,36 @@
:total="configTotal"
@pageChange="configuraPageChange"
@pageSizeChange="configuraPageSizeChange"></pagination>
<div class="divDel">
<div class="divDel_title">已选标准</div>
<div class="divDel_box">
<el-tag
v-for="tag in selectConfigStandList"
:key="tag.id"
size="mini"
@close="handleTagClose(tag)"
closable>
<a v-if="tag.standYear && textStatusMap[tag.textStatus] === '废止' || textStatusMap[tag.textStatus] === '被代替'"
class="table-jump" style="color: #F56C6C"
@click="handlePreview(tag)">{{ tag.standSortShow }} {{
tag.standNumber
}}-{{ tag.standYear }}</a>
<a v-else-if="tag.standYear && textStatusMap[tag.textStatus] === '参考' "
class="table-jump" style="color: #98E165"
@click="handlePreview(tag)">{{ tag.standSortShow }} {{
tag.standNumber
}}-{{ tag.standYear }}</a>
<a v-else-if="tag.standYear" class="table-jump" style="color: #333333"
@click="handlePreview(tag)">{{ tag.standSortShow }} {{
tag.standNumber
}}-{{ tag.standYear }}</a>
<a v-else @click="handlePreview(tag)" class="table-jump" style="color: #333333">
{{ tag.standSortShow }}
{{ tag.standNumber }}</a>
</el-tag>
<!-- <el-tag v-show="delList.length > 0 && !checkBox" type="danger" closable size="mini" @close="handleCloseAll()">全部删除</el-tag>-->
</div>
</div>
</div>
<div class="demo-drawer-footer">
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" :loading="isSubmit" @click="saveConfigStand">
@@ -2521,6 +2552,8 @@ export default {
configStandList: [],
configStandtotal: 0,
selectConfigStand: [],
selectConfigStandList: [],
selectConfigStandMap: new Map(),
collectBtn: false,
formFieldList: [],
reloadAddForm: false,
@@ -4108,6 +4141,13 @@ export default {
this.configStandList = res.data.list
this.configTotal = res.data.count
this.selectConfigStand = []
this.$nextTick(()=>{
this.configStandList.forEach(item=>{
if(this.selectConfigStandMap.get(item.id)){
this.$refs.selection.toggleRowSelection(item,true)
}
})
})
}, e => {
})
},
@@ -4597,6 +4637,8 @@ export default {
cancelConfigStand() {
this.configStandFlag = false
this.selectConfigStand = []
this.selectConfigStandList = []
this.selectConfigStandMap = new Map()
},
OCRAdd(type) {
let text = ''
@@ -4722,24 +4764,64 @@ export default {
this.sarConfigStandSearch.page = 1
this.selectConfiguraStand()
},
selectConfigStandChange(alldata) {
this.selectConfigStand = []
for (let i = 0; i < alldata.length; i++) {
this.selectConfigStand.push(alldata[i].id)
// 已选标准-删除
handleTagClose(row){
this.handleSelectConfigStand({},row)
this.$refs.selection.toggleRowSelection(row,false)
},
// 配置标准弹窗-表格-单选
handleSelectConfigStand(selection, row){
if(this.selectConfigStandMap.get(row.id)){
this.selectConfigStandMap.delete(row.id)
for(let i=0; i<this.selectConfigStandList.length; i++){
if(this.selectConfigStandList[i].id === row.id){
this.selectConfigStandList.splice(i,1)
return
}
}
}else{
this.selectConfigStandMap.set(row.id,row)
this.selectConfigStandList.push(row)
}
},
// 配置标准弹窗-表格-全选
selectConfigStandAll(selection) {
if(selection.length !== 0 ){
for (let i = 0; i < selection.length; i++) {
if(!this.selectConfigStandMap.get(selection[i].id)){
this.selectConfigStandList.push(selection[i])
this.selectConfigStandMap.set(selection[i].id, selection[i])
}
}
}else{
for(let i=0; i<this.configStandList.length; i++){
this.selectConfigStandMap.delete(this.configStandList[i].id)
}
if(this.selectConfigStandMap.size === 0){
this.selectConfigStandList = []
}else{
this.selectConfigStandList = []
this.selectConfigStandMap.forEach(item=>{
this.selectConfigStandList.push(item)
})
}
}
},
// 提交配置搜索项
saveConfigStand() {
let search = {}
search.menuId = this.selectSarMenu.id
if (this.selectConfigStand.length === 0) {
if (this.selectConfigStandList.length === 0) {
this.$message({
showClose: true,
message: '请至少选择一条标准',
type: 'warning'
})
} else {
search.idlist = this.selectConfigStand
search.idlist = []
for (let i = 0; i < this.selectConfigStandList.length; i++) {
search.idlist.push(this.selectConfigStandList[i].id)
}
this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, {
_this: this,
loading: 'isSubmit'
@@ -5634,7 +5716,7 @@ export default {
.el-drawer__wrapper {
.demo-drawer-content {
.drawer-content {
//height: calc(~'100% - 52px - 56px');
height: calc(~'100% - 52px - 56px - 100px');
flex: auto;
display: flex;
flex-direction: column;
@@ -5765,4 +5847,24 @@ export default {
display: none;
}
}
.divDel {
border-top: 1px solid #000;
height: 100px;
.divDel_title {
margin: 10px;
}
.divDel_box {
height: 55px;
padding: 0px;
display: flex;
flex-wrap: wrap;
overflow: auto;
margin: 10px;
align-content: flex-start;
span {
margin: 0px 5px 5px 0;
}
}
}
</style>
src/pages/regulatoryRepository/standQA/index.vue
+14 -59
View File
@@ -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);