Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -87,26 +87,6 @@
|
||||
:maxlength="100"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
|
||||
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
|
||||
<el-option
|
||||
v-for="item in energyKindOptions"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
|
||||
<el-select v-model="sarAccessInfoSearch.askType">
|
||||
<el-option
|
||||
v-for="item in accessSarTypeOptions"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
type="primary"
|
||||
@@ -137,52 +117,22 @@
|
||||
</div>
|
||||
<div class="showSelectBox" v-if="!showSelectBox">
|
||||
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
|
||||
<el-form-item label="标准名称" class="search-item">
|
||||
<el-form-item label="标准号" class="labelBox">
|
||||
<el-input
|
||||
v-model="sarAccessInfo.standNumber"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" class="labelBox">
|
||||
<el-input
|
||||
v-model="sarAccessInfo.standName"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="文本状态">
|
||||
<el-select
|
||||
v-model="sarAccessInfo.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="发布日期" >
|
||||
<el-date-picker
|
||||
v-model="sarAccessInfo.issueTime"
|
||||
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-item label="更新时间" v-show="isListType">
|
||||
<el-date-picker
|
||||
v-model="sarAccessInfoSearch.modifyTime"
|
||||
type="date"
|
||||
size="small"
|
||||
value-format="yyyy-MM-DD"
|
||||
placeholder="选择更新日期">
|
||||
</el-date-picker>
|
||||
<el-form-item>
|
||||
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
@@ -292,6 +242,7 @@
|
||||
v-btn-permission="''"
|
||||
><i class="iconfont"></i>删除</el-button>
|
||||
</div>
|
||||
<!-- 清单条目的列表页 -->
|
||||
<el-table
|
||||
ref="entryTable"
|
||||
:data="sarAccessInfoList"
|
||||
@@ -479,21 +430,19 @@
|
||||
>
|
||||
<el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
|
||||
<el-form-item label="标准号">
|
||||
<el-input v-model.trim="editRowData.standNumber" :disabled="true">
|
||||
<!-- <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>-->
|
||||
</el-input>
|
||||
<el-input v-model.trim="editRowData.standNumber" :disabled="true"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" prop="standName">
|
||||
<el-input v-model.trim="editRowData.standName" :disabled="true"></el-input>
|
||||
<el-input v-model.trim="editRowData.standName" :disabled="true"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="英文名称" prop="standEnName">
|
||||
<el-input v-model.trim="editRowData.standEnName" :disabled="true"></el-input>
|
||||
<el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用车型" prop="typeApplicable">
|
||||
<el-input v-model.trim="editRowData.typeApplicable" :disabled="true"></el-input>
|
||||
<el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="能源类型" prop="nylx">
|
||||
<el-input v-model.trim="editRowData.nylx" :disabled="true"></el-input>
|
||||
<el-input v-model.trim="editRowData.nylx" :disabled="true"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准实施日期" prop="putTime">
|
||||
<el-date-picker
|
||||
@@ -520,22 +469,22 @@
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="责任部门" prop="zrbm">
|
||||
<el-input v-model.trim="editRowData.zrbm" :disabled="true"></el-input>
|
||||
<el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用产品线" prop="sycpx">
|
||||
<el-input v-model.trim="editRowData.sycpx" :disabled="true"></el-input>
|
||||
<el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
|
||||
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"></el-input>
|
||||
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
|
||||
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"></el-input>
|
||||
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
|
||||
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"></el-input>
|
||||
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
|
||||
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"></el-input>
|
||||
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="demo-drawer-footer">
|
||||
@@ -689,14 +638,7 @@ export default {
|
||||
// 新增、编辑 数据搜索字段
|
||||
sarAccessInfoSearch: {
|
||||
id: '',
|
||||
countryArea: '', // 国家
|
||||
issueTime: '',
|
||||
standName: '',
|
||||
textStatus: '',
|
||||
// applicationScope: '', //适用区域
|
||||
keywords: '', // 关键字
|
||||
detailedListName: '', //清单名称
|
||||
applyArctic: '', // 能源种类
|
||||
askType: '', // 监管类型
|
||||
dataSource: 'INLAND_STAND', // 数据来源
|
||||
page: 1,
|
||||
@@ -706,13 +648,8 @@ export default {
|
||||
},
|
||||
sarAccessInfo: {
|
||||
id: '',
|
||||
issueTime: '',
|
||||
standNumber: '',
|
||||
standName: '',
|
||||
textStatus: '',
|
||||
// applicationScope: '', //适用区域
|
||||
keywords: '', // 关键字
|
||||
detailedListName: '', //清单名称
|
||||
applyArctic: '', // 能源种类
|
||||
askType: '', // 监管类型
|
||||
dataSource: 'INLAND_STAND', // 数据来源
|
||||
page: 1,
|
||||
@@ -1058,15 +995,11 @@ export default {
|
||||
},
|
||||
// 点击清空查询条件 按钮事件
|
||||
clearSearchLaws () {
|
||||
this.sarAccessInfoSearch.advanceSearchVOStr = ''
|
||||
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
|
||||
this.sarAccessInfoSearch.keywords = '' // 关键字
|
||||
this.sarAccessInfoSearch.askType = '' // 监管类型
|
||||
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
|
||||
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
|
||||
this.sarAccessInfoSearch.standName = ''
|
||||
this.sarAccessInfoSearch.putTime = ''
|
||||
this.sarAccessInfoSearch.textStatus = ''
|
||||
this.sarAccessInfo.standName = ''
|
||||
this.sarAccessInfo.standNumber = ''
|
||||
this.isListType = false
|
||||
this.selectLawsStands()
|
||||
},
|
||||
@@ -1433,7 +1366,36 @@ export default {
|
||||
} else {
|
||||
this.sarAccessInfoSearch.standType = 'FOREIGN'
|
||||
}
|
||||
StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
|
||||
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
|
||||
this.sarAccessInfoSearchList = 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
|
||||
}
|
||||
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
|
||||
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
|
||||
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
|
||||
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
|
||||
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
|
||||
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
|
||||
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
|
||||
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
|
||||
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
|
||||
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
|
||||
})
|
||||
this.drawerTotal = res.data.list.length
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
selectBtn() {
|
||||
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
|
||||
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
|
||||
} else {
|
||||
this.sarAccessInfoSearch.standType = 'FOREIGN'
|
||||
}
|
||||
StandardsInfoPage(this.sarAccessInfo).then(res =>{
|
||||
this.sarAccessInfoSearchList = res.data.list
|
||||
this.sarAccessInfoSearchList.forEach(item => {
|
||||
if (item.standYear === null) {
|
||||
@@ -2126,6 +2088,12 @@ export default {
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
.labelBox {
|
||||
/deep/ .el-form-item__label {
|
||||
padding-right: 5px;
|
||||
padding-left: 10px;
|
||||
}
|
||||
}
|
||||
.un-select {
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
+55
-133
@@ -65,40 +65,13 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
|
||||
<el-form-item label="标准名称" class="search-item">
|
||||
<el-input
|
||||
v-model="sarAccessInfoSearch.standName"
|
||||
placeholder="请输入"
|
||||
:maxlength="100"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
|
||||
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
|
||||
<el-option
|
||||
v-for="item in energyKindOptions"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
|
||||
<el-select v-model="sarAccessInfoSearch.askType">
|
||||
<el-option
|
||||
v-for="item in accessSarTypeOptions"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
|
||||
<el-input
|
||||
v-model="sarAccessInfoSearch.detailedListName"
|
||||
placeholder="请输入"
|
||||
:maxlength="100"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
type="primary"
|
||||
@@ -129,52 +102,22 @@
|
||||
</div>
|
||||
<div class="showSelectBox" v-if="!showSelectBox">
|
||||
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
|
||||
<el-form-item label="标准名称" class="search-item">
|
||||
<el-form-item label="标准号" class="labelBox">
|
||||
<el-input
|
||||
v-model="sarAccessInfo.standNumber"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" class="labelBox">
|
||||
<el-input
|
||||
v-model="sarAccessInfo.standName"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="文本状态">
|
||||
<el-select
|
||||
v-model="sarAccessInfo.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="发布日期" >
|
||||
<el-date-picker
|
||||
v-model="sarAccessInfo.issueTime"
|
||||
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-item label="更新时间" v-show="isListType">
|
||||
<el-date-picker
|
||||
v-model="sarAccessInfoSearch.modifyTime"
|
||||
type="date"
|
||||
size="small"
|
||||
value-format="yyyy-MM-DD"
|
||||
placeholder="选择更新日期">
|
||||
</el-date-picker>
|
||||
<el-form-item>
|
||||
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
@@ -263,46 +206,6 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-table
|
||||
v-show="isListType"
|
||||
:data="sarAccessInfoSearchList"
|
||||
style="width: 100%"
|
||||
border
|
||||
height="300px"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="accessSarTypeSelect"
|
||||
ref="accessTypeSelect"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="detailedList"
|
||||
label="清单类别"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="detailedListName"
|
||||
label="清单名称"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="modifyTime"
|
||||
label="更新时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="uname"
|
||||
label="更新人"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
|
||||
@pageSizeChange="drawerPageSizeChange"></pagination>
|
||||
<loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
|
||||
@@ -407,16 +310,6 @@
|
||||
width="210px"
|
||||
align="center"
|
||||
label="责任部门">
|
||||
<template slot-scope="scope">
|
||||
<span
|
||||
v-for="(item, index) in zrbmOptions"
|
||||
:key="index"
|
||||
:value="item.value"
|
||||
v-if="scope.row.value == item.value"
|
||||
>
|
||||
{{ item.label }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
@@ -616,11 +509,7 @@ export default {
|
||||
// 新增、编辑 数据搜索字段
|
||||
sarAccessInfoSearch: {
|
||||
id: '',
|
||||
countryArea: '', // 国家
|
||||
// applicationScope: '', //适用区域
|
||||
keywords: '', // 关键字
|
||||
detailedListName: '', //清单名称
|
||||
applyArctic: '', // 能源种类
|
||||
standName: '',
|
||||
askType: '', // 监管类型
|
||||
dataSource: 'INLAND_STAND', // 数据来源
|
||||
page: 1,
|
||||
@@ -630,13 +519,8 @@ export default {
|
||||
},
|
||||
sarAccessInfo: {
|
||||
id: '',
|
||||
issueTime: '',
|
||||
standName: '',
|
||||
textStatus: '',
|
||||
// applicationScope: '', //适用区域
|
||||
keywords: '', // 关键字
|
||||
detailedListName: '', //清单名称
|
||||
applyArctic: '', // 能源种类
|
||||
standNumber: '',
|
||||
askType: '', // 监管类型
|
||||
dataSource: 'INLAND_STAND', // 数据来源
|
||||
page: 1,
|
||||
@@ -873,6 +757,9 @@ export default {
|
||||
methods: {
|
||||
// 高级检索
|
||||
selectMoreBtn () {
|
||||
this.showSelectBox = !this.showSelectBox
|
||||
this.showTableFlag = false
|
||||
this.selectLawsStands()
|
||||
},
|
||||
// 法规维护人树
|
||||
getDept () {
|
||||
@@ -963,11 +850,10 @@ export default {
|
||||
// 点击清空查询条件 按钮事件
|
||||
clearSearchLaws () {
|
||||
this.sarAccessInfoSearch.standName = ''
|
||||
this.sarAccessInfo.standName = ''
|
||||
this.sarAccessInfo.standNumber = ''
|
||||
this.sarAccessInfoSearch.advanceSearchVOStr = ''
|
||||
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
|
||||
this.sarAccessInfoSearch.keywords = '' // 关键字
|
||||
this.sarAccessInfoSearch.askType = '' // 监管类型
|
||||
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
|
||||
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
|
||||
this.isListType = false
|
||||
this.selectLawsStands()
|
||||
@@ -1301,7 +1187,37 @@ export default {
|
||||
} else {
|
||||
this.sarAccessInfoSearch.standType = 'FOREIGN'
|
||||
}
|
||||
StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
|
||||
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
|
||||
this.sarAccessInfoSearchList = 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
|
||||
}
|
||||
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
|
||||
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
|
||||
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
|
||||
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
|
||||
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
|
||||
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
|
||||
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
|
||||
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
|
||||
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
|
||||
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
|
||||
})
|
||||
this.drawerTotal = res.data.list.length
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
// 高级检索查询按钮
|
||||
selectBtn() {
|
||||
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
|
||||
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
|
||||
} else {
|
||||
this.sarAccessInfoSearch.standType = 'FOREIGN'
|
||||
}
|
||||
StandardsInfoPage(this.sarAccessInfo).then(res =>{
|
||||
this.sarAccessInfoSearchList = res.data.list
|
||||
this.sarAccessInfoSearchList.forEach(item => {
|
||||
if (item.standYear === null) {
|
||||
@@ -2005,6 +1921,12 @@ export default {
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
.labelBox {
|
||||
/deep/ .el-form-item__label {
|
||||
padding-right: 5px;
|
||||
padding-left: 10px;
|
||||
}
|
||||
}
|
||||
.un-select {
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
+50
-81
@@ -72,33 +72,6 @@
|
||||
:maxlength="100"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
|
||||
<el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
|
||||
<el-option
|
||||
v-for="item in energyKindOptions"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
|
||||
<el-select v-model="sarAccessInfoSearch.askType">
|
||||
<el-option
|
||||
v-for="item in accessSarTypeOptions"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
|
||||
<el-input
|
||||
v-model="sarAccessInfoSearch.detailedListName"
|
||||
placeholder="请输入"
|
||||
:maxlength="100"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
type="primary"
|
||||
@@ -129,52 +102,22 @@
|
||||
</div>
|
||||
<div class="showSelectBox" v-if="!showSelectBox">
|
||||
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
|
||||
<el-form-item label="标准名称" class="search-item">
|
||||
<el-form-item label="标准号" class="labelBox">
|
||||
<el-input
|
||||
v-model="sarAccessInfo.standNumber"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" class="labelBox">
|
||||
<el-input
|
||||
v-model="sarAccessInfo.standName"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="文本状态">
|
||||
<el-select
|
||||
v-model="sarAccessInfo.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="发布日期" >
|
||||
<el-date-picker
|
||||
v-model="sarAccessInfo.issueTime"
|
||||
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-item label="更新时间" v-show="isListType">
|
||||
<el-date-picker
|
||||
v-model="sarAccessInfoSearch.modifyTime"
|
||||
type="date"
|
||||
size="small"
|
||||
value-format="yyyy-MM-DD"
|
||||
placeholder="选择更新日期">
|
||||
</el-date-picker>
|
||||
<el-form-item>
|
||||
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
@@ -566,11 +509,7 @@ export default {
|
||||
// 新增、编辑 数据搜索字段
|
||||
sarAccessInfoSearch: {
|
||||
id: '',
|
||||
countryArea: '', // 国家
|
||||
// applicationScope: '', //适用区域
|
||||
keywords: '', // 关键字
|
||||
detailedListName: '', //清单名称
|
||||
applyArctic: '', // 能源种类
|
||||
standName: '',
|
||||
askType: '', // 监管类型
|
||||
dataSource: 'INLAND_STAND', // 数据来源
|
||||
page: 1,
|
||||
@@ -580,13 +519,8 @@ export default {
|
||||
},
|
||||
sarAccessInfo: {
|
||||
id: '',
|
||||
issueTime: '',
|
||||
standName: '',
|
||||
textStatus: '',
|
||||
// applicationScope: '', //适用区域
|
||||
keywords: '', // 关键字
|
||||
detailedListName: '', //清单名称
|
||||
applyArctic: '', // 能源种类
|
||||
standNumber: '',
|
||||
askType: '', // 监管类型
|
||||
dataSource: 'INLAND_STAND', // 数据来源
|
||||
page: 1,
|
||||
@@ -917,11 +851,10 @@ export default {
|
||||
// 点击清空查询条件 按钮事件
|
||||
clearSearchLaws () {
|
||||
this.sarAccessInfoSearch.standName = ''
|
||||
this.sarAccessInfo.standName = ''
|
||||
this.sarAccessInfo.standNumber = ''
|
||||
this.sarAccessInfoSearch.advanceSearchVOStr = ''
|
||||
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
|
||||
this.sarAccessInfoSearch.keywords = '' // 关键字
|
||||
this.sarAccessInfoSearch.askType = '' // 监管类型
|
||||
this.sarAccessInfoSearch.detailedListName = '' // 清单名称
|
||||
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
|
||||
this.isListType = false
|
||||
this.selectLawsStands()
|
||||
@@ -1278,6 +1211,36 @@ export default {
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
/** 高级查询查询按钮*/
|
||||
selectBtn() {
|
||||
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
|
||||
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
|
||||
} else {
|
||||
this.sarAccessInfoSearch.standType = 'FOREIGN'
|
||||
}
|
||||
StandardsInfoPage(this.sarAccessInfo).then(res =>{
|
||||
this.sarAccessInfoSearchList = 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
|
||||
}
|
||||
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
|
||||
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
|
||||
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
|
||||
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
|
||||
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
|
||||
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
|
||||
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
|
||||
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
|
||||
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
|
||||
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
|
||||
})
|
||||
this.drawerTotal = res.data.list.length
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
// 数据搜索table判断checked状态
|
||||
selectable (row) {
|
||||
return row.isRelateAccess === '1'
|
||||
@@ -1973,6 +1936,12 @@ export default {
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
.labelBox {
|
||||
/deep/ .el-form-item__label {
|
||||
padding-right: 5px;
|
||||
padding-left: 10px;
|
||||
}
|
||||
}
|
||||
.un-select {
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user