From 62e3781ecfdc5903beb9bf2c8f9788ed640cc834 Mon Sep 17 00:00:00 2001 From: 97694731 <97694731@qq.com> Date: Sat, 27 Jun 2026 17:11:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E4=BB=B7=E5=99=A8+=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=90=9C=E7=B4=A0+=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E7=9B=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dashboard.js | 6 +- src/api/outbound.js | 4 +- src/api/salesOrder.js | 7 ++- src/api/shippingOrder.js | 8 ++- src/utils/request.js | 4 +- src/views/admin/Dashboard.vue | 4 +- src/views/config/config.vue | 5 +- src/views/outbound/Outbound.vue | 65 ++++++++++++++----- src/views/salesOrder/salesInfoList.vue | 17 ++--- src/views/salesOrder/salesOrder.vue | 61 +++++++++++++----- src/views/shippingOrder/orderList.vue | 16 ++--- src/views/shippingOrder/shippingOrder.vue | 76 +++++++++++++++++++---- vite.config.js | 4 +- 13 files changed, 207 insertions(+), 70 deletions(-) diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 07cb27dc..b9fb7399 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -45,8 +45,10 @@ export const fetchEmployeeStats = async () => { */ export const fetchStoreInfo = async (params = {}) => { const response = await request.get(`${ADMIN_BASE}/store-info`, { params }) - const data = response?.data - return (data?.stores ?? []).map(item => ({ + const data = response + console.log(data.data); + + return (data?.data ?? []).map(item => ({ store_name: item.store_name ?? '-', store_type: item.store_type ?? '-', sale_count: item.sale_count ?? 0, diff --git a/src/api/outbound.js b/src/api/outbound.js index 6a3a4f1d..23ba7f26 100644 --- a/src/api/outbound.js +++ b/src/api/outbound.js @@ -33,6 +33,7 @@ const normalizeListResponse = (payload) => { * @param {string} [params.status] - 出库单状态 * @param {string} [params.warehouse_id] - 仓库ID * @param {string} [params.customer_id] - 平台ID + * @param {string} [params.shop_type] - 平台类型 1拼多多 2孔夫子 5闲鱼 * @param {string} [params.sales_order_id] - 关联销售订单ID * @param {string} [params.start_date] - 开始日期 * @param {string} [params.end_date] - 结束日期 @@ -42,12 +43,13 @@ const normalizeListResponse = (payload) => { * @param {string} [params.page_size] - 每页条数 * @returns {Promise<{ list: Array, total: number }>} 标准化后的出库单列表 */ -export const fetchOutboundList = async ({ out_no, status, warehouse_id, customer_id, sales_order_id, start_date, end_date, association_order_no, logistics_no, page, page_size }) => { +export const fetchOutboundList = async ({ out_no, status, warehouse_id, customer_id, shop_type, sales_order_id, start_date, end_date, association_order_no, logistics_no, page, page_size }) => { const params = { out_no: out_no || undefined, status: status || undefined, warehouse_id: warehouse_id || undefined, customer_id: customer_id || undefined, + shop_type: shop_type || undefined, sales_order_id: sales_order_id || undefined, start_date: start_date || undefined, end_date: end_date || undefined, diff --git a/src/api/salesOrder.js b/src/api/salesOrder.js index de77be73..82bb9391 100644 --- a/src/api/salesOrder.js +++ b/src/api/salesOrder.js @@ -33,11 +33,11 @@ const normalizeListResponse = (payload) => { * @param {string} [params.logistics_no] - 快递单号 * @returns {Promise<{ list: Array, total: number }>} 标准化后的销售订单列表 */ -export const fetchSalesOrderList = async ({ keyword, status, customer_id, warehouse_id, page, pageSize, sort_by, sort_order, association_order_no, logistics_no }) => { +export const fetchSalesOrderList = async ({ keyword, status, shop_type, warehouse_id, page, pageSize, sort_by, sort_order, association_order_no, logistics_no }) => { const params = { so_no: keyword || undefined, status, - customer_id, + shop_type: shop_type || undefined, warehouse_id, page, page_size: pageSize, @@ -143,10 +143,11 @@ export const returnSalesOrderItem = async (data) => { * @param {string} [params.logistics_no] - 快递单号 * @returns {Promise<{list: Array, total: number}>} */ -export const fetchSalesOrderDetails = async ({ page, pageSize, association_order_no, logistics_no }) => { +export const fetchSalesOrderDetails = async ({ page, pageSize, shop_type, association_order_no, logistics_no }) => { const params = { page, page_size: pageSize, + shop_type: shop_type || undefined, association_order_no: association_order_no || undefined, logistics_no: logistics_no || undefined } diff --git a/src/api/shippingOrder.js b/src/api/shippingOrder.js index a868aa85..207a83d3 100644 --- a/src/api/shippingOrder.js +++ b/src/api/shippingOrder.js @@ -38,11 +38,11 @@ const normalizeListResponse = (payload) => { * @param {number} [params.pageSize] - 每页条数 * @returns {Promise<{ list: Array, total: number }>} 标准化后的发货单列表 */ -export const fetchShippingOrderList = async ({ check_no, status, customer_id, warehouse_id, sales_order_id, wave_task_id, association_order_no, logistics_no, page, pageSize }) => { +export const fetchShippingOrderList = async ({ check_no, status, shop_type, warehouse_id, sales_order_id, wave_task_id, association_order_no, logistics_no, page, pageSize }) => { const params = { check_no: check_no || undefined, status, - customer_id, + shop_type: shop_type || undefined, warehouse_id, sales_order_id, wave_task_id, @@ -62,6 +62,7 @@ export const fetchShippingOrderList = async ({ check_no, status, customer_id, wa * @param {number} [params.page] - 页码，默认1 * @param {number} [params.pageSize] - 每页条数，默认20，最大100 * @param {number} [params.customer_id] - 按平台ID筛选 + * @param {number} [params.shop_type] - 按平台类型筛选（1=拼多多 2=孔夫子 5=闲鱼） * @param {string} [params.shipping_no] - 按发货单号模糊搜索 * @param {number} [params.start_date] - 创建时间起始（时间戳秒） * @param {number} [params.end_date] - 创建时间截止（时间戳秒） @@ -69,12 +70,13 @@ export const fetchShippingOrderList = async ({ check_no, status, customer_id, wa * @param {string} [params.logistics_no] - 快递单号模糊搜索 * @returns {Promise<{ list: Array, total: number }>} 标准化后的发货单列表 */ -export const fetchShippingOrderDetailList = async ({ status, page, pageSize, customer_id, shipping_no, start_date, end_date, association_order_no, logistics_no }) => { +export const fetchShippingOrderDetailList = async ({ status, page, pageSize, customer_id, shop_type, shipping_no, start_date, end_date, association_order_no, logistics_no }) => { const params = { status, page, page_size: pageSize, customer_id, + shop_type, shipping_no: shipping_no || undefined, start_date, end_date, diff --git a/src/utils/request.js b/src/utils/request.js index 7c24c5ab..654b5034 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -14,8 +14,8 @@ const USE_MOCK = false // 设置为true使用模拟数据 // 创建axios实例 const request = axios.create({ // baseURL: import.meta.env.DEV ? '/api' : (import.meta.env.VITE_API_BASE || 'http://127.0.0.1:9090/api'), - // baseURL: import.meta.env.DEV ? '/api' : (import.meta.env.VITE_API_BASE || 'http://192.168.101.213:9090/api'), - baseURL: import.meta.env.DEV ? '/api' : (import.meta.env.VITE_API_BASE || 'https://psi.api.buzhiyushu.cn/api'), + baseURL: import.meta.env.DEV ? '/api' : (import.meta.env.VITE_API_BASE || 'http://192.168.101.213:9090/api'), + // baseURL: import.meta.env.DEV ? '/api' : (import.meta.env.VITE_API_BASE || 'https://psi.api.buzhiyushu.cn/api'), timeout: 10000, // 用 JSONbig 替代默认 JSON.parse，保留大整数精度 transformResponse: [ diff --git a/src/views/admin/Dashboard.vue b/src/views/admin/Dashboard.vue index b68a39ec..c9e2fb73 100644 --- a/src/views/admin/Dashboard.vue +++ b/src/views/admin/Dashboard.vue @@ -130,7 +130,7 @@ @@ -361,6 +361,8 @@ const loadStoreInfo = async () => { params.store_name = storeName.value.trim() } storeInfo.value = await fetchStoreInfo(params) + console.log(storeInfo.value); + } catch (error) { console.error('加载店铺信息失败:', error) storeInfo.value = [] diff --git a/src/views/config/config.vue b/src/views/config/config.vue index f4b951b9..edbbc395 100644 --- a/src/views/config/config.vue +++ b/src/views/config/config.vue @@ -415,7 +415,10 @@ export default { /** 通过自定义协议启动核价器 exe */ const handleOpenExe = () => { - window.location.href = 'kfzprice://launch' + const url = dir.value + ? 'kfzprice://launch?dir=' + dir.value + : 'kfzprice://launch' + window.location.href = url ElMessage.success({ message: '启动指令已发送', duration: 1000, customClass: 'scan-success-message' }) } diff --git a/src/views/outbound/Outbound.vue b/src/views/outbound/Outbound.vue index 330bdd8a..c67f2b33 100644 --- a/src/views/outbound/Outbound.vue +++ b/src/views/outbound/Outbound.vue @@ -1,13 +1,24 @@