diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 8a08b8c81..234c29962 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -654,7 +654,7 @@
+ @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.CYCVPPSBMBUSS,true)">
@@ -697,17 +697,38 @@
label-width="150px"
class="add-form-item"
>
- 模块结构单元变型号
+ 模块结构单元变型号(卡车)
+ v-model="sarBussionessStandEO.DYBXHBUSS" placeholder="选择模块结构单元变型号(卡车)"
+ @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', sarBussionessStandEO.dybxh)">
-
+
+
+
+
+
+ 模块结构单元变型号(乘用车)
+
+
+
+
+
+
+
@@ -1590,6 +1611,19 @@
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
@popoverHideCancel="popoverHideModelCancel()">
+
@@ -2247,6 +2281,7 @@ export default {
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
+ defaultCheckedKeys4: [],
defaultCodeProps: {
children: 'children',
label: 'code'
@@ -2374,9 +2409,11 @@ export default {
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
+ modalShowFlag5: false, // drawer开关
type: '',
url: '',
urlChild: '',
+ modelType:'',
}
},
methods: {
@@ -2595,15 +2632,13 @@ export default {
if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
- } else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
- }
+ }
} else {
if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.code
this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.chineseName
- } else {
this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
}
@@ -2645,6 +2680,22 @@ export default {
popoverHideModelCancel() {
this.modalShowFlag4 = false
},
+ popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ if (checkedData && checkedData.length != 0) {
+ if (checkedData.length > 0) {
+ this.sarBussionessStandEO.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+ this.sarBussionessStandEO.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+ } else {
+ this.sarBussionessStandEO.CYCDYBXHBUSS = checkedData.model
+ this.sarBussionessStandEO.CYCDYMCBUSS = checkedData.name
+ }
+ this.modalShowFlag5 = false
+ }
+ this.$forceUpdate()
+ },
+ popoverCarHideModelCancel() {
+ this.modalShowFlag5 = false
+ },
popoverHideCancel() {
this.modalShowFlag1 = false
},
@@ -2692,9 +2743,19 @@ export default {
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
+ this.modelType = type
this.url = "sarModelTree/list"
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"
+ },
choiceZRR1(type, title, id) {
this.drawerTitle1 = title
this.modalShowFlag1 = true