From b66eab74b627b0e3746f5cb4f6a7d7cb142e9a6d Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 01 八月 2024 10:36:42 +0800
Subject: [PATCH] OEE综合效率分析页面删除加工数量和标准加工时间字段
---
src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
index 85611d4..f20be29 100644
--- a/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
+++ b/src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue
@@ -57,9 +57,9 @@
:columns='columns'
:dataSource='dataSource'
:pagination='ipagination'
- :rowSelection='rowSelection'
:loading='loading'
@change='handleTableChange'
+ :rowSelection='rowSelection'
>
</a-table>
@@ -101,21 +101,21 @@
align: 'center',
dataIndex: 'detectionStandard'
},
- {
- title: '鍚堟牸鑼冨洿',
- align: 'center',
- dataIndex: 'acceptabilityLimit'
- },
- {
- title: '鏂规硶',
- align: 'center',
- dataIndex: 'inspectionMethod_dictText'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'inspectionTool'
- },
+ // {
+ // title: '鍚堟牸鑼冨洿',
+ // align: 'center',
+ // dataIndex: 'acceptabilityLimit'
+ // },
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'inspectionMethod_dictText'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'inspectionTool'
+ // },
// {
// title: '鍛ㄦ湡',
// align: 'center',
@@ -129,6 +129,8 @@
],
selectedRowKeys: [],
+ selectedRows: [],
+ selectionRowsNotClear: [],
oldSelectRows: [],
scrollTrigger: {},
dataSource: [],
@@ -162,20 +164,29 @@
type: 'checkbox',
onChange: (selectedRowKeys, selectedRows) => {
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 +215,8 @@
showModals(oldSelectRows) {
this.selectionRows = []
+ this.selectedRowKeys = []
+ this.selectionRowsNotClear = []
this.oldSelectRows = oldSelectRows
this.visible = true
this.loadData(1)
@@ -229,7 +242,6 @@
if (num !== 0) {
that.loadData(1)
}
- that.selectborrowIds = []
},
close() {
this.searchReset(0)
@@ -238,22 +250,24 @@
},
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.selectionRows)
+ this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
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