Browse Source

🚨 优化请求次数

master
wangxiang 3 years ago
parent
commit
1ea6d06046
  1. 6
      src/components/AMap/src/AMapDesigner/index.vue
  2. 18
      src/components/AMap/src/components/MapTaskModal.vue

6
src/components/AMap/src/AMapDesigner/index.vue

@ -570,7 +570,8 @@
key: buildUUID() key: buildUUID()
}); });
} else { } else {
const mapTask = mapState.mapData.mapTask.find(item => item.hospitalId == mapState.mapData.sendOrderId); const mapTask = mapState.mapData.mapTask.filter(item =>
item.taskType == mapState.mapData.sendOrderTaskType).find(item => item.sort == 1);
mapTask && Object.assign(mapTask, { mapTask && Object.assign(mapTask, {
hospitalId: mapState.mapData.sendOrderId, hospitalId: mapState.mapData.sendOrderId,
taskType: mapState.mapData.sendOrderTaskType taskType: mapState.mapData.sendOrderTaskType
@ -595,7 +596,8 @@
/** 处理打开任务配置 */ /** 处理打开任务配置 */
async function handleOpenMapTask() { async function handleOpenMapTask() {
await formElRef.value.validate(); await formElRef.value.validate();
if(!mapState.mapData.mapTask.find(item => item.hospitalId == mapState.mapData.sendOrderId)) { if(!mapState.mapData.mapTask.filter(item =>
item.taskType == mapState.mapData.sendOrderTaskType).find(item => item.sort == 1)) {
notification.error({ notification.error({
message: '致命错误', message: '致命错误',
description: `检测到任务列表中首个${~~mapState.mapData.sendOrderTaskType ? '普通' : '交接'}任务对应发单数据错误,请联系开发人员!`, description: `检测到任务列表中首个${~~mapState.mapData.sendOrderTaskType ? '普通' : '交接'}任务对应发单数据错误,请联系开发人员!`,

18
src/components/AMap/src/components/MapTaskModal.vue

@ -20,7 +20,7 @@
label: '删除', label: '删除',
icon: 'ant-design:delete-outlined', icon: 'ant-design:delete-outlined',
color: 'error', color: 'error',
disabled: !!state.taskOrdinaryCurrentEditRowRef || record.hospitalId == state.mapData.sendOrderId, disabled: !!state.taskOrdinaryCurrentEditRowRef || record.key == state.sendOrderTaskEditKeyRef,
onClick: handleTaskOrdinaryDelete.bind(null, record) onClick: handleTaskOrdinaryDelete.bind(null, record)
} }
])" ])"
@ -47,7 +47,7 @@
label: '删除', label: '删除',
icon: 'ant-design:delete-outlined', icon: 'ant-design:delete-outlined',
color: 'error', color: 'error',
disabled: !!state.taskPresetCurrentEditRowRef || record.hospitalId == state.mapData.sendOrderId, disabled: !!state.taskPresetCurrentEditRowRef || record.key == state.sendOrderTaskEditKeyRef,
onClick: handleTaskPresetDelete.bind(null, record) onClick: handleTaskPresetDelete.bind(null, record)
} }
])" ])"
@ -80,6 +80,7 @@
taskPresetCurrentEditRowRef: Nullable<Recordable>; taskPresetCurrentEditRowRef: Nullable<Recordable>;
mapData: MapLogistic; mapData: MapLogistic;
options: OptionsType; options: OptionsType;
sendOrderTaskEditKeyRef: string;
} }
/** 通用变量统一声明区域 */ /** 通用变量统一声明区域 */
@ -91,7 +92,8 @@
courierUserList: null, courierUserList: null,
hospitalList: null, hospitalList: null,
orgList: null orgList: null
} },
sendOrderTaskEditKeyRef: ''
}); });
const emit = defineEmits(['success', 'register']); const emit = defineEmits(['success', 'register']);
const [registerModal, { setModalProps, closeModal }] = useModalInner(async data => { const [registerModal, { setModalProps, closeModal }] = useModalInner(async data => {
@ -101,6 +103,9 @@
state.options = options as OptionsType; state.options = options as OptionsType;
const props: Partial<ModalProps> = { confirmLoading: false }; const props: Partial<ModalProps> = { confirmLoading: false };
props.title = '任务配置'; props.title = '任务配置';
const sendOrderMapTask = state.mapData.mapTask.filter(item =>
item.taskType == state.mapData.sendOrderTaskType).find(item => item.sort == 1);
state.sendOrderTaskEditKeyRef = sendOrderMapTask?.key;
const taskOrdinaryUpdateColumns: BasicColumn[] = [ const taskOrdinaryUpdateColumns: BasicColumn[] = [
{ {
title: '医院', title: '医院',
@ -111,7 +116,7 @@
editComponentProps: ({ text, record, column, index }) => ({ editComponentProps: ({ text, record, column, index }) => ({
style: { width:'100%' }, style: { width:'100%' },
options: state.options.hospitalList, options: state.options.hospitalList,
disabled: record.hospitalId == state.mapData.sendOrderId, disabled: record.key == state.sendOrderTaskEditKeyRef
}), }),
editValueMap: value => state.options.hospitalList?.find(item => item.value == value)?.label || value editValueMap: value => state.options.hospitalList?.find(item => item.value == value)?.label || value
}, },
@ -122,8 +127,7 @@
editComponent: 'Select', editComponent: 'Select',
editComponentProps: ({ text, record, column, index }) => ({ editComponentProps: ({ text, record, column, index }) => ({
style: { width:'100%' }, style: { width:'100%' },
options: state.options.orgList, options: state.options.orgList
disabled: record.hospitalId == state.mapData.sendOrderId,
}), }),
editValueMap: value => state.options.orgList?.find(item => item.value == value)?.label || value editValueMap: value => state.options.orgList?.find(item => item.value == value)?.label || value
}, },
@ -138,7 +142,7 @@
editComponentProps: ({ text, record, column, index }) => ({ editComponentProps: ({ text, record, column, index }) => ({
style: { width:'100%' }, style: { width:'100%' },
options: state.options.hospitalList, options: state.options.hospitalList,
disabled: record.hospitalId == state.mapData.sendOrderId, disabled: record.key == state.sendOrderTaskEditKeyRef
}), }),
editValueMap: value => state.options.hospitalList?.find(item => item.value == value)?.label || value editValueMap: value => state.options.hospitalList?.find(item => item.value == value)?.label || value
}, },

Loading…
Cancel
Save