|
|
@ -46,12 +46,10 @@ |
|
|
|
import { Form, Select } from 'ant-design-vue'; |
|
|
|
import { Form, Select } from 'ant-design-vue'; |
|
|
|
import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; |
|
|
|
import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; |
|
|
|
import { BasicTable, useTable, EditRecordRow, BasicColumn, ActionItem, TableAction } from '/@/components/Table'; |
|
|
|
import { BasicTable, useTable, EditRecordRow, BasicColumn, ActionItem, TableAction } from '/@/components/Table'; |
|
|
|
import {MapPointType, taskPresetChildColumns} from '../amap.data'; |
|
|
|
import { MapPointType, taskPresetChildColumns } from '../amap.data'; |
|
|
|
import { listUser } from '/@/api/platform/system/controller/user'; |
|
|
|
import { listUser } from '/@/api/platform/system/controller/user'; |
|
|
|
import { buildUUID } from '/@/utils/uuid'; |
|
|
|
|
|
|
|
import { useMessage } from '/@/hooks/web/useMessage'; |
|
|
|
import { useMessage } from '/@/hooks/web/useMessage'; |
|
|
|
import {add, cloneDeep} from 'lodash-es'; |
|
|
|
import { add, cloneDeep, omit } from 'lodash-es'; |
|
|
|
import { listOrg } from '/@/api/platform/common/controller/org'; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** 类型规范统一声明定义区域 */ |
|
|
|
/** 类型规范统一声明定义区域 */ |
|
|
|
type OptionsType = { |
|
|
|
type OptionsType = { |
|
|
@ -127,7 +125,7 @@ |
|
|
|
// 提取交接最终到达上级医检医院 |
|
|
|
// 提取交接最终到达上级医检医院 |
|
|
|
const lastElement = mapTaskPresetData[mapTaskPresetData.length - 1]; |
|
|
|
const lastElement = mapTaskPresetData[mapTaskPresetData.length - 1]; |
|
|
|
lastElement && (state.modelRef.destinationPresetId = lastElement.destinationPresetId); |
|
|
|
lastElement && (state.modelRef.destinationPresetId = lastElement.destinationPresetId); |
|
|
|
setTableData(cloneDeep(state.taskPresetRow?.mapTaskPreset || [])); |
|
|
|
setTableData(mapTaskPresetData.map(item => omit(item, 'key'))); |
|
|
|
// 尾部:设置处理后的最终配置数据 |
|
|
|
// 尾部:设置处理后的最终配置数据 |
|
|
|
setModalProps(props); |
|
|
|
setModalProps(props); |
|
|
|
}); |
|
|
|
}); |
|
|
@ -158,8 +156,7 @@ |
|
|
|
courierUserId: '', |
|
|
|
courierUserId: '', |
|
|
|
orginPresetName: '等待收样员设置!', |
|
|
|
orginPresetName: '等待收样员设置!', |
|
|
|
destinationPresetName: '等待收样员设置!', |
|
|
|
destinationPresetName: '等待收样员设置!', |
|
|
|
fileId: [], |
|
|
|
fileId: [] |
|
|
|
key: buildUUID() |
|
|
|
|
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|