From 7b77cc284316f69c96d5cbbbd64af8da5579e759 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 14 Jun 2023 18:08:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9F=A5=E8=AF=A2=E5=8C=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?,=E6=9F=A5=E7=9C=8B=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionSigndetail.js | 11 ++ .../distribution/distributionSigndetail.js | 28 +++++ .../distribution/distributionSignfor.js | 14 ++- .../signdetail/distributionSigndetail.vue | 89 ++++++++------- .../signfor/distributionSignfor.vue | 105 +++++++++--------- 5 files changed, 155 insertions(+), 92 deletions(-) diff --git a/src/api/distribution/distributionSigndetail.js b/src/api/distribution/distributionSigndetail.js index dff90837..918849f7 100644 --- a/src/api/distribution/distributionSigndetail.js +++ b/src/api/distribution/distributionSigndetail.js @@ -11,6 +11,17 @@ export const getList = (current, size, params) => { } }) } +export const getPage = (current, size, params) => { + return request({ + url: '/api/logpm-distribution/signdetail/page', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} export const getDetail = (id) => { return request({ diff --git a/src/option/distribution/distributionSigndetail.js b/src/option/distribution/distributionSigndetail.js index a608b3bb..017712ef 100644 --- a/src/option/distribution/distributionSigndetail.js +++ b/src/option/distribution/distributionSigndetail.js @@ -131,10 +131,14 @@ export default { { label: "入库时间", prop: "warehousingTime", + format: "YYYY-MM-DD HH:mm:ss", + valueFormat: "YYYY-MM-DD HH:mm:ss", }, { label: "备货时间", prop: "leadTime", + format: "YYYY-MM-DD HH:mm:ss", + valueFormat: "YYYY-MM-DD HH:mm:ss", }, { label: "在库时长;(天)", @@ -152,5 +156,29 @@ export default { label: "品牌", prop: "brand", }, + { + label: "客户", + prop: "consignee", + }, + { + label: "客户电话", + prop: "consigneePhone", + }, + { + label: "收货地址", + prop: "deliveryAddress", + }, + { + label: "文员签收时间", + prop: "signingTime", + format: "YYYY-MM-DD HH:mm:ss", + valueFormat: "YYYY-MM-DD HH:mm:ss", + }, + { + label: "司机签收时间", + prop: "sjsigningTime", + format: "YYYY-MM-DD HH:mm:ss", + valueFormat: "YYYY-MM-DD HH:mm:ss", + }, ] } diff --git a/src/option/distribution/distributionSignfor.js b/src/option/distribution/distributionSignfor.js index 0a232027..054e143a 100644 --- a/src/option/distribution/distributionSignfor.js +++ b/src/option/distribution/distributionSignfor.js @@ -106,6 +106,10 @@ export default { label: "收货地址", prop: "deliveryAddress", }, + { + label: "收货人手机号", + prop: "consigneePhone", + }, { label: "服务类型", prop: "serveType", @@ -143,8 +147,16 @@ export default { prop: "deliveryDriverPhone", }, { - label: "签收时间", + label: "文员签收时间", prop: "signingTime", + format: "YYYY-MM-DD HH:mm:ss", + valueFormat: "YYYY-MM-DD HH:mm:ss", + }, + { + label: "司机签收时间", + prop: "sjsigningTime", + format: "YYYY-MM-DD HH:mm:ss", + valueFormat: "YYYY-MM-DD HH:mm:ss", }, { label: "签收人", diff --git a/src/views/distribution/signdetail/distributionSigndetail.vue b/src/views/distribution/signdetail/distributionSigndetail.vue index c0a0f79d..fdaa348a 100644 --- a/src/views/distribution/signdetail/distributionSigndetail.vue +++ b/src/views/distribution/signdetail/distributionSigndetail.vue @@ -50,8 +50,8 @@ @@ -79,45 +79,54 @@ append-to-body> - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +