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 
# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
This commit is contained in:
super_liu
2022-03-17 20:08:03 +08:00
parent 57c5943313 139127a22f
commit 93e94f2f39
151 changed files with 32644 additions and 5297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+62 -65
View File
@@ -597,8 +597,9 @@
prop="CYCVPPSBM"
label-width="150px"
class="add-form-item"
label="关联模块--乘用车VPPS编码"
title="关联模块--乘用车VPPS编码"
>
<template slot="label">关联模块--乘用车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码"
clearable
@click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
@@ -606,16 +607,18 @@
</template>
<template v-else-if="field.attrField === 'KCCVPPSBM'">
<el-form-item
title="关联模块--卡车VPPS编码"
label="关联模块--卡车VPPS编码"
prop="KCCVPPSBM"
label-width="150px"
class="add-form-item"
>
<template slot="label">关联模块--卡车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码"
clearable
@click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCVPPSCN'">
<el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
prop="cycvppscn" class="add-form-item">
@@ -652,18 +655,19 @@
</template>
<template v-else-if="field.attrField === 'DYBXH'">
<el-form-item
prop="DYBXH"
label-width="150px"
class="add-form-item"
prop="DYBXH"
label-width="150px"
class="add-form-item"
label="模块结构单元变型号(卡车)"
title="模块结构单元变型号(卡车)"
>
<template slot="label">模块结构单元变型号(卡车)</template>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
clearable
@click.native="choiceZRR4('TRUCK', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYMC'">
<el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="dymc" class="add-form-item">
<el-form-item label="模块结构单元名称(卡车)" title="模块结构单元名称(卡车)" label-width="150px" prop="dymc" class="add-form-item">
<el-input
v-if="sarStandardsInfoEO.DYBXH === '' || sarStandardsInfoEO.DYBXH === undefined"
v-model="sarStandardsInfoEO.DYMC = ''"
@@ -680,18 +684,19 @@
</template>
<template v-else-if="field.attrField === 'DYBXHCAR'">
<el-form-item
prop="DYBXHCAR"
label-width="150px"
class="add-form-item"
prop="DYBXHCAR"
label-width="150px"
class="add-form-item"
label="模块结构单元变型号(乘用车)"
title="模块结构单元变型号(乘用车)"
>
<template slot="label">模块结构单元变型号(乘用车)</template>
<el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
clearable
@click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYMCCAR'">
<el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
<el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
<el-input
v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
v-model="sarStandardsInfoEO.DYMCCAR = ''"
@@ -960,8 +965,7 @@
<el-dialog title="试验项目" :visible.sync="testItemsModel" :close-on-click-modal="false" width="1138px">
<el-form :modal="testItemsForm" :inline="true" class="label-input-form">
<el-formItem label="试验项目名称" class="serch-form-item">
<el-input v-model="testItemsForm.testItemName" placeholder="按试验项目名称查找" :maxlength="100" clearable
@keyup.enter.native="selectTestItemClassBtn"/>
<el-input v-model="testItemsForm.testItemName" placeholder="按试验项目名称查找" :maxlength="100" clearable/>
</el-formItem>
<el-button size="mini" class="common-button-primary" type="primary" icon="el-icon-search"
@click="getTestItemRow(1)"></el-button>
@@ -1075,19 +1079,18 @@
<div class="left">
<el-form :model="sarConfigStandSearch" :inline="true" class="label-input-form">
<el-formItem label="标准类别" prop="standSort" class="search-item">
<el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找"
@keyup.enter.native="searchConfiguraStand(true)" clearable>
<el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找" clearable>
<el-option v-for="(opt, index) in standSortOptions" :value="opt.value === undefined ? '' :opt.value"
:key="index" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-formItem>
<el-formItem label="标准号" prop="standNumber" class="search-item">
<el-input v-model="sarConfigStandSearch.standNumber" @keyup.enter.native="searchConfiguraStand(true)"
<el-input v-model="sarConfigStandSearch.standNumber"
placeholder="根据标准号查找" clearable/>
</el-formItem>
<el-formItem label="标准名称" prop="standNumber" class="search-item">
<el-input v-model="sarConfigStandSearch.standName" @keyup.enter.native="searchConfiguraStand(true)"
<el-input v-model="sarConfigStandSearch.standName"
placeholder="根据标准名称查找" clearable/>
</el-formItem>
<el-form-item label="" class="search-item btn-box">
@@ -1616,15 +1619,13 @@
<el-form-item :label="$t('m.standardNo')" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')"
clearable
:maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
:maxlength="100"></el-input>
</el-form-item>
<!-- 标准名称-->
<el-form-item :label="$t('m.standName')" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')"
clearable
:maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
:maxlength="500"></el-input>
</el-form-item>
<!-- 标准年份-->
<el-form-item :label="$t('m.standardYear')" class="add-form-item form-item-disabled">
@@ -1636,8 +1637,7 @@
<!-- 文本状态-->
<el-form-item :label="$t('m.standStateShow')" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')"
clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
clearable>
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}
</el-option>
@@ -1649,11 +1649,10 @@
<el-input v-model="advanceSearchMapping.TXLBName" placeholder="根据标准体系查找"
clearable
:maxlength="500"
@click.native="BZTXhandle"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
@click.native="BZTXhandle"></el-input>
<!-- <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- >-->
<!-- <el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"-->
<!-- :key="index"-->
<!-- :label="opt.label">{{ opt.label }}-->
@@ -1676,7 +1675,6 @@
<search-select
v-model="sarStandardsSearch.standSort"
:placeholder="$t('m.standardCategoryTips')"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
:options="standSortOptions"
clearable/>
</el-form-item>
@@ -1684,8 +1682,7 @@
<el-form-item :label="$t('m.standardEnglishName')" :title="$t('m.standardEnglishName')"
class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.standEnName"
:placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
:placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"></el-input>
</el-form-item>
<!-- 标准发布日期-->
<el-form-item label="标准发布日期" title="标准发布日期" class="add-form-item form-item-disabled">
@@ -1701,8 +1698,7 @@
</el-form-item>
<!-- 标准性质-->
<el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable>
<el-option v-for="(opt, index) in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
:key="index" :label="opt.label">{{ opt.label }}
</el-option>
@@ -1774,8 +1770,7 @@
<el-col :span="12">
<!-- 归口管理部门-->
<el-form-item label="归口管理部门" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable>
<el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
:key="index" :label="opt.label">{{ opt.label }}
</el-option>
@@ -1783,8 +1778,7 @@
</el-form-item>
<!-- 我司参与深度-->
<el-form-item label="我司参与深度" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable>
<el-option v-for="(opt, index) in cysdOptions" :value="opt.value === undefined ? '' :opt.value"
:key="index"
:label="opt.label">{{ opt.label }}
@@ -1858,30 +1852,26 @@
<el-form-item title="关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
placeholder=" 关联模块--乘用车VPPS编码"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
placeholder=" 关联模块--乘用车VPPS编码"></el-input>
</el-form-item>
<!-- 关联模块--乘用车vpps中文名称-->
<el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
placeholder="关联模块--乘用车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
placeholder="关联模块--乘用车VPPS中文名称"></el-input>
</el-form-item>
<!-- 模块结构单元名称 -->
<el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.DYMC" clearable
placeholder="模块结构单元名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
placeholder="模块结构单元名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 起草单位-->
<el-form-item label="起草单位" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable>
<el-option v-for="(opt, index) in qcdwOptions" :value="opt.value === undefined ? '' :opt.value"
:key="index"
:label="opt.label">{{ opt.label }}
@@ -1960,21 +1950,18 @@
<el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
placeholder="关联模块--卡车VPPS编码"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
placeholder="关联模块--卡车VPPS编码"></el-input>
</el-form-item>
<!--关联模块--卡车vpps中文名称-->
<el-form-item title="关联模块--卡车VPPS中文名称" label="关联模块--卡车VPPS中文名称" prop="standNumber"
class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
placeholder="关联模块--卡车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
placeholder="关联模块--卡车VPPS中文名称"></el-input>
</el-form-item>
<el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.DYBXH" clearable
placeholder="模块结构单元变型号"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
placeholder="模块结构单元变型号"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -1989,13 +1976,11 @@
<el-form-item :label="$t('m.substituteStandardNumber')" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.replaceStandNum"
:placeholder="$t('m.lookUpByAlternativeCriteria')"
clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
clearable :maxlength="100"></el-input>
</el-form-item>
<!-- 采标编号-->
<el-form-item label="采标编号" prop="nameShow" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
<el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"></el-input>
</el-form-item>
</el-col>
@@ -2007,14 +1992,12 @@
<!-- </el-form-item>-->
<!-- 引用标准-->
<el-form-item label="引用标准" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
<el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"></el-input>
</el-form-item>
<!-- 被引用标准-->
<el-form-item label="被引用标准" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.BYYBJ" clearable
placeholder="根据被引用标准查找"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
placeholder="根据被引用标准查找"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -2058,9 +2041,9 @@
<Role-tree
:is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
@checkedRole="checkedRole2"
/>
<Role-tree
is-title="选择人员信息"
:is-visible.sync="modalshowflagRole"
@@ -4599,6 +4582,9 @@ export default {
formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
formData.issueTime = null
this.loading = true
if(formData.CLLX){
formData.applyArctic = formData.CLLX.join(',')
}
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
_this: this, loading: 'loading'
}, res => {
@@ -4659,7 +4645,6 @@ export default {
}
}
this.configStandList = res.data.list
console.log(this.configStandList);
this.configTotal = res.data.count
this.selectConfigStand = []
}, e => {
@@ -5815,9 +5800,22 @@ export default {
this.$set(this.textStatusMap, item.value, item.label)
})
},
choiceZRRS(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
choiceZRRS(type, title, nameId) {
this.nodeList2 = []
console.log(typeof (nameId));
console.log(nameId);
if (nameId) {
let nameId1 = nameId.split(',')
let idList = []
nameId1.forEach(item => {
let a, b
a = item.substring(item.indexOf('(') +1)
b = a.substring(0, a.lastIndexOf(')'))
idList.push(b)
})
idList = idList.join(',')
this.nodeList2.push(idList)
}
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
@@ -5889,7 +5887,6 @@ export default {
} else if (this.drawerTitle === '查询责任部门') {
this.advanceSearchMapping['ZRBM'] = nameList
}
},
},
computed: {