Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -45,7 +45,7 @@
|
|||||||
width="170px">
|
width="170px">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="createTime"
|
prop="operateTime"
|
||||||
label="操作时间"
|
label="操作时间"
|
||||||
width="170px">
|
width="170px">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
@@ -28,24 +28,6 @@
|
|||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="适用领域" prop="applicationScope" class="search-item">
|
|
||||||
<el-select
|
|
||||||
v-model="sarAccessEO.applicationScope"
|
|
||||||
multiple
|
|
||||||
placeholder="请选择"
|
|
||||||
filterable
|
|
||||||
:disabled="disabledFlag"
|
|
||||||
class="wx-resolve"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="item in applyOptions"
|
|
||||||
:value="item.value"
|
|
||||||
:key="item.value"
|
|
||||||
:label="item.label"
|
|
||||||
>
|
|
||||||
</el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>-->
|
|
||||||
<br/><br/>
|
<br/><br/>
|
||||||
<el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
|
<el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
|
||||||
<el-input
|
<el-input
|
||||||
@@ -163,7 +145,11 @@
|
|||||||
@click="clearSearchLaws">清空</el-button>
|
@click="clearSearchLaws">清空</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
|
<el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
|
||||||
|
<i class="iconfont"></i>
|
||||||
|
高级查询
|
||||||
|
</el-button>
|
||||||
|
<el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
|
||||||
<i class="iconfont"></i>
|
<i class="iconfont"></i>
|
||||||
高级查询
|
高级查询
|
||||||
</el-button>
|
</el-button>
|
||||||
@@ -171,6 +157,58 @@
|
|||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="showSelectBox" v-if="!showSelectBox">
|
||||||
|
<el-form :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline>
|
||||||
|
<el-form-item label="标准名称" class="search-item" v-show="!isListType">
|
||||||
|
<el-input
|
||||||
|
v-model="sarAccessInfoSearch.standName"
|
||||||
|
placeholder="请输入"
|
||||||
|
:maxlength="100"
|
||||||
|
size="small"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="文本状态" v-show="!isListType">
|
||||||
|
<el-select
|
||||||
|
v-model="sarAccessInfoSearch.textStatus"
|
||||||
|
placeholder="请选择"
|
||||||
|
filterable
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in textStatusOptions"
|
||||||
|
:value="item.value"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="发布日期" v-show="!isListType">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="sarAccessInfoSearch.issueTime"
|
||||||
|
type="date"
|
||||||
|
value-format="yyyy-MM-DD"
|
||||||
|
size="small"
|
||||||
|
placeholder="选择发布日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item lable="更新时间" v-show="isListType">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="sarAccessInfoSearch.modifyTime"
|
||||||
|
type="date"
|
||||||
|
value-format="yyyy-MM-DD"
|
||||||
|
size="small"
|
||||||
|
placeholder="选择发布日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="更新人" v-show="isListType">
|
||||||
|
<el-input
|
||||||
|
v-model="sarAccessInfoSearch.standName"
|
||||||
|
placeholder="请输入"
|
||||||
|
:maxlength="100"
|
||||||
|
size="small"/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
<div class="action-bar">
|
<div class="action-bar">
|
||||||
<el-button
|
<el-button
|
||||||
class="common-button-default"
|
class="common-button-default"
|
||||||
@@ -274,9 +312,15 @@
|
|||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="countryArea"
|
prop="country"
|
||||||
label="国家/地区"
|
label="国家/地区"
|
||||||
align="center">
|
align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span v-if="scope.row.country !== null && scope.row.country.indexOf(',') > 0">
|
||||||
|
<span>{{ scope.row.country }}</span>
|
||||||
|
</span>
|
||||||
|
<span v-else>{{ countryAreaMap[scope.row.country] }}</span>
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="detailedListName"
|
prop="detailedListName"
|
||||||
@@ -514,7 +558,7 @@
|
|||||||
:wrapperClosable="false"
|
:wrapperClosable="false"
|
||||||
size="800px"
|
size="800px"
|
||||||
>
|
>
|
||||||
<el-form :modal="editRowData" ref="editRowData" label-width="auto" style="margin: 20px">
|
<el-form :modal="editRowData" ref="editRowData" label-width="150px" style="margin: 20px">
|
||||||
<el-form-item label="标准号">
|
<el-form-item label="标准号">
|
||||||
<a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>
|
<a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -656,6 +700,7 @@ export default {
|
|||||||
// }
|
// }
|
||||||
return {
|
return {
|
||||||
textStatusMap: {},
|
textStatusMap: {},
|
||||||
|
countryAreaMap: {},
|
||||||
typeApplicableMap: {},
|
typeApplicableMap: {},
|
||||||
nylxMap: {},
|
nylxMap: {},
|
||||||
zrbmMap: {},
|
zrbmMap: {},
|
||||||
@@ -712,6 +757,7 @@ export default {
|
|||||||
disabledFlag: false,
|
disabledFlag: false,
|
||||||
regionOptions: [], // 基础信息 区域list
|
regionOptions: [], // 基础信息 区域list
|
||||||
drawerCountryOptions: [], // 基础信息 国家list
|
drawerCountryOptions: [], // 基础信息 国家list
|
||||||
|
textStatusOptions: [], // 文本状态
|
||||||
applyOptions: [], //基础信息适用领域list
|
applyOptions: [], //基础信息适用领域list
|
||||||
applyArcticOptions: [], // 基础车型 适用车型list
|
applyArcticOptions: [], // 基础车型 适用车型list
|
||||||
energyKindOptions: [], // 能源种类list
|
energyKindOptions: [], // 能源种类list
|
||||||
@@ -733,6 +779,9 @@ export default {
|
|||||||
sarAccessInfoSearch: {
|
sarAccessInfoSearch: {
|
||||||
id: '',
|
id: '',
|
||||||
countryArea: '', // 国家
|
countryArea: '', // 国家
|
||||||
|
issueTime: '',
|
||||||
|
standName: '',
|
||||||
|
textStatus: '',
|
||||||
// applicationScope: '', //适用区域
|
// applicationScope: '', //适用区域
|
||||||
keywords: '', // 关键字
|
keywords: '', // 关键字
|
||||||
detailedListName: '', //清单名称
|
detailedListName: '', //清单名称
|
||||||
@@ -746,6 +795,7 @@ export default {
|
|||||||
},
|
},
|
||||||
moreSearchBtn: true, // 多属性搜索按钮 状态
|
moreSearchBtn: true, // 多属性搜索按钮 状态
|
||||||
showTableFlag: true, // 显示添加列表 状态
|
showTableFlag: true, // 显示添加列表 状态
|
||||||
|
showSelectBox: true, // 显示高级查询 状态
|
||||||
sarAccessInfoSearchList: [], // 数据搜索 table列表数据
|
sarAccessInfoSearchList: [], // 数据搜索 table列表数据
|
||||||
importmodalFlag: false, // 导入model 状态
|
importmodalFlag: false, // 导入model 状态
|
||||||
searching: false,
|
searching: false,
|
||||||
@@ -959,6 +1009,15 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
// 高级检索
|
// 高级检索
|
||||||
selectMoreBtn () {
|
selectMoreBtn () {
|
||||||
|
this.showSelectBox = !this.showSelectBox
|
||||||
|
this.showTableFlag = false
|
||||||
|
if (!this.showSelectBox) {
|
||||||
|
this.sarAccessInfoSearch.standName = ''
|
||||||
|
this.sarAccessInfoSearch.issueTime = ''
|
||||||
|
this.sarAccessInfoSearch.textStatus = ''
|
||||||
|
this.sarAccessInfoSearch.modifyTime = ''
|
||||||
|
}
|
||||||
|
this.selectLawsStands()
|
||||||
},
|
},
|
||||||
// 法规维护人树
|
// 法规维护人树
|
||||||
getDept () {
|
getDept () {
|
||||||
@@ -1062,6 +1121,9 @@ export default {
|
|||||||
this.sarAccessInfoSearch.askType = '' // 监管类型
|
this.sarAccessInfoSearch.askType = '' // 监管类型
|
||||||
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
|
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
|
||||||
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
|
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
|
||||||
|
this.sarAccessInfoSearch.standName = ''
|
||||||
|
this.sarAccessInfoSearch.putTime = ''
|
||||||
|
this.sarAccessInfoSearch.textStatus = ''
|
||||||
this.isListType = false
|
this.isListType = false
|
||||||
this.selectLawsStands()
|
this.selectLawsStands()
|
||||||
},
|
},
|
||||||
@@ -1346,12 +1408,31 @@ export default {
|
|||||||
this.$refs['sarAccessForm'].validate((valid) => {
|
this.$refs['sarAccessForm'].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
let rowlist = []
|
let rowlist = []
|
||||||
|
let rowlist1 = []
|
||||||
|
let rowlist2 = []
|
||||||
|
let rowlist3 = []
|
||||||
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
|
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
|
||||||
rowlist.push(this.sarAccessInfoList[i].id)
|
rowlist.push(this.sarAccessInfoList[i].id)
|
||||||
|
if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null) {
|
||||||
|
rowlist1.push(this.sarAccessInfoList[i].putTime)
|
||||||
|
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
|
||||||
|
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
|
||||||
|
}else {
|
||||||
|
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
|
||||||
|
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
|
||||||
|
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
console.log(rowlist2)
|
||||||
rowlist = rowlist.join(',')
|
rowlist = rowlist.join(',')
|
||||||
|
rowlist1 = rowlist1.join(',')
|
||||||
|
rowlist2 = rowlist2.join(',')
|
||||||
|
rowlist3 = rowlist3.join(',')
|
||||||
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
|
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
|
||||||
sarAccessEO.inforlist = JSON.stringify(rowlist)
|
sarAccessEO.inforlist = JSON.stringify(rowlist)
|
||||||
|
sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
|
||||||
|
sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
|
||||||
|
sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
|
||||||
sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
|
sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
|
||||||
// sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
|
// sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
|
||||||
// 判断是否有附件
|
// 判断是否有附件
|
||||||
@@ -1418,7 +1499,6 @@ export default {
|
|||||||
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
|
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
|
||||||
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
|
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
|
||||||
})
|
})
|
||||||
console.log(this.sarAccessInfoSearchList)
|
|
||||||
}, e => {
|
}, e => {
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -1883,6 +1963,7 @@ export default {
|
|||||||
// 将文本状态的id与name对应
|
// 将文本状态的id与name对应
|
||||||
setMap(data){
|
setMap(data){
|
||||||
data.forEach(item => {
|
data.forEach(item => {
|
||||||
|
this.$set(this.countryAreaMap, item.value, item.label)
|
||||||
this.$set(this.textStatusMap, item.value, item.label)
|
this.$set(this.textStatusMap, item.value, item.label)
|
||||||
this.$set(this.typeApplicableMap, item.value, item.label)
|
this.$set(this.typeApplicableMap, item.value, item.label)
|
||||||
this.$set(this.nylxMap, item.value, item.label)
|
this.$set(this.nylxMap, item.value, item.label)
|
||||||
@@ -1934,6 +2015,7 @@ export default {
|
|||||||
this.setMap(this.categoryOptions)
|
this.setMap(this.categoryOptions)
|
||||||
this.setMap(this.sycpxOptions)
|
this.setMap(this.sycpxOptions)
|
||||||
this.setMap(this.energyKindOptions)
|
this.setMap(this.energyKindOptions)
|
||||||
|
this.setMap(this.drawerCountryOptions)
|
||||||
this.getGzzOption()
|
this.getGzzOption()
|
||||||
}, e => {
|
}, e => {
|
||||||
})
|
})
|
||||||
@@ -1992,6 +2074,9 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.showSelectBox {
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
.data-search{
|
.data-search{
|
||||||
.standards-drawer-table-one{
|
.standards-drawer-table-one{
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|||||||
@@ -4,8 +4,12 @@
|
|||||||
<div class="back" title="返回" @click="back">
|
<div class="back" title="返回" @click="back">
|
||||||
<i class="el-icon-back"></i>
|
<i class="el-icon-back"></i>
|
||||||
</div>
|
</div>
|
||||||
<div class="title">{{ sarAccessEO.detailedListName }}<i class="el-icon-s-order"
|
<div class="title">
|
||||||
@click="heightShow = !heightShow"></i></div>
|
{{ sarAccessEO.detailedListName }}
|
||||||
|
<i class="el-icon-s-order"
|
||||||
|
@click="heightShow = !heightShow">
|
||||||
|
</i>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<transition name="el-zoom-in-top">
|
<transition name="el-zoom-in-top">
|
||||||
<div v-show="heightShow" class="transition-box">
|
<div v-show="heightShow" class="transition-box">
|
||||||
@@ -88,12 +92,136 @@
|
|||||||
icon="export"
|
icon="export"
|
||||||
>导出
|
>导出
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button type="primary" v-btn-permission="'670472f38fe27b192c7f7105847f38ce'" class="common-button-primary" size="mini" @click="selectMoreBtn"><i
|
<el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
|
||||||
class="iconfont"></i>高级查询
|
<i class="iconfont"></i>
|
||||||
|
高级查询
|
||||||
|
</el-button>
|
||||||
|
<el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
|
||||||
|
<i class="iconfont"></i>
|
||||||
|
高级查询
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
<div v-if="!showSelectBox">
|
||||||
<div class="right">
|
<el-form :model="standardForm" class="label-input-form" label-width="auto" inline>
|
||||||
|
<el-form-item label="中文名称" class="search-item">
|
||||||
|
<el-input
|
||||||
|
v-model="standardForm.standName"
|
||||||
|
placeholder="请输入"
|
||||||
|
:maxlength="100"
|
||||||
|
size="small"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="英文名称" class="search-item">
|
||||||
|
<el-input
|
||||||
|
v-model="standardForm.standEnName"
|
||||||
|
placeholder="请输入"
|
||||||
|
:maxlength="100"
|
||||||
|
size="small"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="适用车型" >
|
||||||
|
<el-select
|
||||||
|
v-model="standardForm.typeApplicable"
|
||||||
|
placeholder="请选择"
|
||||||
|
filterable
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in applyArcticOptions"
|
||||||
|
:value="item.value"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="能源类型" >
|
||||||
|
<el-select
|
||||||
|
v-model="standardForm.nylx"
|
||||||
|
placeholder="请选择"
|
||||||
|
filterable
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in energyKindOptions"
|
||||||
|
:value="item.value"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="责任部门" >
|
||||||
|
<el-select
|
||||||
|
v-model="standardForm.zrbm"
|
||||||
|
placeholder="请选择"
|
||||||
|
filterable
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in zrbmOptions"
|
||||||
|
:value="item.value"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="适用产品线" >
|
||||||
|
<el-select
|
||||||
|
v-model="standardForm.sycpx"
|
||||||
|
placeholder="请选择"
|
||||||
|
filterable
|
||||||
|
size="small"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in sycpxOptions"
|
||||||
|
:value="item.value"
|
||||||
|
:key="item.value"
|
||||||
|
:label="item.label"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="乘用车VPPS编码" class="search-item">
|
||||||
|
<el-input
|
||||||
|
v-model="standardForm.cycvppsbm"
|
||||||
|
placeholder="请输入"
|
||||||
|
:maxlength="100"
|
||||||
|
size="small"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="乘用车VPPS中文名称" class="search-item">
|
||||||
|
<el-input
|
||||||
|
v-model="standardForm.cycvppscn"
|
||||||
|
placeholder="请输入"
|
||||||
|
:maxlength="100"
|
||||||
|
size="small"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="卡车VPPS编码" class="search-item">
|
||||||
|
<el-input
|
||||||
|
v-model="standardForm.kccvppsbm"
|
||||||
|
placeholder="请输入"
|
||||||
|
:maxlength="100"
|
||||||
|
size="small"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="卡车VPPS中文名称" class="search-item">
|
||||||
|
<el-input
|
||||||
|
v-model="standardForm.kccvppscn"
|
||||||
|
placeholder="请输入"
|
||||||
|
:maxlength="100"
|
||||||
|
size="small"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<!-- <el-form-item label="标准实施日期">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="standardForm.issueTime"
|
||||||
|
type="date"
|
||||||
|
value-format="yyyy-MM-DD"
|
||||||
|
size="small"
|
||||||
|
placeholder="选择发布日期">
|
||||||
|
</el-date-picker>
|
||||||
|
</el-form-item>-->
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="container" style="position:relative;">
|
<div class="container" style="position:relative;">
|
||||||
@@ -142,7 +270,10 @@
|
|||||||
width="180px"
|
width="180px"
|
||||||
label="适用车型">
|
label="适用车型">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
|
<span v-if="scope.row.typeApplicable !== null && scope.row.typeApplicable.indexOf(',') > 0">
|
||||||
|
{{ scope.row.typeApplicable }}
|
||||||
|
</span>
|
||||||
|
<span v-else>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
@@ -151,7 +282,10 @@
|
|||||||
width="180px"
|
width="180px"
|
||||||
label="能源类型">
|
label="能源类型">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ nylxMap[scope.row.nylx] }}</span>
|
<span v-if="scope.row.nylx !== null && scope.row.nylx.indexOf(',') > 0">
|
||||||
|
{{ scope.row.nylx }}
|
||||||
|
</span>
|
||||||
|
<span v-else>{{ nylxMap[scope.row.nylx] }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
@@ -160,9 +294,6 @@
|
|||||||
align="center"
|
align="center"
|
||||||
width="210px"
|
width="210px"
|
||||||
label="标准实施日期">
|
label="标准实施日期">
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
@@ -172,7 +303,10 @@
|
|||||||
align="center"
|
align="center"
|
||||||
label="在产车实施日期">
|
label="在产车实施日期">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
|
<span v-if="scope.row.zccssrqgj === null">
|
||||||
|
{{ scope.row.zccssrqgj }}
|
||||||
|
</span>
|
||||||
|
<span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
@@ -182,7 +316,10 @@
|
|||||||
width="210px"
|
width="210px"
|
||||||
label="新车型实施日期">
|
label="新车型实施日期">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
|
<span v-if="scope.row.xcxssrqgj === null">
|
||||||
|
{{ scope.row.xcxssrqgj }}
|
||||||
|
</span>
|
||||||
|
<span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
@@ -192,7 +329,10 @@
|
|||||||
align="center"
|
align="center"
|
||||||
label="责任部门">
|
label="责任部门">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ zrbmMap[scope.row.zrbm] }}</span>
|
<span v-if="scope.row.zrbm !== null && scope.row.zrbm.indexOf(',') > 0">
|
||||||
|
{{ scope.row.zrbm }}
|
||||||
|
</span>
|
||||||
|
<span v-else>{{ zrbmMap[scope.row.zrbm] }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
@@ -202,6 +342,9 @@
|
|||||||
align="center"
|
align="center"
|
||||||
label="适用产品线">
|
label="适用产品线">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
|
<span v-if="scope.row.sycpx !== null && scope.row.sycpx.indexOf(',') > 0">
|
||||||
|
{{ scope.row.sycpx }}
|
||||||
|
</span>
|
||||||
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
|
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -280,11 +423,12 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { interfaceUrl } from "@/sysConfig";
|
import { interfaceUrl } from "@/sysConfig";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "AccessStandardDetails",
|
name: "AccessStandardDetails",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
// 高级检索状态
|
||||||
|
showSelectBox: true,
|
||||||
textStatusMap: {},
|
textStatusMap: {},
|
||||||
typeApplicableMap: {},
|
typeApplicableMap: {},
|
||||||
nylxMap: {},
|
nylxMap: {},
|
||||||
@@ -292,6 +436,14 @@ export default {
|
|||||||
sycpxMap: {},
|
sycpxMap: {},
|
||||||
countryAreaMap: {},
|
countryAreaMap: {},
|
||||||
standinfoList: [],
|
standinfoList: [],
|
||||||
|
// 适用车型
|
||||||
|
applyArcticOptions: [],
|
||||||
|
// 能源类型
|
||||||
|
energyKindOptions: [],
|
||||||
|
// 责任部门
|
||||||
|
zrbmOptions: [],
|
||||||
|
// 适用产品线
|
||||||
|
sycpxOptions: [],
|
||||||
standardFormTotal: 0,
|
standardFormTotal: 0,
|
||||||
relateDialog: false,
|
relateDialog: false,
|
||||||
relateList: [],
|
relateList: [],
|
||||||
@@ -304,7 +456,7 @@ export default {
|
|||||||
standName: "",
|
standName: "",
|
||||||
responseUnit: "",
|
responseUnit: "",
|
||||||
page: 1,
|
page: 1,
|
||||||
pageSize: this.$store.getters.userInfo.configContent
|
Size: this.$store.getters.userInfo.configContent
|
||||||
},
|
},
|
||||||
page: 1,
|
page: 1,
|
||||||
// pageSize: this.$store.getters.userInfo.configContent,
|
// pageSize: this.$store.getters.userInfo.configContent,
|
||||||
@@ -456,7 +608,7 @@ export default {
|
|||||||
this.selectInfobyAccid();
|
this.selectInfobyAccid();
|
||||||
},
|
},
|
||||||
pageSizeChange(pageSize) {
|
pageSizeChange(pageSize) {
|
||||||
this.standardForm.pageSize = this.$store.getters.userInfo.configContent;
|
this.standardForm.Size = this.$store.getters.userInfo.configContent;
|
||||||
this.selectInfobyAccid();
|
this.selectInfobyAccid();
|
||||||
},
|
},
|
||||||
// 请求部门结构树
|
// 请求部门结构树
|
||||||
@@ -561,6 +713,17 @@ export default {
|
|||||||
* 高级检索
|
* 高级检索
|
||||||
*/
|
*/
|
||||||
selectMoreBtn() {
|
selectMoreBtn() {
|
||||||
|
this.showSelectBox = !this.showSelectBox
|
||||||
|
this.showTableFlag = false
|
||||||
|
if (!this.showSelectBox) {
|
||||||
|
// this.standardForm = {}
|
||||||
|
// this.standardForm.issueTime = ''
|
||||||
|
// this.standardForm.textStatus = ''
|
||||||
|
// this.standardForm.modifyTime = ''
|
||||||
|
}
|
||||||
|
this.page = 1
|
||||||
|
this.standardForm.page = 1
|
||||||
|
this.selectInfobyAccid()
|
||||||
},
|
},
|
||||||
// 获取工作组信息下拉框信息
|
// 获取工作组信息下拉框信息
|
||||||
getGzzOption() {
|
getGzzOption() {
|
||||||
@@ -646,6 +809,7 @@ export default {
|
|||||||
this.setMap(this.sycpxOptions)
|
this.setMap(this.sycpxOptions)
|
||||||
this.setMap(this.energyKindOptions)
|
this.setMap(this.energyKindOptions)
|
||||||
this.setMap(this.drawerCountryOptions)
|
this.setMap(this.drawerCountryOptions)
|
||||||
|
this.setMap(this.applyArcticOptions)
|
||||||
this.getGzzOption();
|
this.getGzzOption();
|
||||||
}, e => {
|
}, e => {
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -116,7 +116,7 @@
|
|||||||
<el-button class="common-button-default export-button"
|
<el-button class="common-button-default export-button"
|
||||||
@click="exportStandard()"
|
@click="exportStandard()"
|
||||||
size="mini"
|
size="mini"
|
||||||
v-btn-permission="'84035c53f4e7c3e2f343a83e6c6e291d'"
|
v-btn-permission="'b17f1d035219c47344032e261342d87d'"
|
||||||
title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"><i class="iconfont"></i>导出</el-button>
|
title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"><i class="iconfont"></i>导出</el-button>
|
||||||
<el-button class="common-button-default delete-button"
|
<el-button class="common-button-default delete-button"
|
||||||
:loading="delLoading"
|
:loading="delLoading"
|
||||||
@@ -521,7 +521,8 @@
|
|||||||
:key="field.attrField"
|
:key="field.attrField"
|
||||||
:config="field"
|
:config="field"
|
||||||
v-model="sarStandardsInfoEO[field.attrField]"
|
v-model="sarStandardsInfoEO[field.attrField]"
|
||||||
:disabled="field.attrName === '在产车实施日期(国家)' || field.attrName === '新车型实施日期(国家)'|| field.attrName === '实施日期(国际)' || formdisableflag"
|
:disabled="formdisableflag"
|
||||||
|
:class="field.attrName === '在产车实施日期(国家)' || field.attrName === '新车型实施日期(国家)'|| field.attrName === '实施日期(国际)' ? 'classDisplay' : ''"
|
||||||
></custom-date-pick>
|
></custom-date-pick>
|
||||||
</template>
|
</template>
|
||||||
<template v-else-if="field.attrType === 'FILE'">
|
<template v-else-if="field.attrType === 'FILE'">
|
||||||
@@ -1914,7 +1915,9 @@ export default {
|
|||||||
synopsis: '',
|
synopsis: '',
|
||||||
// replaceStandNumCope: '',
|
// replaceStandNumCope: '',
|
||||||
replacedStandNum: '',
|
replacedStandNum: '',
|
||||||
orderBy:''
|
orderBy:'',
|
||||||
|
nowOrder: '',
|
||||||
|
nowOrderBy: '',
|
||||||
}, // 分页查询过程中用到的对象
|
}, // 分页查询过程中用到的对象
|
||||||
configStandList: [],
|
configStandList: [],
|
||||||
configStandtotal: 0,
|
configStandtotal: 0,
|
||||||
@@ -1930,6 +1933,8 @@ export default {
|
|||||||
delLoading: false,
|
delLoading: false,
|
||||||
standState: '',
|
standState: '',
|
||||||
orderBy :'',
|
orderBy :'',
|
||||||
|
nowOrder: '',
|
||||||
|
nowOrderBy: '',
|
||||||
textStatusMap: {} // 文本状态id与name对应
|
textStatusMap: {} // 文本状态id与name对应
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2697,16 +2702,36 @@ export default {
|
|||||||
},
|
},
|
||||||
// 表格排序
|
// 表格排序
|
||||||
sortChange (sortObj) {
|
sortChange (sortObj) {
|
||||||
|
console.log(sortObj, '升降序')
|
||||||
if (sortObj.column.order !== 'normal') {
|
if (sortObj.column.order !== 'normal') {
|
||||||
switch (sortObj.column.property) {
|
switch (sortObj.prop) {
|
||||||
case 'issueTime' :
|
case 'issueTime' :
|
||||||
// 后台联调
|
// 后台联调
|
||||||
this.orderBy = 'issueTime ' + sortObj.order
|
this.nowOrderBy = '1'
|
||||||
break
|
break;
|
||||||
|
case 'xcxssrq' :
|
||||||
|
// 后台联调
|
||||||
|
this.nowOrderBy = '2'
|
||||||
|
break;
|
||||||
|
case 'zccssrq' :
|
||||||
|
// 后台联调
|
||||||
|
this.nowOrderBy = '3'
|
||||||
|
break;
|
||||||
|
case 'textStatus' :
|
||||||
|
// 后台联调
|
||||||
|
this.nowOrderBy = '4'
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
switch (sortObj.order) {
|
||||||
|
case 'ascending' :
|
||||||
|
this.nowOrder = '2'
|
||||||
|
break;
|
||||||
|
case 'descending' :
|
||||||
|
this.nowOrder = '1'
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.getDomesticStandardTable(this.tableFlag)
|
this.getDomesticStandardTable(this.tableFlag)
|
||||||
|
|
||||||
},
|
},
|
||||||
// 修改成表格样式后,选择项勾选改变
|
// 修改成表格样式后,选择项勾选改变
|
||||||
standSelectChange (data) {
|
standSelectChange (data) {
|
||||||
@@ -3125,7 +3150,9 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 排序
|
// 排序
|
||||||
formData.orderBy = this.orderBy
|
formData.nowOrder = this.nowOrder
|
||||||
|
formData.nowOrderBy = this.nowOrderBy
|
||||||
|
// formData.orderBy = this.orderBy
|
||||||
// 处理我的收藏和个性化标签传参
|
// 处理我的收藏和个性化标签传参
|
||||||
if (this.selectSarMenu.id === 'wdsc') {
|
if (this.selectSarMenu.id === 'wdsc') {
|
||||||
formData.menuId = undefined
|
formData.menuId = undefined
|
||||||
@@ -3828,12 +3855,28 @@ export default {
|
|||||||
switch (sortObj.prop) {
|
switch (sortObj.prop) {
|
||||||
case 'issueTime' :
|
case 'issueTime' :
|
||||||
// 后台联调
|
// 后台联调
|
||||||
this.sarConfigStandSearch.orderBy = 'issueTime ' + sortObj.order
|
this.sarConfigStandSearch.nowOrderBy = '1'
|
||||||
break
|
break;
|
||||||
case 'XCXSSRQ' :
|
case 'xcxssrq' :
|
||||||
// 后台联调
|
// 后台联调
|
||||||
this.sarConfigStandSearch.orderBy = 'XCXSSRQ ' + sortObj.order
|
this.sarConfigStandSearch.nowOrderBy = '2'
|
||||||
break
|
break;
|
||||||
|
case 'zccssrq' :
|
||||||
|
// 后台联调
|
||||||
|
this.sarConfigStandSearch.nowOrderBy = '3'
|
||||||
|
break;
|
||||||
|
case 'textStatus' :
|
||||||
|
// 后台联调
|
||||||
|
this.sarConfigStandSearch.nowOrderBy = '4'
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
switch (sortObj.order) {
|
||||||
|
case 'ascending' :
|
||||||
|
this.sarConfigStandSearch.nowOrder = '2'
|
||||||
|
break;
|
||||||
|
case 'descending' :
|
||||||
|
this.sarConfigStandSearch.nowOrder = '1'
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
this.selectConfiguraStand()
|
this.selectConfiguraStand()
|
||||||
@@ -4501,5 +4544,7 @@ export default {
|
|||||||
.el-date-editor.el-input, .el-date-editor.el-input__inner{
|
.el-date-editor.el-input, .el-date-editor.el-input__inner{
|
||||||
width: 190px
|
width: 190px
|
||||||
}
|
}
|
||||||
|
.classDisplay{
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -580,6 +580,7 @@
|
|||||||
:key="field.attrField"
|
:key="field.attrField"
|
||||||
:config="field"
|
:config="field"
|
||||||
v-model="sarStandardsInfoEO[field.attrField]"
|
v-model="sarStandardsInfoEO[field.attrField]"
|
||||||
|
:class="field.attrName === '在产车实施日期(国家)' || field.attrName === '新车型实施日期(国家)'|| field.attrName === '实施日期(国际)' ? 'classDisplay' : ''"
|
||||||
:disabled="formdisableflag"
|
:disabled="formdisableflag"
|
||||||
></custom-date-pick>
|
></custom-date-pick>
|
||||||
</template>
|
</template>
|
||||||
@@ -4256,5 +4257,8 @@ export default {
|
|||||||
border-radius: 0 !important;
|
border-radius: 0 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.classDisplay{
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user