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:
zhutianqi
2021-12-27 18:08:14 +08:00
parent c302d80e48 bb90e24e73
commit 4d4e92dc9c
41 changed files with 5917 additions and 6680 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+38 -37
View File
@@ -454,18 +454,20 @@
</el-form-item>
<el-form-item label="在产车实施日期" prop="zccssrqgj">
<el-date-picker
v-model.trim="editRowData.zccssrqgj"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
clearable
v-model.trim="editRowData.zccssrqgj"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期" prop="xcxssrqgj">
<el-date-picker
v-model.trim="editRowData.xcxssrqgj"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
clearable
v-model.trim="editRowData.xcxssrqgj"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="责任部门" prop="zrbm">
@@ -1162,46 +1164,26 @@ export default {
addSarAccess() {
//判断是否是清单类型
if (this.selectedAccInfoSearchList.length > 0) {
//为空转换
for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) {
//适用车型为空
if (this.selectedAccInfoSearchList[i].typeApplicable === "[]"){
this.selectedAccInfoSearchList[i].typeApplicable = null
}
//能源类型为空
if (this.selectedAccInfoSearchList[i].nylx === "[]"){
this.selectedAccInfoSearchList[i].nylx = null
}
//责任部门为空
if (this.selectedAccInfoSearchList[i].zrbm === "[]"){
this.selectedAccInfoSearchList[i].zrbm = null
}
//试用产品线为空
if (this.selectedAccInfoSearchList[i].sycpx === "[]"){
this.selectedAccInfoSearchList[i].sycpx = null
}
}
// 追加字段
console.log('1168',this.selectedAccInfoSearchList)
this.selectedAccInfoSearchList.map(item => {
let addList;
addList = this.sarAccessInfoList.findIndex(items => {
return items.id === item.id
})
return items.id === item.id;
});
if (addList > -1) {
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.entryTable.clearSelection();
this.$refs.searchTable.clearSelection()
this.$message.warning('请勿添加重复数据')
} else {
this.sarAccessInfoList.push(item)
this.sarAccessInfoList.forEach(item => {
this.$set(item, 'xcxssrqgj', item.xcxssrq)
this.$set(item, 'zccssrqgj', item.zccssrq)
if(item.attrInfoCaseMap !== undefined){
this.$set(item, 'typeApplicable', item.attrInfoCaseMap.cllx)
this.$set(item, 'nylx', item.attrInfoCaseMap.nylx)
this.$set(item, "xcxssrqgj", item.xcxssrq);
this.$set(item, "zccssrqgj", item.zccssrq);
if (item.attrInfoCaseMap !== undefined) {
this.$set(item, "typeApplicable", item.attrInfoCaseMap.cllx);
this.$set(item, "nylx", item.attrInfoCaseMap.nylx);
}
// 能源类型转换
if (item.nylx !== null) {
@@ -1231,6 +1213,20 @@ export default {
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
this.sarAccessInfoList.forEach(item => {
if(item.nylx === '[]'){
item.nylx = ''
}
if(item.typeApplicable === '[]'){
item.typeApplicable = ''
}
if(item.zrbm === '[]'){
item.zrbm = ''
}
if(item.sycpx === '[]'){
item.sycpx = ''
}
})
}
})
} else {
@@ -1477,6 +1473,7 @@ export default {
this.sarAccessInfoSearch.page = 1
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
console.log('1476',res.data.list)
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
@@ -1484,6 +1481,10 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
item.zrbm = item.attrInfoCaseMap.zrbm
item.sycpx = item.attrInfoCaseMap.sycpx
item.typeApplicable = item.attrInfoMap.CLLX
item.nylx = item.attrInfoMap.NYLX
})
this.drawerTotal = res.data.count
}, e => {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+83
View File
@@ -1229,19 +1229,102 @@ export default {
}
})
},
// 字段转化
changeText(val) {
val.forEach(item => {
// 责任部门转换
if (item.zrbm !== null || item.zrbm !== "") {
let k = (item.zrbm || "").split(',')
for (let i in this.zrbmOptions) {
for (let m = 0; m < k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label
}
item.zrbm = k.join(',')
}
}
}
// 能源类型转换
if (item.nylx !== null) {
let k = (item.nylx || "").split(',')
for (let i in this.categoryOptions) {
for (let m = 0; m < k.length; m++) {
if (this.categoryOptions[i].value === k[m]) {
k[m] = this.categoryOptions[i].label
}
item.nylx = k.join(',')
}
}
}
// 适用车型转换
if (item.typeApplicable !== null) {
let k = (item.typeApplicable || "").split(',')
for (let i in this.CycxOptions) {
for (let m = 0; m < k.length; m++) {
if (this.CycxOptions[i].value === k[m]) {
k[m] = this.CycxOptions[i].label
}
item.typeApplicable = k.join(',')
}
}
}
// s适用产品线转换
if (item.sycpx !== null) {
let k = (item.sycpx || "").split(',')
for (let i in this.sycpxOptions) {
for (let m = 0; m < k.length; m++) {
if (this.sycpxOptions[i].value === k[m]) {
k[m] = this.sycpxOptions[i].label
}
item.sycpx = k.join(',')
}
}
}
// 适用认证转换
if (item.syrz !== null) {
let k = (item.syrz || "").split(',')
for (let i in this.syrzOptions) {
for (let m = 0; m < k.length; m++) {
if (this.syrzOptions[i].value === k[m]) {
k[m] = this.syrzOptions[i].label
}
item.syrz = k.join(',')
}
}
}
})
},
pageInfo() {
this.sarAccessInfoSearch.pageNo = 1
this.sarAccessInfoSearch.page = 1
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list
console.log('1476',res.data.list)
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
item.zrbm = item.attrInfoCaseMap.zrbm
item.sycpx = item.attrInfoCaseMap.sycpx
item.typeApplicable = item.attrInfoMap.CLLX
// 适用车型转换
if (item.typeApplicable !== null) {
let k = (item.typeApplicable || "").split(',')
for (let i in this.CycxOptions) {
for (let m = 0; m < k.length; m++) {
if (this.CycxOptions[i].value === k[m]) {
k[m] = this.CycxOptions[i].label
}
item.typeApplicable = k.join(',')
}
}
}
item.nylx = item.attrInfoMap.NYLX
})
this.changeText(this.sarAccessInfoSearchList)
this.drawerTotal = res.data.count
}, e => {
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+5 -1
View File
@@ -1306,7 +1306,7 @@ export default {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list
console.log('1476',res.data.list)
//为空转换
for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
//适用车型为空
@@ -1324,6 +1324,10 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
item.zrbm = item.attrInfoCaseMap.zrbm
item.sycpx = item.attrInfoCaseMap.sycpx
item.typeApplicable = item.attrInfoMap.CLLX
item.nylx = item.attrInfoMap.NYLX
})
this.changeText(this.sarAccessInfoSearchList)
this.drawerTotal = res.data.count
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+220 -213
View File
@@ -68,16 +68,16 @@
<div class="search-area">
<div class="left">
<el-form :modal="standCommonlySearch" inline class="label-input-form" @keyup.enter.native="searchBtnClick(standCommonlySearch)">
<!-- <el-form-item label="标准类别" class="search-item">-->
<!-- <el-select v-model="standCommonlySearch.standSort" filterable>-->
<!-- <el-option-->
<!-- v-for="item in standSortOptions"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="标准类别" class="search-item">
<el-select v-model="standCommonlySearch.standSort" filterable>
<el-option
v-for="item in standSortOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>-->
<el-form-item label="标准号" class="search-item search-item-last">
<el-input v-model="standCommonlySearch.standNumber"
placeholder="请输入标准号"
@@ -395,66 +395,66 @@
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
</span>
</el-dialog>
<!-- <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"-->
<!-- @reset="clearAllSearch('sarStandardsSearch')">-->
<!-- <div slot="content">-->
<!-- <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">-->
<!-- &lt;!&ndash; 标准号&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardNo')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 标准名称&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standName')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 标准类别&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standardCategory')" class="serch-form-item">-->
<!-- <search-select-->
<!-- v-model="sarStandardsSearch.standSort"-->
<!-- :placeholder="$t('m.standardCategoryTips')"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"-->
<!-- :options="standSortOptions"-->
<!-- clearable/>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 文本状态&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.standStateShow')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 代替标准号&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">-->
<!-- <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 适用车型&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.applicableModels')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 适用产品线（新增字段）&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- &lt;!&ndash; 关联模块（新增字段）&ndash;&gt;-->
<!-- <el-form-item :label="$t('m.associatedModule')" class="serch-form-item">-->
<!-- <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </div>-->
<!-- </table-tools-bar>-->
<!-- <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"
@reset="clearAllSearch('sarStandardsSearch')">
<div slot="content">
<el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
&lt;!&ndash; 标准号&ndash;&gt;
<el-form-item :label="$t('m.standardNo')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
&lt;!&ndash; 标准名称&ndash;&gt;
<el-form-item :label="$t('m.standName')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
&lt;!&ndash; 标准类别&ndash;&gt;
<el-form-item :label="$t('m.standardCategory')" class="serch-form-item">
<search-select
v-model="sarStandardsSearch.standSort"
:placeholder="$t('m.standardCategoryTips')"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
:options="standSortOptions"
clearable/>
</el-form-item>
&lt;!&ndash; 文本状态&ndash;&gt;
<el-form-item :label="$t('m.standStateShow')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
&lt;!&ndash; 代替标准号&ndash;&gt;
<el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
&lt;!&ndash; 适用车型&ndash;&gt;
<el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
&lt;!&ndash; 适用产品线（新增字段）&ndash;&gt;
<el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
&lt;!&ndash; 关联模块（新增字段）&ndash;&gt;
<el-form-item :label="$t('m.associatedModule')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
</table-tools-bar>-->
<!-- 高级筛选-->
<el-drawer
title="高级搜索"
@@ -617,39 +617,37 @@
<!-- 适用车型-->
<template>
<custom-select-array
:key="applyArcticOptions.options"
:config="applyArcticOptions"
style="margin-left: -14px"
v-model="sarStandardsSearch['applyArctic']"
></custom-select-array>
</template>
<!-- <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="sarStandardsSearch.applyArctic"-->
<!-- :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"-->
<!-- :key="opt.value" :label="opt.label">{{ opt.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsSearch.applyArctic"
:placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>-->
<!-- 适用产品线（新增字段）-->
<template>
<custom-select-array
:key="sycpxOptions.options"
:config="sycpxOptions"
style="margin-left: -14px"
v-model="advanceSearchMapping['SYCPX']"
></custom-select-array>
</template>
<!-- <el-form-item :label="$t('m.applicableProductLine')" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"-->
<!-- clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
<!-- :label="opt.label">{{ opt.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('m.applicableProductLine')" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"
clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>-->
<!-- 体系类别-->
<el-form-item label="体系类别" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
@@ -672,21 +670,21 @@
</el-input>
</el-form-item>
</template>
<!-- <template>-->
<!-- <custom-select-array-->
<!-- :key="zrgcsOptions.options"-->
<!-- :config="zrgcsOptions"-->
<!-- v-model="advanceSearchMapping['ZRGCS']"-->
<!-- ></custom-select-array>-->
<!-- </template>-->
<!-- <el-form-item label="责任工程师" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable filterable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
<!-- :label="opt.label">{{ opt.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <template>
<custom-select-array
:key="zrgcsOptions.options"
:config="zrgcsOptions"
v-model="advanceSearchMapping['ZRGCS']"
></custom-select-array>
</template>
<el-form-item label="责任工程师" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable filterable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</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
@@ -699,43 +697,46 @@
placeholder="关联模块--卡车VPPS中文名称"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></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>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 能源类型-->
<template>
<custom-select-array
:key="nylxOptions.options"
:config="nylxOptions"
style="margin-left: -14px"
v-model="advanceSearchMapping['NYLX']"
></custom-select-array>
</template>
<!-- <el-form-item label="能源类型" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
<!-- :label="opt.label">{{ opt.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="能源类型" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>-->
<!-- 适用认证-->
<template>
<custom-select-array
:key="syrzOptions.options"
:config="syrzOptions"
style="margin-left: -14px"
v-model="advanceSearchMapping['SYRZ']"
></custom-select-array>
</template>
<!-- <el-form-item label="适用认证" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
<!-- :label="opt.label">{{ opt.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="适用认证" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>-->
<!-- 责任部门-->
<template>
<el-form-item
@@ -745,7 +746,6 @@
>
<template slot="label">责任部门</template>
<el-input
:key="zrbmOptions.options"
:config="zrbmOptions"
clearable
v-model="advanceSearchMapping['ZRBM']"
@@ -754,21 +754,21 @@
</el-input>
</el-form-item>
</template>
<!-- <template>-->
<!-- <custom-select-array-->
<!-- :key="zrbmOptions.options"-->
<!-- :config="zrbmOptions"-->
<!-- v-model="advanceSearchMapping['ZRBM']"-->
<!-- ></custom-select-array>-->
<!-- </template>-->
<!-- <el-form-item label="责任部门" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable filterable-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
<!-- <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"-->
<!-- :label="opt.label">{{ opt.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <template>
<custom-select-array
:key="zrbmOptions.options"
:config="zrbmOptions"
v-model="advanceSearchMapping['ZRBM']"
></custom-select-array>
</template>
<el-form-item label="责任部门" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable filterable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</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.CYCVPPSBM" clearable
@@ -781,6 +781,12 @@
placeholder="关联模块--卡车VPPS编码"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></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>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -805,10 +811,10 @@
</el-col>
<el-col :span="12">
<!-- 被代替标准号-->
<!-- <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"-->
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="被代替标准号" class="add-form-item form-item-disabled">
<el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>-->
<!-- 被引用标准-->
<el-form-item label="被引用标准" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.BYYBJ" clearable
@@ -852,31 +858,31 @@
:rules="sarStandardsInfoRules"
class="label-input-form"
>
<!-- <el-form-item-->
<!-- prop="isRelateAccess"-->
<!-- label-width="150px"-->
<!-- class="add-form-item"-->
<!-- title="A类必填项多，仅A类可纳入法规清单。"-->
<!-- >-->
<!-- <template slot="label">重要度<i class="el-icon-warning-outline"></i></template>-->
<!-- <el-select v-model="sarStandardsInfoEO.isRelateAccess" @change="isRegulationsChange">-->
<!-- <el-option value="1" label="A" key="1"></el-option>-->
<!-- <el-option value="0" label="B" key="0"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="适用区域" prop="country" label-width="150px" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="sarStandardsInfoEO.country" disabled >-->
<!-- <el-option v-for="opt in countryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="文本说明" prop="synopsis" label-width="150px" class="add-form-item">-->
<!-- <el-input-->
<!-- type="text"-->
<!-- v-model="sarStandardsInfoEO.synopsis"-->
<!-- placeholder="请输入"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item
prop="isRelateAccess"
label-width="150px"
class="add-form-item"
title="A类必填项多，仅A类可纳入法规清单。"
>
<template slot="label">重要度<i class="el-icon-warning-outline"></i></template>
<el-select v-model="sarStandardsInfoEO.isRelateAccess" @change="isRegulationsChange">
<el-option value="1" label="A" key="1"></el-option>
<el-option value="0" label="B" key="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="适用区域" prop="country" label-width="150px" class="add-form-item form-item-disabled">
<el-select v-model="sarStandardsInfoEO.country" disabled >
<el-option v-for="opt in countryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}</el-option>
</el-select>
</el-form-item>
<el-form-item label="文本说明" prop="synopsis" label-width="150px" class="add-form-item">
<el-input
type="text"
v-model="sarStandardsInfoEO.synopsis"
placeholder="请输入"
clearable
></el-input>
</el-form-item>-->
<!-- 动态数据-->
<template v-for="(displayLocation, index) in dynamicFormField">
<el-col :span="24" :key="index">
@@ -916,7 +922,6 @@
<template v-for="field in displayLocation.child">
<template v-if="field.attrType === 'FILE' && field.attrField === 'FBGBJBD'">
<custom-file
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -992,22 +997,22 @@
<el-option value="2" label="否" key="2"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item-->
<!-- prop="standSystem"-->
<!-- label-width="150px"-->
<!-- class="add-form-item"-->
<!-- >-->
<!-- <template slot="label">标准体系</template>-->
<!-- <tree-select-->
<!-- :data="standSystemOptions"-->
<!-- :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"-->
<!-- :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item
prop="standSystem"
label-width="150px"
class="add-form-item"
>
<template slot="label">标准体系</template>
<tree-select
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
</el-form-item>-->
</template>
<template v-for="field in displayLocation.child">
<template v-if="field.attrField === 'EOPSSRQ'">
<custom-eop-date-pick
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -1015,7 +1020,7 @@
</template>
<template v-else-if="field.attrField === 'SVPPS'">
<custom-SVPPS
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -1024,7 +1029,7 @@
<template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ' || field.attrField === 'SSRQ'">
<custom-date-pick-group
v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -1032,7 +1037,7 @@
</template>
<template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
<custom-date-pick-group
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -1042,7 +1047,7 @@
<template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'">
<template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'BYYBJ' || field.attrField === 'CBBH' || field.attrField === 'DXBZ'">
<custom-input-for-standards
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -1108,7 +1113,6 @@
</template>
<template v-else>
<custom-input
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -1118,7 +1122,7 @@
</template>
<template v-else-if="field.attrType === 'INPUT_NUM'">
<custom-input-num
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -1126,7 +1130,7 @@
</template>
<template v-else-if="field.attrType === 'DATE_PICKER'">
<custom-date-pick
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:class="field.attrName === '在产车实施日期(国家）' || field.attrName === '新车型实施日期(国家）'|| field.attrName === '实施日期(国际）' ? 'classDisplay' : ''"
@@ -1136,7 +1140,7 @@
<!-- 发布稿的组件 -->
<template v-else-if="field.attrType === 'FILE' && field.attrField !== 'FBGBJBD'">
<custom-file
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -1145,7 +1149,7 @@
</template>
<template v-else-if="field.attrType === 'TEXTAREA'">
<custom-textarea
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -1153,7 +1157,7 @@
</template>
<template v-else-if="field.attrType === 'SEL_OPTION'">
<custom-select
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -1168,7 +1172,7 @@
>
<template slot="label">责任部门</template>
<el-input
:key="field.attrField"
:config="field"
clearable
v-model="sarStandardsInfoEO['ZRBM']"
@@ -1186,19 +1190,18 @@
<template slot="label">责任工程师</template>
<el-input v-model="sarStandardsInfoEO['ZRGCS']" placeholder="选择责任工程师" @click.native="choiceZRRS('zrgcs', '选择责任工程师', sarStandardsInfoEO['ZRGCS'])">
</el-input>
<!-- <el-input-->
<!-- :key="field.attrField"-->
<!-- :config="field"-->
<!-- clearable-->
<!-- v-model="sarStandardsInfoEO['ZRGCS']"-->
<!-- :disabled="formdisableflag" placeholder="选择责任工程师"-->
<!-- @click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">-->
<!-- </el-input>-->
<!-- <el-input
:key="field.attrField"
:config="field"
clearable
v-model="sarStandardsInfoEO['ZRGCS']"
:disabled="formdisableflag" placeholder="选择责任工程师"
@click.native="choiceRole('ZRGCSUserId', '责任工程师', sarStandardsInfoEO.ZRGCSUserId)">
</el-input>-->
</el-form-item>
</template>
<template v-else>
<custom-select-array
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
@@ -1856,17 +1859,19 @@ export default {
CYSD: '', //我司参与深度
GKDW: '', //归口管理部门
SSRQ: '',//实施日期
XCXSSRQ: ''//新车型实施日期
, ZCCSSRQ: ''//在产车实施日期
, QCDW: ''//起草单位
, NYLX: ''//能源类型
, SYRZ: ''//适用认证
, ZRGCS: ''//责任工程师
, CBBH: ''//采标编号
, CBCD: ''//采标程度
, YYBJ: ''//引用标准
, BYYBJ: ''//被引用标准
, TXLB: ''//体系类别
XCXSSRQ: '',//新车型实施日期
ZCCSSRQ: '',//在产车实施日期
QCDW: '',//起草单位
NYLX: '',//能源类型
SYRZ: '',//适用认证
ZRGCS: '',//责任工程师
CBBH: '',//采标编号
CBCD: '',//采标程度
YYBJ: '',//引用标准
BYYBJ: '',//被引用标准
TXLB: '',//体系类别
DYMC: '', //模块结构单元名称
DYBXH: '',// 模块结构单元变形号
},
// 分页查询过程中用到的对象
@@ -5099,6 +5104,8 @@ export default {
this.nylxOptions.options = res.data.NYLXCLASS;//能源类型
this.syrzOptions.options = res.data.SYRZCLASS;//适用认证
this.gkglbmOptions = res.data.GKGLBM;//归口管理部门
// 模块结构单元变型号
this.dybxhOptions.options = res.data.DYBXH
this.getGzzOption()
this.setMap(this.standStateOptions)
src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue
+1 -6
View File
@@ -122,12 +122,7 @@ export default {
},
watch: {
value (val) {
if(val !== '' && val !== null) {
this.tagList = []
} else {
this.tagList = val.split(',')
}
// this.tagList = val !== '' && val !== null ? val.split(',') : []
this.tagList = val !== '' && val !== null ? val.split(',') : []
},
tagList: {
handler (val) {