lilei 3 days ago
parent
commit
8d6d9c20b7

+ 3 - 2
src/components/VTable/index.vue

@@ -235,6 +235,7 @@ export default {
         const changeRowKeys = this.localDataSource.map(item => item[this.rowKeyName])
         this.selectedRows = this.selectedRows.filter(item => !changeRowKeys.includes(item[this.rowKeyName]))
       }
+      this.selectedRows = this.selectedRows.filter(item => !this.disableSelectedRowKeys.includes(item[this.rowKeyName]))
       this.selectedRowKeys = selectedRowKeys
       this.onRowSelection()
       this.$emit('selectAllRowChange', { isSelected, selectedRowKeys })
@@ -242,13 +243,13 @@ export default {
     // 触发已选项事件
     onRowSelection () {
       // console.log(this.selectedRows)
-      const result = this.selectedRows.filter(item => !this.disableSelectedRowKeys.includes(item[this.rowKeyName]))
+      const result = this.selectedRows
       const selectedRowKeys = result.map(item => item[this.rowKeyName])
       this.$emit('rowSelection', { selectedRows: result, selectedRowKeys: selectedRowKeys })
     },
     // 页码改变的时候设置新页的已选项
     setCheckedRows () {
-      const list = this.selectedRows.filter(item => !this.disableSelectedRowKeys.includes(item[this.rowKeyName])).map(item => item[this.rowKeyName])
+      const list = this.selectedRows.map(item => item[this.rowKeyName])
       this.selectedRowKeys = this.localDataSource.filter(item => list.includes(item[this.rowKeyName])).map(item => item[this.rowKeyName])
     },
     /**

+ 1 - 0
src/views/salesManagement/salesCollection/list.vue

@@ -282,6 +282,7 @@ export default {
           if (res.status == 200) {
             data = res.data
             const no = (data.pageNo - 1) * data.pageSize
+            this.disableSelectedRowKeys = []
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               if (data.list[i].settleState == 'FINISH') {