diff --git a/src/api/map/mapTask.ts b/src/api/map/mapTask.ts index c5a67160..441141d2 100644 --- a/src/api/map/mapTask.ts +++ b/src/api/map/mapTask.ts @@ -44,3 +44,7 @@ export const updateRobotTask = (data) => { export const getTaskPageList = async (data) => { return await request.post({ url: `/system/robot/task/page`, data }) } + +export const getLocationByNam = async (data) => { + return await request.post({ url: `/system/ware/house-location/getLocationByNam`, data }) +} diff --git a/src/views/mapPage/taskManagement/createTask.vue b/src/views/mapPage/taskManagement/createTask.vue index 869058f4..29087dfa 100644 --- a/src/views/mapPage/taskManagement/createTask.vue +++ b/src/views/mapPage/taskManagement/createTask.vue @@ -805,32 +805,39 @@ const getTaskNo = async () => { //获取取货位置可选的列表 const getLocationList = async (type, locationNo) => { - if (type == 4) { - return await DeviceApi.getWareHouseTakePointList({ pointType: 1 }) - } else { - return await MapTaskAPi.getLocationByName({ - type, // 放货类型(1:库位、2:线库、 3:区域) - locationNo - }) - } -} -//放货的选择列表 -const loading = ref(false) -const releaseRemoteMethod = async (query, item) => { - if (query) { - item.releaseList = await getLocationList(item.releaseType, query) - } else { - item.releaseList = [] - } + return await MapTaskAPi.getLocationByName({ + type, // 放货类型(1:库位、2:线库、 3:区域、 4:路线的点位、 5:取放货的点位) + locationNo + }) } + //取货的选择列表 const takeRemoteMethod = async (query, item) => { if (query) { - item.takeList = await getLocationList(item.takeType, query) + if (item.takeType == 4) { + item.takeList = await DeviceApi.getWareHouseTakePointList({ pointType: 1 }) + } else { + item.takeList = await getLocationList(item.takeType, query) + } } else { item.takeList = [] } } + +//放货的选择列表 +const loading = ref(false) +const releaseRemoteMethod = async (query, item) => { + if (query) { + if (item.releaseType == 4) { + item.releaseList = await getLocationList(5, query) //5:取放货的点位 + } else { + item.releaseList = await getLocationList(item.releaseType, query) + } + } else { + item.releaseList = [] + } +} + //终点点位 const endPointMethod = async (query, item) => { if (query) { @@ -1208,6 +1215,7 @@ const chooseLocation = (type, item, index) => { } //成功选择库位 const locationSelectionDialogSuccess = (item) => { + console.log(item) if (chooseLocationType.value == 'take') { //取货 if (locationTypeNumber.value == 1 || locationTypeNumber.value == 4) { @@ -1222,6 +1230,10 @@ const locationSelectionDialogSuccess = (item) => { // 3区域 takeRemoteMethod(item.areaName, formData.value.taskDetailList[currentItemIndex.value]) formData.value.taskDetailList[currentItemIndex.value].takeId = item.areaId + } else if (locationTypeNumber.value == 4) { + //取放货点位 + takeRemoteMethod(item.id, formData.value.taskDetailList[currentItemIndex.value]) + formData.value.taskDetailList[currentItemIndex.value].takeId = item.id } } else if (chooseLocationType.value == 'release') { //放货 @@ -1237,6 +1249,10 @@ const locationSelectionDialogSuccess = (item) => { // 3区域 releaseRemoteMethod(item.areaName, formData.value.taskDetailList[currentItemIndex.value]) formData.value.taskDetailList[currentItemIndex.value].releaseId = item.areaId + } else if (locationTypeNumber.value == 4) { + //取放货点位 + releaseRemoteMethod(item.id, formData.value.taskDetailList[currentItemIndex.value]) + formData.value.taskDetailList[currentItemIndex.value].releaseId = item.id } } }