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 @@ + + + + + diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index e50a50927..0d47b1ac6 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -56,7 +56,7 @@

{{ 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 @@ - + + :nodeKey="nodeKey" @popoverHide="popoverHide"> - + + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> - + + :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"> - + + :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> { this.treeData = res.data @@ -1889,29 +1953,51 @@ this.fileMadel = true this.fileType = type; }, - popoverHide (checkedIds, checkedData) { + popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { - this.form.standSystem = checkedData.id - this.form.standSystemName = checkedData.menuName + if(checkedData.length > 0){ + this.form.standSystem = checkedData.map(item => item.menuName).join(",") + }else { + this.form.standSystem = checkedData.menuName + } } + this.modalShowFlag1 = false }, - popoverHideBusVs (checkedIds, checkedData) { - if(checkedData){ - this.form.cycvppsbm = checkedData.code - this.form.cycvppscn = checkedData.chineseName + popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.form.cycvppsbm = checkedData.map(item => item.code).join(",") + this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",") + }else { + this.form.cycvppsbm = checkedData.code + this.form.cycvppscn = checkedData.chineseName + } } + this.modalShowFlag2 = false }, - popoverHideCarVs (checkedIds, checkedData) { - if(checkedData){ - this.form.kccvppsbm = checkedData.code - this.form.kccvppscn = checkedData.chineseName + popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.form.kccvppsbm = checkedData.map(item => item.code).join(",") + this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",") + }else { + this.form.kccvppsbm = checkedData.code + this.form.kccvppscn = checkedData.chineseName + } } + this.modalShowFlag3 = false }, - popoverHideModel (checkedIds, checkedData) { - if(checkedData){ - this.form.dybxh = checkedData.model - this.form.dymc = checkedData.name + popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.form.dybxh = checkedData.map(item => item.model).join(",") + this.form.dymc = checkedData.map(item => item.name).join(",") + }else { + this.form.dybxh = checkedData.model + this.form.dymc = checkedData.name + } } + this.modalShowFlag4 = false }, closeDrawer() { this.ListModel = false @@ -2006,6 +2092,14 @@ this.busVppsOptions = res.data }) }, + busVsChildFunc(id){ + this.$http.get('sarVppsTree/childByList', {id:id}, { + _this: this + }, res => { + this.busVppsChildOptions = [] + this.busVppsChildOptions = res.data + }) + }, modelFunc(){ this.$http.get('sarModelTree/list', '', { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 9d3675641..3eb2cc962 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -119,13 +119,7 @@ - + - + - + - + - + - + - + - + - + + :nodeKey="nodeKey" @popoverHide="popoverHide"> - + + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> - + + :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"> - + + :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> 0){ + this.form.standSystem = checkedData.map(item => item.menuName).join(",") + }else { + this.form.standSystem = checkedData.menuName + } } + this.modalShowFlag1 = false }, - popoverHideBusVs (checkedIds, checkedData) { - if(checkedData){ - this.form.cycvppsbm = checkedData.code - this.form.cycvppscn = checkedData.chineseName + popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.form.cycvppsbm = checkedData.map(item => item.code).join(",") + this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",") + }else { + this.form.cycvppsbm = checkedData.code + this.form.cycvppscn = checkedData.chineseName + } } + this.modalShowFlag2 = false }, - popoverHideCarVs (checkedIds, checkedData) { - if(checkedData){ - this.form.kccvppsbm = checkedData.code - this.form.kccvppscn = checkedData.chineseName + popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.form.kccvppsbm = checkedData.map(item => item.code).join(",") + this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",") + }else { + this.form.kccvppsbm = checkedData.code + this.form.kccvppscn = checkedData.chineseName + } } + this.modalShowFlag3 = false }, - popoverHideModel (checkedIds, checkedData) { - if(checkedData){ - this.form.dybxh = checkedData.model - this.form.dymc = checkedData.name + popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.form.dybxh = checkedData.map(item => item.model).join(",") + this.form.dymc = checkedData.map(item => item.name).join(",") + }else { + this.form.dybxh = checkedData.model + this.form.dymc = checkedData.name + } } + this.modalShowFlag4 = false }, processTable () { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 230417fee..fd1aa542f 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -267,6 +267,7 @@ :wrapperClosable="false" size="800px" @close="resetForm" + append-to-body >
@@ -397,11 +398,7 @@ class="add-form-item" > - +