From 6670fda2939518181d60c6254f2bcb37917f0e2f Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 14:42:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
index 3aa9642..ac9e74a 100644
--- a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
@@ -21,10 +21,10 @@
:md='8'
:sm='6'
>
- <a-form-item label='鐐规椤圭洰鍚嶇О'>
- <a-input
- placeholder='璇疯緭鍏ョ偣妫�椤圭洰鍚嶇О'
- v-model='queryParam.num'
+ <a-form-item label='鐐规椤圭洰'>
+ <j-input
+ placeholder='璇疯緭鍏ョ偣妫�椤圭洰'
+ v-model='queryParam.name'
/>
</a-form-item>
</a-col>
@@ -129,6 +129,7 @@
],
selectedRowKeys: [],
+ selectedRows: [],
selectionRowsNotClear: [],
oldSelectRows: [],
scrollTrigger: {},
@@ -163,8 +164,17 @@
type: 'checkbox',
onChange: (selectedRowKeys, selectedRows) => {
this.selectedRowKeys = selectedRowKeys
- this.selectionRows = selectedRows
- this.selectionRowsNotClear.push(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: {
@@ -172,13 +182,11 @@
}
}),
selectedRowKeys: this.selectedRowKeys,
- selectedRows: this.selectionRows
}
}
},
methods: {
-
async loadData(arg) {
if (arg === 1) {
this.ipagination.current = 1
@@ -234,7 +242,6 @@
if (num !== 0) {
that.loadData(1)
}
- that.selectborrowIds = []
},
close() {
this.searchReset(0)
@@ -256,9 +263,11 @@
this.searchReset(0)
this.close()
},
- onSelectChange(selectionRows) {
- this.selectionRows = selectionRows
+ onSelectionChange(selectedRowKeys, selectedRows) {
+ this.selectedRowKeys = selectedRowKeys;
+ this.selectedRows = selectedRows;
},
+
searchQuery() {
this.loadData(1)
}
--
Gitblit v1.9.3