From ddd818f74d59c1fdeeed29714d660d7e49200c04 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 06 三月 2025 15:54:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
index 0852dbe..980a5d8 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
@@ -138,6 +138,7 @@
scrollTrigger: {},
dataSource: [],
selectionRows: [],
+ selectionRowsNotClear: [],
title: '鏍规嵁鏌ヨ缁撴灉閫夋嫨淇濆吇椤圭洰',
ipagination: {
current: 1,
@@ -167,7 +168,19 @@
type: 'checkbox',
onChange: (selectedRowKeys, selectedRows) => {
this.selectedRowKeys = selectedRowKeys
+ // this.selectionRowsNotClear.push(selectedRows)
this.onSelectChange(selectedRows)
+ },
+ onSelect: (record, selected, selectedRows) => {
+ if (selected) {
+ this.selectionRowsNotClear.push(record);
+ }
+ if (!selected) {
+ let delIndex = this.selectionRowsNotClear.findIndex(val => {
+ return val.id === record.id
+ })
+ this.selectionRowsNotClear.splice(delIndex, 1);
+ }
},
getCheckboxProps: record => ({
props: {
@@ -209,6 +222,7 @@
showModals(oldSelectRows) {
this.selectionRows = []
+ this.selectionRowsNotClear = []
this.oldSelectRows = oldSelectRows
this.visible = true
this.loadData(1)
@@ -252,7 +266,7 @@
this.loadData()
},
handleSubmit() {
- this.$bus.$emit('selectionRows', this.selectionRows)
+ this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
// this.searchReset(0)
this.close()
},
--
Gitblit v1.9.3