diff --git a/src/components/selection/StandardSelection.vue b/src/components/selection/StandardSelection.vue index 745fecf..899a99d 100644 --- a/src/components/selection/StandardSelection.vue +++ b/src/components/selection/StandardSelection.vue @@ -19,6 +19,7 @@ v-bind="$attrs" :value="value" @change="modalInput" + @numberChange="modalNumberChange" @nameChange="modalNameChange" @listChange="modalListChange"> @@ -85,6 +86,9 @@ export default { modalInput (value) { this.$emit('change', value) }, + modalNumberChange (value) { + this.$emit('numberChange', value) + }, modalNameChange (value) { this.$emit('nameChange', value) }, diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue index 6784926..6b9cbde 100644 --- a/src/components/selection/StandardSelectionModal.vue +++ b/src/components/selection/StandardSelectionModal.vue @@ -38,7 +38,7 @@ this.selectedRowList.length) { // 说明是增加了数据 for (const rowIndex in selectedRows) { - if (!this.selectedRowList.find(item => item.standardNumber === selectedRows[rowIndex].standardNumber)) { + if (!this.selectedRowList.find(item => (item.standardNumber + '|' + item.standardName) === (selectedRows[rowIndex].standardNumber + '|' + selectedRows[rowIndex].standardName))) { // 不存在,追加 this.selectedRowList.push(selectedRows[rowIndex]) } @@ -270,7 +270,7 @@ export default { if (selectedRowKeys && selectedRowKeys.length > 0) { // 没有选中数据,说明这一页没有选中数据了 for (let i = 0; i < this.selectedRowList.length; i++) { - if (!selectedRowKeys.find(item => item === this.selectedRowList[i].standardNumber)) { + if (!selectedRowKeys.find(item => item === this.selectedRowList[i].standardNumber + '|' + this.selectedRowList[i].standardName)) { // 表格选中中没有找到这一条数据,说明已经被删了 this.selectedRowList.splice(i, 1) i-- @@ -302,6 +302,7 @@ export default { serialNameArr.push(res.standardName) }) this.$emit('change', this.selectedRowKeys.join(',')) + this.$emit('numberChange', serialNumber.join(',')) this.$emit('nameChange', serialNameArr.join(',')) this.$emit('listChange', this.selectedRowList) this.close()