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 | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue index f20be29..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> @@ -164,6 +164,7 @@ type: 'checkbox', onChange: (selectedRowKeys, selectedRows) => { this.selectedRowKeys = selectedRowKeys + this.onSelectChange(selectedRows) }, onSelect: (record, selected, selectedRows) => { if (selected) { @@ -259,14 +260,18 @@ this.loadData() }, handleSubmit() { - this.$bus.$emit('selectionRows', this.selectionRowsNotClear) + // this.$bus.$emit('selectionRows', this.selectionRowsNotClear) + this.$bus.$emit('selectionRows', this.selectionRows) this.searchReset(0) this.close() }, - onSelectionChange(selectedRowKeys, selectedRows) { - this.selectedRowKeys = selectedRowKeys; - this.selectedRows = selectedRows; + onSelectChange(selectionRows) { + this.selectionRows = selectionRows }, + // onSelectionChange(selectedRowKeys, selectedRows) { + // this.selectedRowKeys = selectedRowKeys; + // this.selectedRows = selectedRows; + // }, searchQuery() { this.loadData(1) -- Gitblit v1.9.3