diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue
new file mode 100644
index 000000000..1ac8eb973
--- /dev/null
+++ b/src/components/treeSelect/treeSelectNew.vue
@@ -0,0 +1,270 @@
+
+
{{ sarStandardsInfoEO.issueTime || '-' }}
{{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'}}
-{{ sarStandardsInfoEO.standSystemName || '-' }}
+{{ sarStandardsInfoEO.standSystem || '-' }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index aa58f9b7b..5808ce1f2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -122,12 +122,17 @@
@@ -1234,6 +1256,7 @@ import Bus from '@/common/eventHub'
import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePickerWithText2'
import { interfaceUrl } from '@/sysConfig'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
export default {
name: 'domesticStandardsAndRegulations',
@@ -1254,7 +1277,8 @@ export default {
CustomSVPPS,
CustomRoleTree,
CustomDatePickWithText2,
- TreeSelect
+ TreeSelect,
+ TreeSelectNew
},
data () {
return {
@@ -1267,6 +1291,13 @@ export default {
children: 'children',
label: 'menuName'
},
+ modalShowFlag1: false, // drawer开关
+ modalShowFlag2: false, // drawer开关
+ modalShowFlag3: false, // drawer开关
+ modalShowFlag4: false, // drawer开关
+ url:'',
+ urlChild:'',
+ drawerTitle: '', //drawer标题
nodeKey: 'id',
nodeKeyCode: 'code',
nodeKeyModel: 'model',
@@ -1903,27 +1934,83 @@ export default {
}
},
methods: {
- popoverHideBusVs (checkedIds, checkedData) {
- if(checkedData){
- this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
- this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
- this.$forceUpdate()
- }
+ choiceZRR1 (type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag1 = true
},
- popoverHideCarVs (checkedIds, checkedData) {
- if(checkedData){
- this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
- this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
- this.$forceUpdate()
- }
-
+ choiceZRR2 (type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag2 = true
+ this.url = ''
+ this.urlChild = ''
+ this.url="sarVppsTree/list"
+ this.urlChild="sarVppsTree/childByList"
},
- popoverHideModel (checkedIds, checkedData) {
- if(checkedData){
- this.sarStandardsInfoEO.DYBXH = checkedData.model
- this.sarStandardsInfoEO.DYMC = checkedData.name
- this.$forceUpdate()
+ choiceZRR3 (type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag3 = true
+ this.url = ''
+ this.urlChild = ''
+ this.url="sarVppsTree/list"
+ this.urlChild="sarVppsTree/childByList"
+ },
+ choiceZRR4 (type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag4 = true
+ this.url = ''
+ this.urlChild = ''
+ this.url="sarModelTree/list"
+ this.urlChild="sarModelTree/childByList"
+ },
+ popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
+ if(checkedData) {
+ if(checkedData.length > 0){
+ this.sarStandardsInfoEO.standSystem = checkedData.map(item => item.menuName).join(",")
+ }else {
+ this.sarStandardsInfoEO.standSystem = checkedData.menuName
+ }
}
+ this.modalShowFlag1 = false
+ this.$forceUpdate()
+ },
+ popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+ if(checkedData) {
+ if(checkedData.length > 0){
+ this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",")
+ this.sarStandardsInfoEO.CYCVPPSCN = checkedData.map(item => item.chineseName).join(",")
+ }else {
+ this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
+ this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
+ }
+ }
+ this.modalShowFlag2 = false
+ this.$forceUpdate()
+ },
+ popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+ if(checkedData) {
+ if(checkedData.length > 0){
+ this.sarStandardsInfoEO.KCCVPPSBM = checkedData.map(item => item.code).join(",")
+ this.sarStandardsInfoEO.KCCVPPSCN = checkedData.map(item => item.chineseName).join(",")
+ }else {
+ this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
+ this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
+ }
+ }
+ this.modalShowFlag3 = false
+ this.$forceUpdate()
+ },
+ popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
+ if(checkedData) {
+ if(checkedData.length > 0){
+ this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
+ this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",")
+ }else {
+ this.sarStandardsInfoEO.DYBXH = checkedData.model
+ this.sarStandardsInfoEO.DYMC = checkedData.name
+ }
+ }
+ this.modalShowFlag4 = false
+ this.$forceUpdate()
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
@@ -1939,11 +2026,6 @@ export default {
this.modelOptions = res.data
})
},
- popoverHide (checkedIds, checkedData) {
- if(checkedData){
- this.sarStandardsInfoEO.standSystem = checkedData.id
- }
- },
closeModal () {
this.productModal = false
this.closeDrawer()
@@ -4259,7 +4341,6 @@ export default {
this.syzrOptions = res.data.SYRZCLASS // 适用认证
this.getGzzOption()
this.setMap(this.standStateOptions)
- console.log(this.standStateOptions, '文本状态')
}, e => {
})
this.getDomesticStandardTable(this.tableFlag)
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 83d499022..de88520c0 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -510,12 +510,7 @@
class="add-form-item"
>
乘用车VPPS编码
-
@@ -1078,6 +1094,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import CustomDatePickWithText2 from '@/components/CustomFormComponents/DatePickerWithText2' import { interfaceUrl } from "@/sysConfig"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; +import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; export default { name: 'foreignStandardsAndRegulations', @@ -1098,7 +1115,8 @@ export default { CustomSVPPS, CustomRoleTree, CustomDatePickWithText2, - TreeSelect + TreeSelect, + TreeSelectNew }, data () { return { @@ -1114,6 +1132,13 @@ export default { }, nodeKeyCode: 'code', nodeKeyModel: 'model', + modalShowFlag1: false, // drawer开关 + modalShowFlag2: false, // drawer开关 + modalShowFlag3: false, // drawer开关 + modalShowFlag4: false, // drawer开关 + url:'', + urlChild:'', + drawerTitle: '', //drawer标题 nodeKey: 'id', defaultCheckedKeys1: [], defaultCheckedKeys2: [], @@ -1722,6 +1747,71 @@ export default { watch: { }, methods: { + choiceZRR2 (type, title, id) { + this.drawerTitle = title + this.modalShowFlag2 = true + this.url = '' + this.urlChild = '' + this.url="sarVppsTree/list" + this.urlChild="sarVppsTree/childByList" + }, + choiceZRR3 (type, title, id) { + this.drawerTitle = title + this.modalShowFlag3 = true + this.url = '' + this.urlChild = '' + this.url="sarVppsTree/list" + this.urlChild="sarVppsTree/childByList" + }, + choiceZRR4 (type, title, id) { + this.drawerTitle = title + this.modalShowFlag4 = true + this.url = '' + this.urlChild = '' + this.url="sarModelTree/list" + this.urlChild="sarModelTree/childByList" + }, + popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + console.log(checkedData) + debugger + if(checkedData) { + if(checkedData.length > 0){ + this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",") + this.sarStandardsInfoEO.CYCVPPSCN = checkedData.map(item => item.chineseName).join(",") + }else { + this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code + this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName + } + } + this.modalShowFlag2 = false + this.$forceUpdate() + }, + popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.sarStandardsInfoEO.KCCVPPSBM = checkedData.map(item => item.code).join(",") + this.sarStandardsInfoEO.KCCVPPSCN = checkedData.map(item => item.chineseName).join(",") + }else { + this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code + this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName + } + } + this.modalShowFlag3 = false + this.$forceUpdate() + }, + popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",") + this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",") + }else { + this.sarStandardsInfoEO.DYBXH = checkedData.model + this.sarStandardsInfoEO.DYMC = checkedData.name + } + } + this.modalShowFlag4 = false + this.$forceUpdate() + }, // 将文本状态的id与name对应 setMap(data){ data.forEach(item => { @@ -1729,28 +1819,6 @@ export default { }) console.log(this.textStatusMap, '文本状态的值') }, - popoverHideBusVs (checkedIds, checkedData) { - if(checkedData){ - this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code - this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName - this.$forceUpdate() - } - }, - popoverHideCarVs (checkedIds, checkedData) { - if(checkedData){ - this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code - this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName - this.$forceUpdate() - } - - }, - popoverHideModel (checkedIds, checkedData) { - if(checkedData){ - this.sarStandardsInfoEO.DYBXH = checkedData.model - this.sarStandardsInfoEO.DYMC = checkedData.name - this.$forceUpdate() - } - }, busVsFunc(){ this.$http.get('sarVppsTree/list', '', { _this: this