From c381e17a1ac7f60fdeae528d936ba1957c90067d Mon Sep 17 00:00:00 2001 From: kilo Date: Wed, 16 Aug 2023 17:42:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E3=80=81=E5=95=86=E9=85=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionDeliveryList.js | 15 + .../distributionDeliveryListdis.vue | 9 +- .../distributionDeliveryListedt.vue | 2331 +++++++++-------- .../distributionDeliveryListmar.vue | 84 +- src/views/distribution/reservation/atlas1.vue | 6 + .../distribution/reservation/reservation.vue | 113 +- .../signfor/distributionSignfortreat.vue | 88 +- .../turndelivery/deliveryDiscuss.vue | 8 +- 8 files changed, 1420 insertions(+), 1234 deletions(-) diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js index 0268c4f4..2b7d97d5 100644 --- a/src/api/distribution/distributionDeliveryList.js +++ b/src/api/distribution/distributionDeliveryList.js @@ -163,5 +163,20 @@ export const updateDeliveryList = (data) => { }) } +/** + * 查询配送任务订单地图信息 + * @param data + * @returns {AxiosPromise} + */ +export const selectStockArticleAtlasInfo = (id) => { + return request({ + url: '/api/logpm-distribution/deliveryList/selectStockArticleAtlasInfo', + method: 'get', + params: { + id, + } + }) +} + diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index 731bfbf0..85af9424 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -2,11 +2,12 @@
- - 配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} - + + + - 商配总车次：{{statistics.commercialNub}}/总包件数：{{statistics.commercialTotal}}/总库存品数：{{statistics.cinventoryTotal}} + + 商配总车次：{{statistics.commercialNub}}/总包件数：{{statistics.commercialTotal}} diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 17a1843c..d3cc09cf 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -1,1191 +1,1246 @@ diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index 8d59e9de..9698769c 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -3,9 +3,9 @@
- - 配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} - + + + 市配总车次：{{statistics.marketNub}}/总包件数：{{statistics.marketTotal}}/总库存品数：{{statistics.minventoryTotal}} @@ -234,16 +234,16 @@ export default { fixed: false, sortable: true, }, - { - prop: 'kind', - label: '配送种类', - type: 3, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - }, + // { + // prop: 'kind', + // label: '配送种类', + // type: 3, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, { prop: 'kindName', label: '配送种类', @@ -293,34 +293,34 @@ export default { fixed: false, sortable: true, }, - { - prop: 'deliveryStatus', - label: '配送状态', - type: 3, - values: '', - width: '150', - checkarr: [ - { - label: '待配送', - value: '1', - }, - { - label: '装车', - value: '2' - }, - { - label: '配送中', - value: '3' - }, - { - label: '已完成', - value: '4' - }, - ], - fixed: false, - sortable: true, - hide:true, - }, + // { + // prop: 'deliveryStatus', + // label: '配送状态', + // type: 3, + // values: '', + // width: '150', + // checkarr: [ + // { + // label: '待配送', + // value: '1', + // }, + // { + // label: '装车', + // value: '2' + // }, + // { + // label: '配送中', + // value: '3' + // }, + // { + // label: '已完成', + // value: '4' + // }, + // ], + // fixed: false, + // sortable: true, + // hide:true, + // }, { prop: 'deliveryStatusName', label: '配送状态', @@ -391,7 +391,7 @@ export default { }, { prop: 'deliveryNumber', - label: '配送件数', + label: '配送包件件数', type: 1, values: '', width: '150', diff --git a/src/views/distribution/reservation/atlas1.vue b/src/views/distribution/reservation/atlas1.vue index 7c72a632..99c4ce1b 100644 --- a/src/views/distribution/reservation/atlas1.vue +++ b/src/views/distribution/reservation/atlas1.vue @@ -29,6 +29,7 @@ import { useStore } from 'vuex'; import { getReservationAddr } from '@/api/distribution/distributionReservation'; import { getDictionaryBiz } from '@/api/system/dict'; +import { selectStockArticleAtlasInfo} from '@/api/distribution/distributionDeliveryList' import { onMounted, reactive, toRefs, watchEffect } from 'vue'; import { useRouter } from 'vue-router'; let router = useRouter(); @@ -43,6 +44,11 @@ let details = reactive({ }); onMounted(() => { details.item = JSON.parse(router.currentRoute.value.query.item); + console.log("details.item.id------------->",details.item.id); + selectStockArticleAtlasInfo(details.item.id).then(res=>{ + console.log("-------------->",res); + }) + console.log("------------->",details.item); setTimeout(() => { init(); }, 1500); diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue index 47c64207..8e292a9d 100644 --- a/src/views/distribution/reservation/reservation.vue +++ b/src/views/distribution/reservation/reservation.vue @@ -289,6 +289,36 @@ fixed: false, sortable: true }, + { + prop: 'warehouseName', + label: '仓库', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true + }, + { + prop: 'mallName', + label: '商城', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true + }, + { + prop: 'storeName', + label: '门店', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true + }, { prop: 'consignee', label: '收货人', @@ -328,30 +358,30 @@ fixed: false, sortable: true }, - { - prop: 'periodOfTime', - label: '时段1', - type: 3, - values: '', - width: '180', - checkarr: [ - { - label: '上午', - value: '1' - }, - { - label: '下午', - value: '2' - }, - { - label: '全天', - value: '3' - }, - ], - fixed: false, - sortable: true, - head:true, - }, + // { + // prop: 'periodOfTime', + // label: '时段1', + // type: 3, + // values: '', + // width: '180', + // checkarr: [ + // { + // label: '上午', + // value: '1' + // }, + // { + // label: '下午', + // value: '2' + // }, + // { + // label: '全天', + // value: '3' + // }, + // ], + // fixed: false, + // sortable: true, + // head:true, + // }, { prop: 'periodOfTimeName', label: '时段', @@ -486,25 +516,34 @@ // fixed: false, // sortable: true // }, - { - prop: 'reservationStatus', - label: '预约信息状态1', - type: 4, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - hide: true, - - }, + // { + // prop: 'reservationStatus', + // label: '预约信息状态1', + // type: 4, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // hide: true, + // + // }, { prop: 'reservationStatusName', label: '预约信息状态', type: 1, values: '', width: '180', - checkarr: [], + checkarr: [ + // { + // label: '待确认', + // value: '1' + // }, + // { + // label: '已确认', + // value: '2' + // }, + ], fixed: false, sortable: true, }, diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index 930d0c80..ef0f45be 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -1,6 +1,59 @@