@@ -2148,8 +2191,10 @@ export default { modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, url: '', urlChild: '', + modelType: 'TRUCK', drawerTitle: '', //drawer标题 nodeKey: 'id', nodeKeyCode: 'code', @@ -2252,6 +2297,7 @@ export default { defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], + defaultCheckedKeys4: [], defaultCodeProps: { children: 'children', label: 'code' @@ -2438,6 +2484,8 @@ export default { KCCVPPSCN: '', DYBXH: '', DYMC: '', + DYBXHCAR: '', + DYMCCAR: '', CYSD: '', CLLX: '', NYLX: '', @@ -2577,6 +2625,8 @@ export default { KCCVPPSCN: '', DYBXH: '', DYMC: '', + DYBXHCAR: '', + DYMCCAR: '', CYSD: '', CLLX: '', NYLX: '', @@ -3053,7 +3103,17 @@ export default { this.modalShowFlag4 = true this.url = '' this.urlChild = '' - this.url = "sarModelTree/list" + this.modelType = type + this.url = "sarModelTree/listByType" + this.urlChild = "sarModelTree/childByList" + }, + choiceZRR5(type, title, id) { + this.drawerTitle = title + this.modalShowFlag5 = true + this.url = '' + this.urlChild = '' + this.modelType = type + this.url = "sarModelTree/listByType" this.urlChild = "sarModelTree/childByList" }, popoverHideQuery(ids, attrField) { @@ -3122,6 +3182,22 @@ export default { popoverHideModelCancel() { this.modalShowFlag4 = false }, + popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.sarStandardsInfoEO.DYBXHCAR = checkedData.map(item => item.model).join(",") + this.sarStandardsInfoEO.DYMCCAR = checkedData.map(item => item.name).join(",") + } else { + this.sarStandardsInfoEO.DYBXHCAR = checkedData.model + this.sarStandardsInfoEO.DYMCCAR = checkedData.name + } + this.modalShowFlag5 = false + } + this.$forceUpdate() + }, + popoverCarHideModelCancel() { + this.modalShowFlag5 = false + }, busVsFunc() { this.$http.get('sarVppsTree/list', '', { _this: this diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 93b18b308..aaf0eb6cd 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -659,14 +659,14 @@
@@ -1816,14 +1861,17 @@ export default { modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, url: '', urlChild: '', + modelType: 'TRUCK', drawerTitle: '', //drawer标题 nodeKey: 'id', defaultCheckedKeys: [], defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], + defaultCheckedKeys4: [], defaultCodeProps: { children: 'children', label: 'code' @@ -2168,6 +2216,8 @@ export default { KCCVPPSCN: '', DYBXH: '', DYMC: '', + DYBXHCAR: '', + DYMCCAR: '', CYSD: '', CLLX: '', NYLX: '', @@ -2593,7 +2643,17 @@ export default { this.modalShowFlag4 = true this.url = '' this.urlChild = '' - this.url = "sarModelTree/list" + this.modelType = type + this.url = "sarModelTree/listByType" + this.urlChild = "sarModelTree/childByList" + }, + choiceZRR5(type, title, id) { + this.drawerTitle = title + this.modalShowFlag5 = true + this.url = '' + this.urlChild = '' + this.modelType = type + this.url = "sarModelTree/listByType" this.urlChild = "sarModelTree/childByList" }, popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) { @@ -2642,6 +2702,22 @@ export default { }, popoverHideModelCancel() { this.modalShowFlag4 = false }, + popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.sarStandardsInfoEO.DYBXHCAR = checkedData.map(item => item.model).join(",") + this.sarStandardsInfoEO.DYMCCAR = checkedData.map(item => item.name).join(",") + } else { + this.sarStandardsInfoEO.DYBXHCAR = checkedData.model + this.sarStandardsInfoEO.DYMCCAR = checkedData.name + } + this.modalShowFlag5 = false + } + this.$forceUpdate() + }, + popoverCarHideModelCancel() { + this.modalShowFlag5 = false + }, // 将文本状态的id与name对应 setMap(data) { data.forEach(item => { diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 7491402a7..48e4d737f 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -401,10 +401,10 @@ label: '海外标准法规', // value没改 value: 'bussstand' }, - // { - // label: '国内外政策', - // value: 'laws' - // }, + { + label: '国内外政策', + value: 'laws' + }, { label: '企业标准', value: 'enterprise' @@ -433,10 +433,10 @@ label: '海外标准法规', // value没改 value: 'bussstand' }, - // { - // label: '国内外政策', - // value: 'laws' - // }, + { + label: '国内外政策', + value: 'laws' + }, { label: '企业标准', value: 'enterprise'