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:
zhaokaiyao@91isoft.com
2021-09-07 14:29:30 +08:00
parent 303836eac5 904514ddb5
commit b13961e1d8
12 changed files with 253 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/index.vue
+10 -5
View File
@@ -122,7 +122,7 @@
</el-table>
</div>
<loading :loading="Loading">加载中...</loading>
<pagination :page="page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
<pagination :page="page" :total="total" :pageSize="pageSize" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
</div>
<loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
<el-drawer
@@ -278,13 +278,18 @@ export default {
_this: this,
loading: 'treeLoading'
}, res => {
console.log(res);
this.treeData = res.data
this.id = res.data[0].id
this.getData()
}, e => {
console.log(e);
})
},
getData () {
this.$http.post('SarInstitution/institution/user', {
current:this.page,
size: this.pageSize,
institutionId: this.id,
uname: this.searchForm.uname,
email: this.searchForm.email
@@ -293,7 +298,7 @@ export default {
loading: 'Loading'
}, res => {
console.log(res.data)
res.data.forEach((item) => {
res.data.records.forEach((item) => {
var NameList = ''
item.positions.forEach((items) => {
if (NameList.length > 0) {
@@ -303,8 +308,8 @@ export default {
})
item.NameList = NameList
})
this.data = res.data
this.total = res.data.length
this.data = res.data.records
this.total = res.data.total
})
},
pageChange (page) {
@@ -312,7 +317,7 @@ export default {
this.getData()
},
pageSizeChange (pageSize) {
this.$store.getters.userInfo.configContent = pageSize
this.pageSize = pageSize
this.getData()
},
},
src/pages/config/pages/postManage/index.vue
+63 -5
View File
@@ -1,6 +1,30 @@
<!-- 配置管理 - 岗位管理 -->
<template>
<div id="post-manage">
<div class="search-area">
<div class="left">
<el-form ref="" :model="sarPost" inline>
<el-form-item label="岗位名称" class="search-item">
<el-input v-model="sarPost.name"
placeholder="岗位名称查找"
clearable></el-input>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchPostName"
v-btn-permission="">查询
</el-button>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-default" @click="resetSelect" size="mini"
v-btn-permission="">清空
</el-button>
</el-form-item>
</el-form>
</div>
<div class="right">
</div>
</div>
<div class="action-bar">
<el-button type="primary"
class="common-button-primary add-button"
@@ -65,6 +89,7 @@
</template>
</el-table-column>
</el-table>
<pagination :page="page" :pageSize="pageSize" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
</div>
<loading :loading="Loading">加载中...</loading>
<el-dialog
@@ -133,7 +158,13 @@
name: 'PostManage',
data () {
return {
editId: '',
sarPost: {
name: "", // 岗位名称
},
pageSize: this.$store.getters.userInfo.configContent,
page: 1,
total: 0,
editId: '',
type: '', // 1为新增 2为编辑
dialogTitle: '',
nodeList: [],
@@ -160,6 +191,24 @@
}
},
methods: {
searchPostName() {
this.page = 1;
this.getData();
}, // 查询
pageChange(page) {
this.page = page;
this.getData();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize;
this.getData();
},
// 分页查询
resetSelect() {
this.sarPost.name = "";
this.getData();
}, // 外层清空条件查询
handleCommand (command) {
switch (command[1]) {
case '删除':
@@ -177,7 +226,10 @@
if (res.ok) {
this.$message.success('删除成功')
this.getData()
} else {
this.$message.warning(res.message)
}
this.submitLoading = false
})
},
editData (row) {
@@ -225,11 +277,15 @@
}
},
getData () { // 获取岗位数据
this.$http.get('sarPosition/position', {}, {
this.$http.get('sarPosition/position', {
current: this.page,
pageSize: this.pageSize,
...this.sarPost,
}, {
_this: this,
loading: 'Loading'
}, res=> {
res.data.forEach((item)=>{
res.data.records.forEach((item)=>{
var idList = []
var NameList = ''
item.roles.forEach((items)=>{
@@ -242,7 +298,9 @@
item.idList = idList
item.NameList = NameList
})
this.data = res.data
// this.data = res.data
this.data = res.data.records
this.total = res.data.total
})
},
addModal () { // 点击新增按钮
@@ -317,7 +375,7 @@
#post-manage {
height: 100%;
.content {
height: calc(~'100% - 53px')
height: calc(~'100% - 105px - 56px')
}
.filter-tree {
height: calc(~'100% - 50px')
src/pages/login/index.vue
-7
View File
@@ -289,22 +289,15 @@
})
},
loginNew (res) {
window.sessionStorage.setItem('go1', '开始第一步'); // del
if (res.data.orgId === null || res.data.orgId === '') {
this.$message.warning('未分配组织机构,请联系管理员分配后重新登录')
return
}
window.sessionStorage.setItem('go2', '开始第二步'); // del
let Base64 = require('js-base64').Base64
window.sessionStorage.setItem('go3', '开始第3步'); // del
let userInfoStr = Base64.decode(res.data)
window.sessionStorage.setItem('go4', '开始第4步'); // del
let userInfo2 = decodeURIComponent(userInfoStr)
window.sessionStorage.setItem('go5', '开始第5步'); // del
let userInfoObj = JSON.parse(userInfo2)
window.sessionStorage.setItem('go6', '开始第6步'); // del
userInfoObj.userId = userInfoObj.usid
window.sessionStorage.setItem('go7', '开始第7步'); // del
window.sessionStorage.setItem('userInfoObj', userInfoObj); // del
this.setToken(userInfoObj.token) // vuex存储token
let userInfo = {}
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+37 -11
View File
@@ -38,15 +38,17 @@
placeholder="请选择完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="调研模板" prop="modelName" class="add-form-item form-item-disabled">
<el-form-item label="调研模板" prop="modelNameList" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.modelName"
v-model="form.modelNameList"
clearable
></el-input>
<div v-if="form.modelName" @click="fileUpload" class="fileClass">
{{ form.modelName }}
<div v-if="form.modelList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in form.modelList" :key="index" @click="fileUpload" style="margin-right: 5px;">
{{ item.name }}
</div>
</div>
<div v-else>
<el-button
@@ -169,6 +171,7 @@
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload
multiple
class="upload-demo"
drag
:action="fileUrl"
ref="importfile"
@@ -176,7 +179,8 @@
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:show-file-list="false"
:on-remove="importFileRemove"
:show-file-list="true"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
@@ -212,8 +216,8 @@
form: {
title: '', // 调研标题
date: '', // 完成时间
model: '', // 上传模板
modelName: ''
modelList: [],
modelNameList: ''
},
formRules: {
title: [
@@ -222,7 +226,7 @@
date: [
{ type: 'date', required: true, message: '请选择完成时间', trigger: 'change' }
],
modelName: [
modelNameList: [
{ required: true, message: '请上传调研结果', trigger: 'change' },
]
},
@@ -344,12 +348,34 @@
}
return true
},
importFileRemove (file, fileList) {
let list = ''
this.form.modelList = []
fileList.forEach(item => {
this.form.modelList.push(item)
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.modelNameList = list
},
// 导入标准数据成功后执行
importFileSuccess (response, file) {
if (response.ok) {
this.fileMadel = false
this.form.model = response.data.id
this.form.modelName = response.data.name
this.form.modelList.push(response.data)
let list = ''
this.form.modelList.forEach(item => {
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.modelNameList = list
this.$message({
showClose: true,
message: response.message,
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+36 -30
View File
@@ -38,15 +38,17 @@
placeholder="请选择完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="调研模板" prop="modelName" class="add-form-item form-item-disabled">
<el-form-item label="调研模板" prop="modelNameList" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.modelName"
v-model="form.modelNameList"
clearable
></el-input>
<div v-if="form.modelName" @click="fileUpload" class="fileClass">
{{ form.modelName }}
<div v-if="form.modelList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in form.modelList" :key="index" @click="fileUpload" style="margin-right: 5px;">
{{ item.name }}
</div>
</div>
<div v-else>
<el-button
@@ -56,11 +58,6 @@
size="mini">
点击上传
</el-button>
<!-- <el-button type="primary" @click="fileUpload">-->
<!-- <i class="el-icon-upload el-icon&#45;&#45;right"></i>-->
<!-- {{isFileUploadStr}}-->
<!-- </el-button>-->
</div>
</el-form-item>
</el-col>
@@ -174,6 +171,7 @@
></Role-tree>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload
multiple
class="upload-demo"
drag
:action="fileUrl"
@@ -182,7 +180,7 @@
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:on-progress="progressFile"
:on-remove="importFileRemove"
:show-file-list="true"
>
<div style="padding: 20px 0">
@@ -190,7 +188,6 @@
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
<!-- <el-progress style="width: 380px; margin-top: 5px;" v-show="progressType" :percentage="loadProgress"></el-progress>-->
</el-dialog>
</div>
</template>
@@ -205,9 +202,6 @@ export default {
name: "bzdyStep1",
data() {
return {
// isFileUploadStr:'点击上传',
progressType: false,
loadProgress: 0,
commentText: '',
nodeList: [],
nodeList2: [],
@@ -223,8 +217,8 @@ export default {
form: {
title: '', // 调研标题
date: '', // 完成时间
model: '', // 上传模板
modelName: ''
modelList: [],
modelNameList: ''
},
formRules: {
title: [
@@ -233,7 +227,7 @@ export default {
date: [
{ type: 'date', required: true, message: '请选择完成时间', trigger: 'change' }
],
modelName: [
modelNameList: [
{ required: true, message: '请上传调研结果', trigger: 'change' },
]
},
@@ -320,10 +314,6 @@ export default {
this.drawerTitle = title
this.modalshowflag = true
},
progressFile (event, file, fileList) {
let loadProgress = Math.floor(event.percent)
this.loadProgress = loadProgress
},
// 导入按钮 上传之前的钩子
beginImportFile (file) {
var filename = file.name
@@ -332,13 +322,11 @@ export default {
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
this.progressType = true
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
this.progressType = false
return false
}
// 判断文件上传大小
@@ -347,20 +335,38 @@ export default {
return true
} else {
this.$message.error('文件' + file.name + '大小不超过200M')
this.progressType = false
return false
}
return true
},
importFileRemove (file, fileList) {
let list = ''
this.form.modelList = []
fileList.forEach(item => {
this.form.modelList.push(item)
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.modelNameList = list
},
// 导入标准数据成功后执行
importFileSuccess (response, file) {
if (response.ok) {
// this.isFileUploadStr='点击查看已上传文件';
this.fileMadel = false;
this.loadProgress = 0
this.progressType = false
this.form.model = response.data.id
this.form.modelName = response.data.name
this.form.modelList.push(response.data)
let list = ''
this.form.modelList.forEach(item => {
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.modelNameList = list
this.$message({
showClose: true,
message: response.message,
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+10 -7
View File
@@ -41,8 +41,10 @@
</el-date-picker>
</el-form-item>
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.model" class="fileClass" @click="updateFile">
{{ form.modelName }}
<div v-if="form.modelList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
{{ item.name }}
</div>
</div>
<div v-else>
- -
@@ -178,7 +180,7 @@
form: {
title: '', // 调研标题
date: '', // 完成时间
model: '', // 上传模板
modelList: [],
responUserList: '',
responUserListName: '',
},
@@ -203,8 +205,8 @@
this.histortData = res
}, e => {})
},
updateFile () {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model
updateFile (item) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
checkedRole2 (data) {
var idList = ''
@@ -276,11 +278,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.modelList = data.modelList || data.form.modelList
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.model = data.model || data.form.model
this.form.modelName = data.modelName || data.form.modelName
// this.form.model = data.model || data.form.model
// this.form.modelName = data.modelName || data.form.modelName
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+8 -8
View File
@@ -41,8 +41,10 @@
</el-date-picker>
</el-form-item>
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.model" class="fileClass" @click="updateFile">
{{ form.modelName }}
<div v-if="form.modelList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
{{ item.name }}
</div>
</div>
<div v-else>
- -
@@ -197,8 +199,7 @@
form: {
title: '', // 调研标题
date: '', // 完成时间
model: '', // 上传模板
modelName: '',
modelList: [],
fileId: '',
fileName: '',
responUserList: '',
@@ -227,8 +228,8 @@
this.histortData = res
}, e => {})
},
updateFile () {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + this.form.model
updateFile (item) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
// 导入按钮 上传之前的钩子
beginImportFile (file) {
@@ -323,8 +324,7 @@
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.model = data.model || data.form.model
this.form.modelName = data.modelName || data.form.modelName
this.form.modelList = data.modelList || data.form.modelList
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
this.form.fileName = data.form.fileName || data.fileName || ''
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+6 -6
View File
@@ -41,8 +41,10 @@
</el-date-picker>
</el-form-item>
<el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.model" class="fileClass" @click="updateFile(form.model)">
{{ form.modelName }}
<div v-if="form.modelList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item.id)">
{{ item.name }}
</div>
</div>
<div v-else>
- -
@@ -169,8 +171,7 @@
form: {
title: '', // 调研标题
date: '', // 完成时间
model: '', // 上传模板
modelName: '',
modelList: [],
fileId: '',
fileName: '',
responUserList: '',
@@ -257,8 +258,7 @@
this.json = data || data.form
this.form.file = data.fileId || data.form.fileId
this.form.fileName = data.fileName || data.form.fileName
this.form.model = data.model || data.form.model
this.form.modelName = data.modelName || data.form.modelName
this.form.modelList = data.modelList || data.form.modelList
}).catch(e => {
})
})
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+60 -32
View File
@@ -459,7 +459,7 @@
clearable></el-input>
</el-form-item>
<el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
prop="textStatus" label-width="150px" class="add-form-item">
prop="textStatusBuss" label-width="150px" class="add-form-item">
<template slot="label">文本状态</template>
<el-select v-model="sarBussionessStandEO.textStatusBuss"
placeholder="请选择文本状态"
@@ -529,7 +529,7 @@
class="add-form-item"
>
<template slot="label">关联模块--VPPS编码</template>
<el-input v-model="sarBussionessStandEO.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS)"></el-input>
<el-input v-model="sarBussionessStandEO.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,true)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'VPPSCNBUSS'">
@@ -1004,10 +1004,10 @@
</el-select>
</el-form-item>
<el-form-item label="体系类别" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="请输入体系类别" clearable></el-input>
<el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
</el-form-item>
<el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="sarBussionessSearch.VPPSBMBUSS" placeholder="请输入模块VPPS编码" clearable></el-input>
<el-input v-model="sarBussionessSearch.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,false)"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -1189,7 +1189,7 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=true
:multiple="multipleFlag2"
:check-strictly=true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
@@ -1900,6 +1900,7 @@ export default {
qcbm: '',
qcbmName: '',
drawerTitle1:'',
multipleFlag2:'',
modalShowFlag1: false,
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
@@ -1929,9 +1930,11 @@ export default {
if(checkedData) {
if(checkedData.length > 0){
this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
}else {
this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
}
}
@@ -1942,16 +1945,19 @@ export default {
if(checkedData) {
if(checkedData.length > 0){
this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
this.sarBussionessSearch.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName
this.sarBussionessSearch.TXLBBUSS = checkedData.menuName
}
}
this.modalShowFlag1 = false
this.$forceUpdate()
},
choiceZRR2 (type, title, id) {
choiceZRR2 (type, title, id,multFlag) {
this.drawerTitle = title
this.modalShowFlag2 = true
this.multipleFlag2 = multFlag
this.url = ''
this.urlChild = ''
this.url="sarVppsTree/list"
@@ -2759,7 +2765,7 @@ export default {
const value = nowstandinfo[item.attrField]
// 时间格式处理
if (item.attrType === 'DATE_PICKER' && value) {
nowstandinfo[item.attrField] = this.$dateFormat(this.sarBussionessStandEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
nowstandinfo[item.attrField] = this.$moment(this.sarBussionessStandEO[item.attrField]).format('YYYY-MM-DD')
} else if (item.attrType === 'DATE_PICKER' && !value) {
delete nowstandinfo[item.attrField]
}
@@ -3283,28 +3289,6 @@ export default {
this.tableFlag = item
// item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
this.getBussionStandTable(item,'',type)
this.sarBussionessSearch.applyCountry = ''
this.sarBussionessSearch.standGenera = ''
this.sarBussionessSearch.standSubclass = ''
this.sarBussionessSearch.issueTime = ''
this.sarBussionessSearch.putTime = ''
this.sarBussionessSearch.responsibleUnit = ''
this.sarBussionessSearch.classifyCode = ''
this.sarBussionessSearch.standCode = ''
this.sarBussionessSearch.standName = ''
this.sarBussionessSearch.numberName = ''
this.sarBussionessSearch.standSort = ''
this.sarBussionessSearch.replaceStandNum = ''
this.sarBussionessSearch.orgName = ''
this.sarBussionessSearch.id = ''
this.sarBussionessSearch.synopsis = ''
this.sarBussionessSearch.classifyCode = ''
this.sarBussionessSearch.quoteStand = ''
this.sarBussionessSearch.standStatus = ''
this.sarBussionessSearch.citationUser = ''
this.sarBussionessSearch.advanceSearchVOStr = ''
},
// 清空搜索框
clearAllSearch (flag) {
@@ -3329,6 +3313,8 @@ export default {
this.sarBussionessSearch.quoteStand = ''
this.sarBussionessSearch.standStatus = ''
this.sarBussionessSearch.citationUser = ''
this.sarBussionessSearch.TXLBBUSS = ''
this.sarBussionessSearch.VPPSBMBUSS = ''
this.sarBussionessSearch.advanceSearchVOStr = ''
this.pageChange(1)
this.getBussionStandTable(this.sarBussionessSearch)
@@ -3658,9 +3644,51 @@ export default {
const data = this.formFieldListData
this.formFieldList = data.map((item) => {
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
return Object.assign({}, item, {
options: this.allSelectOptions[item.selVal]
})
if(item.attrField === 'WSSMR'){
return Object.assign({}, item, {
options: this.allSelectOptions["WSSMR"]
})
}else if(item.attrField === 'QCDW'){
return Object.assign({}, item, {
options: this.allSelectOptions["QCDW"]
})
}else if(item.attrField === 'CYSD'){
return Object.assign({}, item, {
options: this.allSelectOptions["WSCYSD"]
})
}else if(item.attrField === 'SYCXCLASS'){
return Object.assign({}, item, {
options: this.allSelectOptions["ENERGYTYPES"]
})
}else if(item.attrField === 'NYLX'){
return Object.assign({}, item, {
options: this.allSelectOptions["NYLXCLASS"]
})
}else if(item.attrField === 'SYCPX'){
return Object.assign({}, item, {
options: this.allSelectOptions["SYCPXCLASS"]
})
}else if(item.attrField === 'SYRZ'){
return Object.assign({}, item, {
options: this.allSelectOptions["SYRZCLASS"]
})
}else if(item.attrField === 'ZRBM'){
return Object.assign({}, item, {
options: this.allSelectOptions["ZRBMCLASS"]
})
}else if(item.attrField === 'ZRGCS'){
return Object.assign({}, item, {
options: this.allSelectOptions["ZRGCSCLASS"]
})
}else if(item.attrField === 'TXLB'){
return Object.assign({}, item, {
options: this.allSelectOptions["TXLBCLASS"]
})
}else {
return Object.assign({}, item, {
options: this.allSelectOptions[item.selVal]
})
}
} else {
return item
}
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+6
View File
@@ -48,6 +48,12 @@
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="index"
label="序号"
align="center"
width="50">
</el-table-column>
<el-table-column
prop="partCode"
label="章节编号"
src/pages/searchCenter/pages/advancedSearch.vue
+17 -6
View File
@@ -795,8 +795,20 @@
<el-col :span="12">
<el-form-item label="关联模块-VPPS编码" prop="VPPSBMBUSS">
<el-input v-model="standForm.VPPSBMBUSS" clearable
placeholder="请输入关联模块-VPPS编码查找"></el-input>
<el-input v-model="standForm.VPPSBMBUSS" placeholder="请输入关联模块-VPPS编码查找" clearable @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', standForm.VPPSBMBUSS,false)"></el-input>
<tree-select-new
width = "800"
:key="key1"
:lazy=true
:multiple=true
:check-strictly= true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -1489,11 +1501,9 @@ export default {
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
this.standForm.cycvppsbm = checkedData.map(item => item.code).join(",")
this.standForm.cycvppscn = checkedData.map(item => item.chineseName).join(",")
this.standForm.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
}else {
this.standForm.cycvppsbm = checkedData.code
this.standForm.cycvppscn = checkedData.chineseName
this.standForm.VPPSBMBUSS = checkedData.code
}
}
this.modalShowFlag2 = false
@@ -1694,6 +1704,7 @@ export default {
}
}
}
this.$forceUpdate()
this.searchSarBykey();
},
/**
src/router/index.js
-2
View File
@@ -2066,10 +2066,8 @@ router.onError((error) => {
})
router.beforeEach((to, from, next) => {
console.log(111);
let toName = to.name
let token = store.state.token
console.log(toName);
// 返回值为登录状态
if ((token === null || token === '') && (toName !== 'Login' && to.meta.requireAuth)) {
return next('/Login')