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

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

Browse Source
This commit is contained in:
yanyizhou
2021-09-08 20:35:01 +08:00
parent 60e590d84b 66a941bd0d
commit aa56df874b
17 changed files with 306 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+5 -5
View File
@@ -88,11 +88,11 @@ export default {
path: '/domesticStandardsAndRegulations',
menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
},
{
title: '零部件编号申请',
path: '/partCodeApply',
menuId: 'ad9db496772c075f78495382b7581fe9'
},
// {
// title: '零部件编号申请',
// path: '/partCodeApply',
// menuId: 'ad9db496772c075f78495382b7581fe9'
// },
// {
// title: '标准法规工作组数据统计',
// path: '/dataStatisComments',
src/pages/config/pages/mechanismManage/index.vue
+1 -1
View File
@@ -325,7 +325,7 @@ export default {
watch: {
filterText(val) {
this.$refs.tree.filter(val);
}
},
},
mounted () {
// 获取组织结构树
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/details/otherBussStandardDetails/index.vue
+6 -2
View File
@@ -36,7 +36,7 @@
<p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
<p><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
<p>
<label style=" margin-right: 139px;"
<label style=" margin-right: 156px;"
title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
>文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
</p>
@@ -2029,7 +2029,11 @@ export default {
field['tips'] = tips
}
if (value && typeof value === 'number') {
value = this.$dateFormat(value, 'yyyy-MM-dd')
value = this.$moment(value).format('YYYY-MM-DD')
}
// 时间格式处理
if (field.attrType === 'DATE_PICKER' && value) {
value = this.$moment(value).format('YYYY-MM-DD')
}
field['value'] = value
if (field.showRegionId === location.value) {
src/pages/details/otherStandardDetails/index.vue
+1 -3
View File
@@ -63,7 +63,7 @@
<p>
<label style=" margin-right: 132px;"
title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
>文本状态<i class="el-icon-warning-outline"></i></label>
>文本状态</label>
<span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
</p>
<p><label style=" margin-right: 150px;">发布日期</label><span>{{
@@ -3075,8 +3075,6 @@ export default {
/*padding: 0 67px;*/
.details-content-modular {
margin-bottom: 20px;
.modular-header {
display: flex;
align-items: center;
src/pages/details/process/ruku/index.vue
+2 -2
View File
@@ -5,7 +5,7 @@
<span>{{ title }}</span>
</div>
<div class="details-content">
<div class="details-content-modular basic-information">
<div class="details-content-modular basic-information" style="margin-bottom: 0;">
<div class="modular-header">
<div class="modular-header-title"><i class="icon-modular-title" /><span>标准信息</span>
</div>
@@ -2737,7 +2737,7 @@ export default {
/deep/.details-content{
/*padding: 0 67px;*/
.details-content-modular{
margin-bottom: 20px;
/*margin-bottom: 20px;*/
.modular-header{
display: flex;
align-items: center;
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+82
View File
@@ -60,6 +60,28 @@
</el-button>
</div>
</el-form-item>
<el-form-item label="附件" prop="modelNameList" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.fjNameList"
clearable
></el-input>
<div v-if="form.fjList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in form.fjList" :key="index" @click="fileUpload2" style="margin-right: 5px;">
{{ item.name }}
</div>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
@click="fileUpload2"
size="mini">
点击上传
</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -188,6 +210,26 @@
</div>
</el-upload>
</el-dialog>
<el-dialog width='400px' :visible.sync="fileMadel2" title="上传附件">
<el-upload
multiple
class="upload-demo"
drag
:action="fileUrl"
ref="importfile"
name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess2"
:on-remove="importFileRemove2"
:show-file-list="true"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
</el-dialog>
</div>
</template>
@@ -201,6 +243,7 @@
name: "bzdyStep1-1",
data() {
return {
fileMadel2: false,
nodeList: [],
nodeList2: [],
commentText: '',
@@ -216,6 +259,8 @@
form: {
title: '', // 调研标题
date: '', // 完成时间
fjList: [],
fjNameList: '',
modelList: [],
modelNameList: ''
},
@@ -362,6 +407,20 @@
})
this.form.modelNameList = list
},
importFileRemove2 (file, fileList) {
let list = ''
this.form.fjList = []
fileList.forEach(item => {
this.form.fjList.push(item)
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.fjNameList = list
},
// 导入标准数据成功后执行
importFileSuccess (response, file) {
if (response.ok) {
@@ -383,9 +442,32 @@
})
}
},
importFileSuccess2 (response, file) {
if (response.ok) {
this.form.fjList.push(response.data)
let list = ''
this.form.fjList.forEach(item => {
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.fjNameList = list
this.$message({
showClose: true,
message: response.message,
type: 'success'
})
}
},
fileUpload () {
this.fileMadel = true
},
fileUpload2 () {
this.fileMadel2 = true
},
handleTabs(name) {
this.active = name
},
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+83 -2
View File
@@ -60,6 +60,28 @@
</el-button>
</div>
</el-form-item>
<el-form-item label="附件" prop="modelNameList" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.fjNameList"
clearable
></el-input>
<div v-if="form.fjList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in form.fjList" :key="index" @click="fileUpload2" style="margin-right: 5px;">
{{ item.name }}
</div>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
@click="fileUpload2"
size="mini">
点击上传
</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -169,7 +191,7 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-dialog width='400px' :visible.sync="fileMadel" title="上传调研模板">
<el-upload
multiple
class="upload-demo"
@@ -189,6 +211,26 @@
</div>
</el-upload>
</el-dialog>
<el-dialog width='400px' :visible.sync="fileMadel2" title="上传附件">
<el-upload
multiple
class="upload-demo"
drag
:action="fileUrl"
ref="importfile"
name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess2"
:on-remove="importFileRemove2"
:show-file-list="true"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
</el-dialog>
</div>
</template>
@@ -202,6 +244,7 @@ export default {
name: "bzdyStep1",
data() {
return {
fileMadel2: false,
commentText: '',
nodeList: [],
nodeList2: [],
@@ -217,6 +260,8 @@ export default {
form: {
title: '', // 调研标题
date: '', // 完成时间
fjList: [],
fjNameList: '',
modelList: [],
modelNameList: ''
},
@@ -325,7 +370,6 @@ export default {
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文件')
return false
}
@@ -353,6 +397,20 @@ export default {
})
this.form.modelNameList = list
},
importFileRemove2 (file, fileList) {
let list = ''
this.form.fjList = []
fileList.forEach(item => {
this.form.fjList.push(item)
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.fjNameList = list
},
// 导入标准数据成功后执行
importFileSuccess (response, file) {
if (response.ok) {
@@ -374,9 +432,32 @@ export default {
})
}
},
importFileSuccess2 (response, file) {
if (response.ok) {
this.form.fjList.push(response.data)
let list = ''
this.form.fjList.forEach(item => {
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.fjNameList = list
this.$message({
showClose: true,
message: response.message,
type: 'success'
})
}
},
fileUpload () {
this.fileMadel = true
},
fileUpload2 () {
this.fileMadel2 = true
},
handleTabs(name) {
this.active = name
},
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+12
View File
@@ -50,6 +50,16 @@
- -
</div>
</el-form-item>
<el-form-item label="附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
{{ item.name }}
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
<el-input
v-model="form.responUserList"
@@ -181,6 +191,7 @@
title: '', // 调研标题
date: '', // 完成时间
modelList: [],
fjList: [],
responUserList: '',
responUserListName: '',
},
@@ -278,6 +289,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.modelList = data.modelList || data.form.modelList
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+12
View File
@@ -50,6 +50,16 @@
- -
</div>
</el-form-item>
<el-form-item label="附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
{{ item.name }}
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -200,6 +210,7 @@
title: '', // 调研标题
date: '', // 完成时间
modelList: [],
fjList: [],
fileId: '',
fileName: '',
responUserList: '',
@@ -324,6 +335,7 @@
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.fjList = data.fjList || data.form.fjList
this.form.modelList = data.modelList || data.form.modelList
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+12
View File
@@ -50,6 +50,16 @@
- -
</div>
</el-form-item>
<el-form-item label="附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.fjList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updateFile(item)">
{{ item.name }}
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
<div v-if="form.file" class="fileClass" @click="updateFile(form.file)">
{{ form.fileName }}
@@ -172,6 +182,7 @@
title: '', // 调研标题
date: '', // 完成时间
modelList: [],
fjList: [],
fileId: '',
fileName: '',
responUserList: '',
@@ -259,6 +270,7 @@
this.form.file = data.fileId || data.form.fileId
this.form.fileName = data.fileName || data.form.fileName
this.form.modelList = data.modelList || data.form.modelList
this.form.fjList = data.fjList || data.form.fjList
}).catch(e => {
})
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+1 -1
View File
@@ -16,7 +16,7 @@
<p class="transition-box-p" v-if="sarAccessEO.sortKey === '1'">
<label class="transition-box-label">国家/地区：</label>
<span class="transition-box-span">
{{ sarAccessEO.countryArea }}
{{ sarAccessEO.countryAreaShow }}
</span>
</p>
<p v-else></p>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+3 -1
View File
@@ -23,7 +23,9 @@
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)"
@mouseleave="mouseleave(data)">
<span
:class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label }} </span>
:class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span v-if="node.label.length<15"> {{ node.label}} </span>
<span v-else> {{ node.label.substring(0,15)+'...'}} </span>
<span>
<el-button
type="text"
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+7 -5
View File
@@ -433,7 +433,7 @@
label="企标编号"
prop="standCode"
label-width="150px"
class="add-form-item form-item-disabled"
class="add-form-item"
>
<el-input
v-model="sarBussionessStandEO.standCode"
@@ -1930,12 +1930,14 @@ 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(",")
this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
}else {
this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName
}
}
this.modalShowFlag2 = false
@@ -3401,10 +3403,10 @@ export default {
this.SarExportSearchEo = item
}
// 处理我的收藏和个性化标签传参
if (this.selectSarMenu.id === 'wdsc') {
if (this.selectSarMenu.id === 'qbwdsc') {
this.sarBussionessSearch.menuId = undefined
this.sarBussionessSearch.labelMenuId = undefined
this.sarBussionessSearch.collectMenuId = 'wdsc'
this.sarBussionessSearch.collectMenuId = 'qbwdsc'
} else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') {
this.sarBussionessSearch.menuId = undefined
this.sarBussionessSearch.labelMenuId = this.selectSarMenu.id
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+7 -2
View File
@@ -21,7 +21,9 @@
default-expand-all
:expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
<span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
<span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span v-if="node.label.length<15"> {{ node.label}} </span>
<span v-else> {{ node.label.substring(0,15)+'...'}} </span>
<span>
<el-button
type="text"
@@ -164,7 +166,10 @@
label="标准号"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<!-- <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
<!-- 暂时使用-->
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
</template>
</el-table-column>
src/pages/searchCenter/pages/advancedSearch.vue
+5 -3
View File
@@ -39,9 +39,9 @@
<el-radio label="INLAND_STAND">
<span>{{ $t("m.standAll") }}</span>
</el-radio>
<el-radio label="INLAND_LAWS">
<span>{{ $t("m.lawsAll") }}</span>
</el-radio>
<!-- <el-radio label="INLAND_LAWS">-->
<!-- <span>{{ $t("m.lawsAll") }}</span>-->
<!-- </el-radio>-->
<el-radio label="BUSINESS_STAND">
<span>{{ $t("m.enterpriseStandard") }}</span>
</el-radio>
@@ -1502,8 +1502,10 @@ export default {
if(checkedData) {
if(checkedData.length > 0){
this.standForm.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.standForm.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
}else {
this.standForm.VPPSBMBUSS = checkedData.code
this.standForm.VPPSCNBUSS = checkedData.chineseName
}
}
this.modalShowFlag2 = false
src/pages/searchCenter/pages/standardSearch.vue
+4 -4
View File
@@ -388,10 +388,10 @@
label: '海外标准法规', // value没改
value: 'bussstand'
},
{
label: '国内外政策',
value: 'laws'
},
// {
// label: '国内外政策',
// value: 'laws'
// },
{
label: '企业标准',
value: 'enterprise'