diff --git a/src/components/CustomFormComponents/Select.vue b/src/components/CustomFormComponents/Select.vue index a87165b3e..58cf2fc03 100644 --- a/src/components/CustomFormComponents/Select.vue +++ b/src/components/CustomFormComponents/Select.vue @@ -12,6 +12,7 @@ :placeholder="placeholder" :disabled="disabled" clearable + filterable @change="handleChange" > 0) { + for (let a = 0; a < this.nodeList.length; a ++) { + if (row.id === this.nodeList[a]) { + this.nodeList.splice(a, 1) + } + } + } + } + }, treeClass () { - }, handleTreeDrawerCancel () { this.filterText = '' this.isVisible2 = false }, saveUserInfo () { - if (this.nodeList.length) { + if (this.nodeList.length > 0) { let ids = '' this.nodeList.forEach(item => { if (ids.length > 0) { @@ -134,18 +145,27 @@ ids = item } }) - let oldList = [] this.$http.get('SarInstitution/institution/getNextById', { ids: ids }, { _this: this }, res => { - oldList = res + let oldList2 = res.concat(this.roleList) + let result = [] + let obj = {} + for(let i = 0; i < oldList2.length; i++){ + if(!obj[oldList2[i].id]){ + result.push(oldList2[i]); + obj[oldList2[i].id] = true; + } + } + this.isVisible2 = false + this.$emit('checkedRole', result) }) } else { + this.isVisible2 = false + this.$emit('checkedRole', this.roleList) } - this.isVisible2 = false - this.$emit('checkedRole', this.roleList) }, drawerCheck (data) { if (this.checkBox) { diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 8557d1325..d414d8724 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3024,7 +3024,13 @@ this.$refs['relatedTermsSelect'].handleSubmit(() => { this.selectSarStandItems() this.btnLoading = false + this.$message({ + message: '关联成功', + type: 'success' + }); }) + + }, closeRelatedTermsDrawer() { this.$refs['relatedTermsDrawer'].closeDrawer() diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 7ec64a6b1..9c155e6fa 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -659,7 +659,8 @@ :disabled="formdisableflag" > -