From e34ece1a62e1e7bba392c1d9d369a69a5c9f4275 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 3 Jul 2023 18:05:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BE=85=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/distribution/distributionSignfor.js | 22 ++ .../deliverylist/distributionDeliveryList.vue | 2 - .../distributionDeliveryListedt.vue | 12 + .../signdetail/distributionSigndetail.vue | 320 +++++++++++----- .../signfor/distributionSignfor.vue | 330 ++++++++-------- .../signfor/distributionSignfortreat.vue | 351 +++++++++--------- 6 files changed, 605 insertions(+), 432 deletions(-) diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js index a89a4173..ac6c2540 100644 --- a/src/api/distribution/distributionSignfor.js +++ b/src/api/distribution/distributionSignfor.js @@ -11,6 +11,28 @@ export const getList = (current, size, params) => { } }) } +export const getPage = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/signfor/page', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} +export const getstatistics = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/signfor/statistics', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} export const getDetail = (id) => { return request({ diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index 6bb70bda..1612baf0 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -396,10 +396,8 @@ export default { queryDictionary() { getDictionaryBiz('delivery_type').then(res => { this.deliverytypeData = res.data.data; - }); getDictionaryBiz('distribution_deliverylist_kind').then(res => { - console.log("res.data.data>>>>>>>>",res.data.data); this.deliverykindData = res.data.data; this.columnList[2].checkarr =res.data.data.map(item=>{ item.value=item.dictKey diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 610b9bac..34c8a405 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -31,6 +31,18 @@ {{deliverydata.loadingTeamType}} + 作业时间 + + + 创建时间：{{deliverydata.createTime}} + + + 备货时间：{{deliverydata.lead_time}} + + + 装车时间：{{deliverydata.loading_time}} + + 订单列表 diff --git a/src/views/distribution/signdetail/distributionSigndetail.vue b/src/views/distribution/signdetail/distributionSigndetail.vue index 1934b677..e220de45 100644 --- a/src/views/distribution/signdetail/distributionSigndetail.vue +++ b/src/views/distribution/signdetail/distributionSigndetail.vue @@ -1,70 +1,40 @@