diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue index b173f2f30..a157413a5 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/batSetting.vue @@ -52,7 +52,7 @@ {{$t('engineeringInterfacePerson')}} - { this.ids = data || [] this.formInline = {} this.name = name + if (content && name == this.$t('BatchSetting')) { + this.formInline.dutyTerritory = content.dutyTerritory + this.queryPersonByProject(content.dutyTerritory) + } + this.formInline = { ...this.formInline } }) }, handleOk() { diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 6f5b2c4af..c3bd46608 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -973,7 +973,25 @@ }, BatchSettingClick(name) { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name) + let isTrue = false + for (let i = 0; i < this.selectedRowKeysList.length; i++) { + if (!this.selectedRowKeysList[i].dutyTerritoryName) { + isTrue = true + break + } + for (let j = 1; j < this.selectedRowKeysList.length; j++) { + if (this.selectedRowKeysList[i].dutyTerritoryName != this.selectedRowKeysList[j].dutyTerritoryName) { + isTrue = true + break + } + } + } + if (!isTrue){ + this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name,this.selectedRowKeysList[0]) + }else{ + this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), name) + } + } else { this.$message.warning(this.$t('selectLeastOne')) }