diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 784622707..0a5c556e9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -270,14 +270,17 @@ > - - + + - + - - + + + + + @@ -320,8 +323,11 @@ - - + + + + + @@ -798,6 +804,10 @@ export default { this.$emit('formChoiceZRR4',type,title,id) }, + choiceZRR5(type, title, id) { + this.$emit('formChoiceZRR5',type,title,id) + }, + choiceQCDW(type, title, id) { this.$emit('formChoiceQCDW',type,title,id) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index 1d81ef1d3..a13f3a1a7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -183,9 +183,12 @@ - + + + + @@ -220,9 +223,12 @@ - + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue index 5da7364f7..403cb5269 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue @@ -194,9 +194,12 @@ - + + + + @@ -231,9 +234,12 @@ - + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 6ca3a714e..3402f60bc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -269,13 +269,16 @@ - + - + - - + + + + + @@ -319,8 +322,11 @@ - - + + + + + @@ -1087,6 +1093,19 @@ :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel()"> + @@ -1312,10 +1331,12 @@ modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 drawerTitle1:'', multipleFlag2:'', url:'', urlChild:'', + modelType:'', drawerTitle: '', //drawer标题 showCheckBox: true, // 树形控件是否展示多选框 nodeKey: 'id', @@ -1325,6 +1346,7 @@ defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], + defaultCheckedKeys4: [], fileUrl: 'api/att/attFile/upload', fileMadel: false, fileType: '', @@ -2266,9 +2288,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=> { @@ -2598,19 +2630,6 @@ // } }, - 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) { @@ -2634,19 +2653,6 @@ popoverHideCancel(){ 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 - } - this.modalShowFlag2 = false - } - - }, popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { if (checkedData && checkedData.length != 0) { if (checkedData.length > 0) { @@ -2705,6 +2711,22 @@ 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 + } + this.$forceUpdate() + }, + popoverCarHideModelCancel() { + this.modalShowFlag5 = false + }, closeDrawer() { this.ListModel = false }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 816190dda..884c8216b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -42,6 +42,7 @@ @formChoiceZRR2 = "formChoiceZRR2" @formChoiceZRR3 = "formChoiceZRR3" @formChoiceZRR4 = "formChoiceZRR4" + @formChoiceZRR5 = "formChoiceZRR5" />
@@ -569,16 +570,56 @@ :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" + @popoverHideCancel="popoverHideBusVsCancel"> + + + 正在加载数据
@@ -591,6 +632,7 @@ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} 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 { @@ -601,7 +643,8 @@ ProcessFooter, ProcessTitle, TreeSelect, - TreeSelectNew + TreeSelectNew, + TreeSelectModule }, data () { const validateZrUserIdName = (rule, value, callback) => { @@ -791,7 +834,9 @@ modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 drawerTitle1:'', + modelType:'', multipleFlag2:'', url:'', urlChild:'', @@ -804,6 +849,7 @@ defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], + defaultCheckedKeys4: [], fileUrl: 'api/att/attFile/upload', fileMadel: false, fileType: '', @@ -1125,6 +1171,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) }, @@ -1747,9 +1796,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=> { @@ -2121,19 +2180,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) { @@ -2157,53 +2203,79 @@ 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 + console.log(checkedData) + 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 + } + this.$forceUpdate() + }, + popoverCarHideModelCancel() { + this.modalShowFlag5 = false + }, closeDrawer() { this.ListModel = false }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index e5362af54..84a552ce1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -43,6 +43,7 @@ @formChoiceZRR2 = "formChoiceZRR2" @formChoiceZRR3 = "formChoiceZRR3" @formChoiceZRR4 = "formChoiceZRR4" + @formChoiceZRR5 = "formChoiceZRR5" />
@@ -570,16 +571,56 @@ :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" + @popoverHideCancel="popoverHideBusVsCancel"> + + + 正在加载数据
@@ -592,6 +633,7 @@ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList} 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 { @@ -602,7 +644,8 @@ ProcessFooter, ProcessTitle, TreeSelect, - TreeSelectNew + TreeSelectNew, + TreeSelectModule }, data () { const validateZrUserIdName = (rule, value, callback) => { @@ -792,7 +835,9 @@ modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 drawerTitle1:'', + modelType:'', multipleFlag2:'', url:'', urlChild:'', @@ -805,6 +850,7 @@ defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], + defaultCheckedKeys4: [], fileUrl: 'api/att/attFile/upload', fileMadel: false, fileType: '', @@ -1129,6 +1175,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) }, @@ -1751,9 +1800,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=> { @@ -2144,53 +2203,79 @@ 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 + console.log(checkedData) + 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 + } + this.$forceUpdate() + }, + popoverCarHideModelCancel() { + this.modalShowFlag5 = false + }, closeDrawer() { this.ListModel = false }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 65de23ecb..d95000645 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -39,6 +39,7 @@ @formChoiceZRR2 = "formChoiceZRR2" @formChoiceZRR3 = "formChoiceZRR3" @formChoiceZRR4 = "formChoiceZRR4" + @formChoiceZRR5 = "formChoiceZRR5" /> @@ -608,22 +609,62 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" + @popoverHideCancel="popoverHideBusVsCancel"> + + + 正在加载数据 @@ -637,6 +678,7 @@ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} 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 { @@ -647,7 +689,8 @@ ProcessTitle, TreeSelect, TreeSelectNew, - formEditList + formEditList, + TreeSelectModule }, data () { const validateZrUserIdName = (rule, value, callback) => { @@ -838,8 +881,10 @@ modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 drawerTitle1:'', multipleFlag2:'', + modelType:'', url:'', urlChild:'', drawerTitle: '', //drawer标题 @@ -851,6 +896,7 @@ defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], + defaultCheckedKeys4: [], fileUrl: 'api/att/attFile/upload', fileMadel: false, fileType: '', @@ -1167,6 +1213,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) }, @@ -1801,9 +1850,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=> { @@ -2184,53 +2243,79 @@ 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 + console.log(checkedData) + 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 + } + this.$forceUpdate() + }, + popoverCarHideModelCancel() { + this.modalShowFlag5 = false + }, closeDrawer() { this.ListModel = false }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 1838ff59b..e43d77781 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -168,6 +168,7 @@ @formChoiceZRR2 = "formChoiceZRR2" @formChoiceZRR3 = "formChoiceZRR3" @formChoiceZRR4 = "formChoiceZRR4" + @formChoiceZRR5 = "formChoiceZRR5" /> @@ -817,16 +818,56 @@ :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" + @popoverHideCancel="popoverHideBusVsCancel"> + + + 正在加载数据 @@ -840,6 +881,7 @@ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; + import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import {getEvaluationIndex} from "api/businessApi"; let Base64 = require('js-base64').Base64; @@ -851,7 +893,8 @@ ProcessTitle, TreeSelect, TreeSelectNew, - formEditList + formEditList, + TreeSelectModule }, filters: { ellipsis (value) { @@ -1071,7 +1114,9 @@ modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 drawerTitle1:'', + modelType:'', multipleFlag2:'', url:'', urlChild:'', @@ -1084,6 +1129,7 @@ defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], + defaultCheckedKeys4: [], fileUrl: 'api/att/attFile/upload', fileMadel: false, fileType: '', @@ -1516,6 +1562,9 @@ formChoiceZRR4(type, title, id){ this.choiceZRR4(type, title, id) }, + formChoiceZRR5(type, title, id){ + this.choiceZRR5(type, title, id) + }, formChoiceZRRListCancel(type, title, id){ this.choiceZRRList(type, title, id) }, @@ -2148,9 +2197,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=> { @@ -2505,19 +2564,6 @@ } this.formKey++ }, - 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) { @@ -2541,53 +2587,79 @@ 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 + console.log(checkedData) + 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 + } + this.$forceUpdate() + }, + popoverCarHideModelCancel() { + this.modalShowFlag5 = false + }, closeDrawer() { this.ListModel = false }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 8b05dea70..16fb96cd9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -39,6 +39,7 @@ @formChoiceZRR2 = "formChoiceZRR2" @formChoiceZRR3 = "formChoiceZRR3" @formChoiceZRR4 = "formChoiceZRR4" + @formChoiceZRR5 = "formChoiceZRR5" /> @@ -608,22 +609,62 @@ :multiple=false :lazy=false :modalShowFlag="modalShowFlag1" - :drawerTitle="drawerTitle1" + :drawerTitle="drawerTitle" width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" + @popoverHideCancel="popoverHideBusVsCancel"> + + + 正在加载数据 @@ -637,6 +678,7 @@ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} 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 { @@ -647,7 +689,8 @@ ProcessTitle, TreeSelect, TreeSelectNew, - formEditList + formEditList, + TreeSelectModule }, data () { const validateZrUserIdName = (rule, value, callback) => { @@ -703,9 +746,9 @@ } }] }, - taskInfo:'重新企标编写汇总', - loading: false, + taskInfo:'企标编写汇总', dataLoading: true, + loading: false, disabledState: false, userId:this.$store.getters.userInfo.userId, taskIds: this.$route.query.taskIds, @@ -838,8 +881,10 @@ modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 drawerTitle1:'', multipleFlag2:'', + modelType:'', url:'', urlChild:'', drawerTitle: '', //drawer标题 @@ -851,6 +896,7 @@ defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], + defaultCheckedKeys4: [], fileUrl: 'api/att/attFile/upload', fileMadel: false, fileType: '', @@ -1037,9 +1083,6 @@ QCRBUSS: [ { required: true, message: '请选择起草人', trigger: 'change' } ], - DTQBBHBUSS: [ - { required: true, message: '请选择代替企标编号', trigger: 'change' } - ], }, zrUserIds: [], // 选择多个会签责任人 userType:'', // 选择用户ID判断 @@ -1170,6 +1213,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) }, @@ -1804,9 +1850,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=> { @@ -2187,53 +2243,79 @@ 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 + console.log(checkedData) + 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 + } + this.$forceUpdate() + }, + popoverCarHideModelCancel() { + this.modalShowFlag5 = false + }, closeDrawer() { this.ListModel = false }, @@ -2519,7 +2601,6 @@ this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id - this.formKey++ }) }, assemble(ids,names){ @@ -2593,43 +2674,21 @@ }) }) }, + getDicTypeListCode(res,json) { + return new Promise((resolve, reject) => { + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, }, mounted () { this.getTaskId() this.getData() this.processTable() - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.countryOptions = res.data.COUNTRY - this.applyCountryOptions = res.data.COUNTRY - this.regionOptions = res.data.REGION // 区域 - this.standStateOptions = res.data.BUSSSTATE - this.energyKindOptions = res.data.ENERGYTYPES - this.standGeneraOptions = res.data.BUSSBIGCLASS - this.standSubclassOptions = res.data.BUSSFINECLASS - this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态 - this.standSystemOptions = res.data.TXLBBUSS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.qcdwOptions = res.data.QCDW // 起草单位 - this.qcrOptions = res.data.QCRBUSS // 起草人 - this.nylxOptions = res.data.NYLXCLASS // 能源类型 - this.syrzOptions = res.data.SYRZCLASS // 适用认证 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 - this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 - this.setMap(this.standStateOptions) - }) - this.busVsFunc() - this.modelFunc() } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index d0a3799bc..6f94a0d9c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -2,7 +2,7 @@ - +
评审评分
@@ -82,7 +82,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -168,6 +168,7 @@ @formChoiceZRR2 = "formChoiceZRR2" @formChoiceZRR3 = "formChoiceZRR3" @formChoiceZRR4 = "formChoiceZRR4" + @formChoiceZRR5 = "formChoiceZRR5" /> @@ -186,7 +187,7 @@ default-expand-all> @@ -837,9 +878,10 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount,evaluationHisListByOne} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; + import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import {getEvaluationIndex} from "api/businessApi"; let Base64 = require('js-base64').Base64; @@ -851,7 +893,8 @@ ProcessTitle, TreeSelect, TreeSelectNew, - formEditList + formEditList, + TreeSelectModule }, filters: { ellipsis (value) { @@ -935,7 +978,7 @@ } }] }, - taskInfo:'重新技术委员会评审、评审意见修改', + taskInfo:'技术委员会评审、评审意见修改', loading: false, dataLoading: true, disabledState: false, @@ -1071,7 +1114,9 @@ modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlag5: false, // drawer开关 drawerTitle1:'', + modelType:'', multipleFlag2:'', url:'', urlChild:'', @@ -1084,6 +1129,7 @@ defaultCheckedKeys1: [], defaultCheckedKeys2: [], defaultCheckedKeys3: [], + defaultCheckedKeys4: [], fileUrl: 'api/att/attFile/upload', fileMadel: false, fileType: '', @@ -1516,6 +1562,9 @@ formChoiceZRR4(type, title, id){ this.choiceZRR4(type, title, id) }, + formChoiceZRR5(type, title, id){ + this.choiceZRR5(type, title, id) + }, formChoiceZRRListCancel(type, title, id){ this.choiceZRRList(type, title, id) }, @@ -2148,9 +2197,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=> { @@ -2505,19 +2564,6 @@ } this.formKey++ }, - 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) { @@ -2541,53 +2587,79 @@ 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 + console.log(checkedData) + 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 + } + this.$forceUpdate() + }, + popoverCarHideModelCancel() { + this.modalShowFlag5 = false + }, closeDrawer() { this.ListModel = false }, @@ -2873,13 +2945,8 @@ getFormFieldList (item) { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) - console.log(this.form) this.form.evaluationData = [] - if(this.form.fsRejectStatus === 1){ - this.evaluationHisListByOne() - }else { - this.getEvaluation() - } + this.getEvaluation() this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id @@ -2919,19 +2986,6 @@ }) }) }, - evaluationHisListByOne() { - return new Promise((resolve, reject) => { - evaluationHisListByOne({ - pid: this.pId,taskInfo:'技术委员会评审、评审意见修改' - }).then(res => { - if (res) { - this.form.evaluationData = JSON.parse(res.mesg) - this.$forceUpdate() - } - }).catch(e => { - }) - }) - }, getData() { if(this.taskIds && this.pId){ return new Promise((resolve, reject) => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue index 0ae80edc5..e0cc4ef97 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue @@ -2,7 +2,7 @@ - +
基础信息