From 6abb1cc3bbf423bc0950715434d41089ba25c941 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Thu, 21 Dec 2023 18:48:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/order.js | 36 + src/api/product.js | 6 + src/router/modules/order.js | 8 + src/router/modules/product.js | 11 +- src/views/order/index.vue | 31 +- src/views/order/index_credit.vue | 2010 +++++++++++++++++++++ src/views/order/otherOrderDetails.vue | 805 +++++++++ src/views/product/productImport/index.vue | 771 ++++++++ 8 files changed, 3662 insertions(+), 16 deletions(-) create mode 100644 src/views/order/index_credit.vue create mode 100644 src/views/order/otherOrderDetails.vue create mode 100644 src/views/product/productImport/index.vue diff --git a/src/api/order.js b/src/api/order.js index d2b505c..54eef86 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -15,6 +15,12 @@ import request from './request' export function orderListApi (data) { return request.get('store/order/lst', data) } +/** + * @description 赊账订单 -- 列表 + */ +export function orderOtherListApi (data) { + return request.get('store/order/other/lst', data) +} /** * @description 订单 -- 表头 @@ -22,6 +28,12 @@ export function orderListApi (data) { export function chartApi () { return request.get('store/order/chart') } +/** + * @description 其他订单 -- 表头 + */ +export function otherChartApi () { + return request.get('store/order/other/chart') +} /** * @description 订单 -- 卡片 */ @@ -46,6 +58,12 @@ export function orderDeliveryApi (id, data) { export function orderDetailApi (id) { return request.get(`store/order/detail/${id}`) } +/** + * @description 其他订单 -- 详情 + */ +export function otherOrderDetailApi (id) { + return request.get(`store/order/other/detail/${id}`) +} /** * @description 订单 -- 子订单 */ @@ -58,6 +76,12 @@ export function getChildrenOrderApi (id) { export function orderLogApi (id, data) { return request.get(`store/order/log/${id}`, data) } +/** + * @description 其他订单 -- 记录 + */ +export function otherOrderLogApi (id, data) { + return request.get(`store/order/other/log/${id}`, data) +} /** * @description 订单 -- 备注from */ @@ -172,6 +196,12 @@ export function goCancellationApi (id, data) { export function orderHeadListApi () { return request.get(`store/order/filtter`) } +/** + * @description 其他订单 -- 头部 + */ +export function otherOrderHeadListApi () { + return request.get(`store/order/other/filtter`) +} /** * @description 核销订单 -- 表头 */ @@ -287,6 +317,12 @@ export function getStoreLst () { export function getLogisticsCode (id) { return request.get(`store/order/logistics_code/${id}`) } +/** + * @description 其他发送货 -- 取件码 + */ +export function otherGetLogisticsCode (id) { + return request.get(`store/order/other/logistics_code/${id}`) +} /** * @description 发送货 -- 门店列表 diff --git a/src/api/product.js b/src/api/product.js index 2b63bf4..adb7f2e 100644 --- a/src/api/product.js +++ b/src/api/product.js @@ -75,6 +75,12 @@ export function templateLsitApi () { export function productLstApi (data) { return request.get(`store/product/lst`, data) } +/** + * @description 导入商品列表 -- 列表 + */ +export function xlsxProductLstApi (data) { + return request.get(`store/product/xlsx_import_list`, data) +} /** * @description 商品列表 -- 删除 */ diff --git a/src/router/modules/order.js b/src/router/modules/order.js index fbf90f4..20a7565 100644 --- a/src/router/modules/order.js +++ b/src/router/modules/order.js @@ -52,6 +52,14 @@ const orderRouter = title: '核销订单' }, component: () => import('@/views/order/orderCancellate/index') + }, + { + path: 'creditList', + name: 'OrderCreditList', + meta: { + title: '赊账订单' + }, + component: () => import('@/views/order/index_credit') } ] } diff --git a/src/router/modules/product.js b/src/router/modules/product.js index d3c9df5..498b25d 100644 --- a/src/router/modules/product.js +++ b/src/router/modules/product.js @@ -78,7 +78,7 @@ const productRouter = meta: { title: '商品参数', noCache: true, - + }, component: () => import('@/views/product/specs/list.vue') }, @@ -92,6 +92,15 @@ const productRouter = }, component: () => import('@/views/product/specs/create.vue') }, + { + path: 'importList', + name: `importList`, + meta: { + title: '商品导入记录', + noCache: true + }, + component: () => import('@/views/product/productImport') + }, ] } diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 2190643..212a85c 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -209,7 +209,7 @@ @click="orderCancellation('')" >订单核销 - 批量发货记录 下载物流公司对照表 + > --> @@ -427,7 +427,7 @@

- +