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

This commit is contained in:
396572590@qq.com
2022-06-27 15:56:12 +08:00
@@ -2267,6 +2267,7 @@ export default {
bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
this.form.textStatus = this.form.textStatus === 'jjxoynfepp' ? '' : this.form.textStatus
this.getListTree(bringData)
this.form.standId = bringData.id
if (this.form.country) {
@@ -3475,7 +3476,13 @@ export default {
this.countryOptions = res.data.COUNTRY//国家地区
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
const standOptions = []
res.data.WBZTCLASS.forEach(item=>{
if( item.label === '草案' || item.label === '征求意见' || item.label === '送审' || item.label === '报批' || item.label === '发布'){
standOptions.push(item)
}
})
this.standStateOptions = standOptions // 文本状态
this.standSystemOptions = res.data.BZTXCLASS // 标准体系
this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
this.categoryOptions.options = res.data.NYLXCLASS // 能源类型