From 9c88094fb27a921724538da7937d9019ac9825da Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Wed, 22 Nov 2023 17:18:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=94=AE=E5=90=8E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/aftersales/aftersalesWorkOrder.js | 13 + src/views/aftersales/aftersalesWorkOrder.vue | 181 +++- vite.config.js | 4 +- yarn.lock | 982 +++++++++---------- 4 files changed, 651 insertions(+), 529 deletions(-) diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index 04feb37d..e4f43cdb 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -22,6 +22,19 @@ export const getDetail = (id) => { }) } + +export const getProcessor = (current, size, params) => { + return request({ + url: '/api/logpm-aftersales/aftersalesWorkOrder/pendingWorkOrder', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + export const remove = (ids) => { return request({ url: '/api/logpm-aftersales/aftersalesWorkOrder/remove', diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 92c6896d..bc4c48ba 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -4,23 +4,29 @@ - + - - + + + + + + - - + + + + @@ -43,6 +49,7 @@ 新 增 删 除 + 处理方信息 @@ -74,7 +81,7 @@ - + 查看 编辑 删除 @@ -105,10 +112,10 @@ append-to-body> - + @@ -118,7 +125,7 @@ @@ -147,13 +154,34 @@ - + + + - + + + - + + + @@ -161,8 +189,37 @@ + + + + + + + + + + + + + + - + + + @@ -175,9 +232,14 @@ --> - + @@ -210,8 +272,9 @@ @@ -1382,8 +1719,12 @@ export default { margin-right: 10%; } -.popUpselect :deep(.el-select__popper) { +:deep(.popUpselect .el-select__popper) { inset: auto !important; - top: 110% !important; + top: 120% !important; +} + +:deep(.avue-input-map) { + width: 100%; } diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue new file mode 100644 index 00000000..db2ffaff --- /dev/null +++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue @@ -0,0 +1,732 @@ + + + + + + 提货基本信息 + + + 批次代码:{{ deliverydata.kindName }} + + + 提货线路:{{ deliverydata.vehicleName }} + + + 提货车辆:{{ deliverydata.vehicleName }} + + + + + + 司机:{{ deliverydata.kindName }} + + + 预计件数{{ deliverydata.vehicleName }} + + + 承运商:{{ deliverydata.vehicleName }} + + + + + + 计费模式:{{ deliverydata.kindName }} + + + 提货费用:{{ deliverydata.vehicleName }} + + + 备注:{{ deliverydata.vehicleName }} + + + + + + + + + + + + + + + + + 搜 索 + 清 空 + + + + + + + + + + + + + + + + + + + + + {{ + // slotProps.scope.row.pickupBatch + 123 + }} + + + 编辑 + + + + + + 选择数: 12, + 选择数: 12, + 选择数: 12, + 选择数: 12 + + + + + + + 确认修改 + + + + + + + + + + {{ new Date() }} + + + + + + {{ new Date() }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index 37336dc3..c9f03335 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -54,7 +54,12 @@ - + + + + + + @@ -81,7 +86,7 @@ - + @@ -314,7 +319,7 @@ :total="pageStock.total" > - + diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index f7743bf3..bab4734d 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -10,8 +10,15 @@ - + @@ -29,7 +36,8 @@ - 已提货:{{ stopNum }}单/{{ numBill }}件 + 已提货:{{ stopNum }}单/{{ numBill }}件 @@ -38,12 +46,27 @@ - 创建自提 - 自提签收 - 导出 + 创建自提 + 自提签收 + 导出 @@ -56,32 +79,76 @@ - + - 查看 - 签收 - 编辑提货信息 + 查看 + 签收 + 编辑提货信息 - + 勾选数量: {{ selectionList.length }} - + - + @@ -98,8 +165,12 @@ - + @@ -110,7 +181,9 @@ - 提 交 + 提 交 取 消 @@ -268,7 +341,12 @@ --> - + @@ -1163,8 +1241,6 @@ export default { padding: 0; } - - :deep(.avue-crud) { display: flex; height: 100%;