diff --git a/src/components/AMap/src/components/MapTaskModal.vue b/src/components/AMap/src/components/MapTaskModal.vue index c4527e9..cadd323 100644 --- a/src/components/AMap/src/components/MapTaskModal.vue +++ b/src/components/AMap/src/components/MapTaskModal.vue @@ -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 @@ }, ]; 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 @@ hospitalId: '', taskType: '0', orgId: '', - fileId: [], - key: buildUUID() + fileId: [] }); } @@ -239,8 +237,7 @@ hospitalId: '', taskType: '1', orgName: '等待收样员设置!', - fileId: [], - key: buildUUID() + fileId: [] }); } diff --git a/src/components/AMap/src/components/MapTaskPresetModal.vue b/src/components/AMap/src/components/MapTaskPresetModal.vue index 0155594..6c7675c 100644 --- a/src/components/AMap/src/components/MapTaskPresetModal.vue +++ b/src/components/AMap/src/components/MapTaskPresetModal.vue @@ -46,12 +46,10 @@ import { Form, Select } from 'ant-design-vue'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; 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 { buildUUID } from '/@/utils/uuid'; import { useMessage } from '/@/hooks/web/useMessage'; - import {add, cloneDeep} from 'lodash-es'; - import { listOrg } from '/@/api/platform/common/controller/org'; + import { add, cloneDeep, omit } from 'lodash-es'; /** 类型规范统一声明定义区域 */ type OptionsType = { @@ -127,7 +125,7 @@ // 提取交接最终到达上级医检医院 const lastElement = mapTaskPresetData[mapTaskPresetData.length - 1]; lastElement && (state.modelRef.destinationPresetId = lastElement.destinationPresetId); - setTableData(cloneDeep(state.taskPresetRow?.mapTaskPreset || [])); + setTableData(mapTaskPresetData.map(item => omit(item, 'key'))); // 尾部:设置处理后的最终配置数据 setModalProps(props); }); @@ -158,8 +156,7 @@ courierUserId: '', orginPresetName: '等待收样员设置!', destinationPresetName: '等待收样员设置!', - fileId: [], - key: buildUUID() + fileId: [] }); } diff --git a/src/components/Table/src/components/editable/EditableCell.vue b/src/components/Table/src/components/editable/EditableCell.vue index 8562c8a..a216d60 100644 --- a/src/components/Table/src/components/editable/EditableCell.vue +++ b/src/components/Table/src/components/editable/EditableCell.vue @@ -337,9 +337,7 @@ : (props.record[cbs] = [handle]); } } - console.log(props,props.record,'外面层') if (props.record) { - console.log('进来了') initCbs('submitCbs', handleSubmit); initCbs('validCbs', handleSubmiRule); initCbs('cancelCbs', handleCancel); @@ -353,7 +351,6 @@ isArray(props.record?.cancelCbs) && props.record?.cancelCbs.forEach((fn) => fn()); }; /* eslint-disable */ - console.log('onSubmitEdit') props.record.onSubmitEdit = async () => { if (isArray(props.record?.submitCbs)) { if (!props.record?.onValid?.()) return;