diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 2c814c55c..552f1d6e2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -270,8 +270,8 @@ > - - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index daba0ee7c..c4f2c1f6b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -164,6 +164,7 @@ @formChoiceZRR2 = "formChoiceZRR2" @formChoiceZRR3 = "formChoiceZRR3" @formChoiceZRR4 = "formChoiceZRR4" + @formChoiceZRR5 = "formChoiceZRR5" />
@@ -690,7 +691,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" + @popoverHideCancel="popoverHideBusVsCancel"> + + + 正在加载数据
@@ -714,6 +755,7 @@ import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList,evaluationHisListRepSum,evaluationHisListRep} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; + import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; let Base64 = require('js-base64').Base64; export default { @@ -724,7 +766,8 @@ ProcessFooter, ProcessTitle, TreeSelect, - TreeSelectNew + TreeSelectNew, + TreeSelectModule }, data () { const validateZrUserIdName = (rule, value, callback) => { @@ -916,10 +959,12 @@ modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 drawerTitle1:'', multipleFlag2:'', url:'', urlChild:'', + modelType: '', drawerModal: false, drawerTitle: '', //drawer标题 showCheckBox: true, // 树形控件是否展示多选框 @@ -930,6 +975,7 @@ defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], + defaultCheckedKeys4: [], fileUrl: 'api/att/attFile/upload', fileMadel: false, fileType: '', @@ -987,6 +1033,8 @@ CYCVPPSCNBUSS: '', DYBXHBUSS: '', DYMCBUSS: '', + CYCDYBXHBUSS: '', + CYCDYMCBUSS: '', // 关联信息 DTQBBHBUSS: '', BDTQBBHBUSS: '', @@ -1404,6 +1452,9 @@ formChoiceZRR4(type, title, id){ this.choiceZRR4(type, title, id) }, + formChoiceZRR5(type, title, id){ + this.choiceZRR5(type, title, id) + }, formChoiceQCDW(type, title, id){ this.choiceQCDW(type, title, id) }, @@ -2023,9 +2074,19 @@ 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" + }, getTree () { this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { @@ -2380,19 +2441,6 @@ default : ; } }, - popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",") - this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") - }else { - this.form.VPPSBMBUSS = checkedData.code - this.form.VPPSCNBUSS = checkedData.chineseName - } - } - this.modalShowFlag2 = false - this.$forceUpdate() - }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { if(checkedData.length > 0){ @@ -2408,53 +2456,81 @@ this.modalShowFlag1 = false }, popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData && checkedData.length != 0) { - if(checkedData.length > 0 && 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 + if (checkedData && checkedData.length !== 0) { + if (checkedData.length > 0) { + this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") + } else { + this.form.CYCVPPSBMBUSS = checkedData.code + this.form.CYCVPPSCNBUSS = checkedData.chineseName } - this.modalShowFlag2 = false + }else { + this.form.CYCVPPSBMBUSS = '' + this.form.CYCVPPSCNBUSS = '' } - + this.modalShowFlag2 = false + this.$forceUpdate() }, popoverHideBusVsCancel(){ this.modalShowFlag2 = false }, popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData && checkedData.length != 0) { - 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 + if (checkedData && checkedData.length !== 0) { + if (checkedData.length > 0) { + this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") + } else { + this.form.KCVPPSBMBUSS = checkedData.code + this.form.KCVPPSCNBUSS = checkedData.chineseName } - this.modalShowFlag3 = false - + }else { + this.form.KCVPPSBMBUSS = '' + this.form.KCVPPSCNBUSS = '' } + this.modalShowFlag3 = false + this.$forceUpdate() }, popoverHideCarVsCancel(){ this.modalShowFlag3 = false }, popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData && checkedData.length != 0) { - 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 + if (checkedData && checkedData.length !== 0) { + if (checkedData.length > 0) { + this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",") + this.form.DYMCBUSS = checkedData.map(item => item.name).join(",") + } else { + this.form.DYBXHBUSS = checkedData.model + this.form.DYMCBUSS = checkedData.name } - this.modalShowFlag4 = false + }else { + this.form.DYBXHBUSS = '' + this.form.DYMCBUSS = '' } - + this.modalShowFlag4 = false + this.$forceUpdate() }, popoverHideModelCancel(){ this.modalShowFlag4 = false }, + popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData && checkedData.length !== 0) { + if (checkedData.length > 0) { + this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",") + this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",") + } else { + this.form.CYCDYBXHBUSS = checkedData.model + this.form.CYCDYMCBUSS = checkedData.name + } + this.modalShowFlag5 = false + }else { + this.form.CYCDYBXHBUSS = '' + this.form.CYCDYMCBUSS = '' + } + this.$forceUpdate() + }, + popoverCarHideModelCancel() { + this.modalShowFlag5 = false + }, closeDrawer() { this.ListModel = false },