|
|
|
@ -63,9 +63,8 @@
@@ -63,9 +63,8 @@
|
|
|
|
|
import { BasicTable, useTable, EditRecordRow, BasicColumn, ActionItem, TableAction } from '/@/components/Table'; |
|
|
|
|
import { MapPointType, taskOrdinaryColumns, taskPresetColumns } from '../amap.data'; |
|
|
|
|
import TaskPresetModal from './MapTaskPresetModal.vue'; |
|
|
|
|
import { buildUUID } from '/@/utils/uuid'; |
|
|
|
|
import { useMessage } from '/@/hooks/web/useMessage'; |
|
|
|
|
import {add, cloneDeep} from 'lodash-es'; |
|
|
|
|
import { add, cloneDeep, omit } from 'lodash-es'; |
|
|
|
|
import { defaultMapData } from '/@/enums/amapEnum'; |
|
|
|
|
import { MapLogistic } from '/@/api/platform/common/entity/mapLogistic'; |
|
|
|
|
|
|
|
|
@ -149,8 +148,8 @@
@@ -149,8 +148,8 @@
|
|
|
|
|
}, |
|
|
|
|
]; |
|
|
|
|
const mapTask = cloneDeep(state.mapData?.mapTask || []); |
|
|
|
|
setTaskOrdinaryTableData(mapTask.filter(item => ~~item.taskType == 0)); |
|
|
|
|
setTaskPresetTableData(mapTask.filter(item => ~~item.taskType == 1)); |
|
|
|
|
setTaskOrdinaryTableData(mapTask.filter(item => ~~item.taskType == 0).map(item => omit(item, 'key'))); |
|
|
|
|
setTaskPresetTableData(mapTask.filter(item => ~~item.taskType == 1).map(item => omit(item, 'key'))); |
|
|
|
|
// 尾部:设置处理后的最终配置数据 |
|
|
|
|
setTaskOrdinaryColumns(taskOrdinaryColumns.map(item => |
|
|
|
|
taskOrdinaryUpdateColumns.find(e => e.dataIndex == item.dataIndex) || item |
|
|
|
@ -216,8 +215,7 @@
@@ -216,8 +215,7 @@
|
|
|
|
|
hospitalId: '', |
|
|
|
|
taskType: '0', |
|
|
|
|
orgId: '', |
|
|
|
|
fileId: [], |
|
|
|
|
key: buildUUID() |
|
|
|
|
fileId: [] |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -239,8 +237,7 @@
@@ -239,8 +237,7 @@
|
|
|
|
|
hospitalId: '', |
|
|
|
|
taskType: '1', |
|
|
|
|
orgName: '等待收样员设置!', |
|
|
|
|
fileId: [], |
|
|
|
|
key: buildUUID() |
|
|
|
|
fileId: [] |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|