From c46213fa824995bb2155c11ea332824d23232d9c Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 10 六月 2025 16:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
index c5f352f..17597c8 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>
@@ -57,9 +57,9 @@
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
- :rowSelection='rowSelection'
:loading='loading'
@change='handleTableChange'
+ :rowSelection='rowSelection'
>
</a-table>
@@ -129,6 +129,8 @@
],
selectedRowKeys: [],
+ selectedRows: [],
+ selectionRowsNotClear: [],
oldSelectRows: [],
scrollTrigger: {},
dataSource: [],
@@ -164,18 +166,28 @@
this.selectedRowKeys = selectedRowKeys
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: {
disabled: record.distable
}
}),
- selectedRowKeys: this.selectedRowKeys
+ selectedRowKeys: this.selectedRowKeys,
}
}
},
methods: {
-
async loadData(arg) {
if (arg === 1) {
this.ipagination.current = 1
@@ -204,6 +216,8 @@
showModals(oldSelectRows) {
this.selectionRows = []
+ this.selectedRowKeys = []
+ this.selectionRowsNotClear = []
this.oldSelectRows = oldSelectRows
this.visible = true
this.loadData(1)
@@ -229,7 +243,6 @@
if (num !== 0) {
that.loadData(1)
}
- that.selectborrowIds = []
},
close() {
this.searchReset(0)
@@ -238,15 +251,16 @@
},
handleTableChange(pagination, filters, sorter) {
//TODO 绛涢��
-
if (Object.keys(sorter).length > 0) {
this.isorter.column = sorter.field
this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
}
this.ipagination = pagination
+
this.loadData()
},
handleSubmit() {
+ // this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
this.$bus.$emit('selectionRows', this.selectionRows)
this.searchReset(0)
this.close()
@@ -254,6 +268,11 @@
onSelectChange(selectionRows) {
this.selectionRows = selectionRows
},
+ // onSelectionChange(selectedRowKeys, selectedRows) {
+ // this.selectedRowKeys = selectedRowKeys;
+ // this.selectedRows = selectedRows;
+ // },
+
searchQuery() {
this.loadData(1)
}
--
Gitblit v1.9.3