diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index dd759d443..2c01e202f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -283,7 +283,6 @@ :data="standSystemOptions" show-checkbox node-key="id" - default-expand-all check-strictly :default-checked-keys="TXJGList" :props="defaultProps"> @@ -591,18 +590,26 @@ export default { this.modalshowflag2 = true; }, checkedRole2(data) { + console.log(data); let idList = "", nameList = "" + let unitList = "", unitNameList = "" data.forEach(item => { if (nameList.length) { nameList += ","; idList += ","; + unitList += ","; + unitNameList += ","; } idList += item.id; nameList += item.name; + unitList += item.institutionId + unitNameList += item.institutionName }); if(this.roleType === '1'){ this.$set(this.qbfsForm, 'drafter', idList) this.$set(this.qbfsForm, 'drafterName', nameList) + this.$set(this.qbfsForm, 'unit', unitList) + this.$set(this.qbfsForm, 'unitName', unitNameList) }else if(this.roleType === '2'){ this.$set(this.qbfsForm, 'resPerson', idList) this.$set(this.qbfsForm, 'resPersonName', nameList) @@ -611,6 +618,9 @@ export default { if(this.qbfsForm.drafterName){ this.$refs.qbfsForm.validateField('drafterName'); } + if(this.qbfsForm.unitName){ + this.$refs.qbfsForm.validateField('unitName'); + } if(this.qbfsForm.resPersonName){ this.$refs.qbfsForm.validateField('resPersonName'); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index d40285c76..b407db76d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -447,7 +447,6 @@ :data="standSystemOptions" show-checkbox node-key="id" - default-expand-all check-strictly :default-checked-keys="TXJGList" :props="defaultProps"> @@ -783,19 +782,26 @@ export default { this.modalshowflag2 = true; }, checkedRole2(data) { - let idList = ""; - let nameList = ""; + let idList = "", nameList = "" + let unitList = "", unitNameList = "" data.forEach(item => { if (nameList.length) { nameList += ","; idList += ","; + unitList += ","; + unitNameList += ","; } idList += item.id; nameList += item.name; + unitList += item.institutionId + unitNameList += item.institutionName + }); if(this.type === '1'){ this.$set(this.qbfsForm, 'drafter', idList) this.$set(this.qbfsForm, 'drafterName', nameList) + this.$set(this.qbfsForm, 'unit', unitList) + this.$set(this.qbfsForm, 'unitName', unitNameList) }else if(this.type === '2'){ this.$set(this.qbfsForm, 'resPerson', idList) this.$set(this.qbfsForm, 'resPersonName', nameList) @@ -803,6 +809,9 @@ export default { if(this.qbfsForm.drafterName){ this.$refs.qbfsForm.validateField('drafterName'); } + if(this.qbfsForm.unitName){ + this.$refs.qbfsForm.validateField('unitName'); + } if(this.qbfsForm.resPersonName){ this.$refs.qbfsForm.validateField('resPersonName'); }