Browse Source

refactor(api): 统一接口返回类型为Promise并优化类型定义

yz 4 months ago
parent
commit
0f31ea49a9

+ 6 - 6
src/api/announcement/category.js

@@ -58,7 +58,7 @@ import request from '@/router/axios';
 
 /**
  * 获取分类列表
- * @returns {CategoryListResponse} 分类列表
+ * @returns {Promise<CategoryListResponse>} 分类列表
  * @throws {Error} 当请求失败时抛出错误
  * @example
  * // 获取所有分类
@@ -75,7 +75,7 @@ export const getCategoryList = () => {
 /**
  * 新增分类
  * @param {CategoryCreateParams} params - 分类参数
- * @returns {CategoryOperationResponse} 操作结果
+ * @returns {Promise<CategoryOperationResponse>} 操作结果
  * @throws {Error} 当请求失败或参数验证失败时抛出错误
  * @example
  * // 新增分类
@@ -104,7 +104,7 @@ export const addCategory = (params) => {
 /**
  * 更新分类
  * @param {CategoryUpdateParams} params - 分类信息(包含id)
- * @returns {CategoryOperationResponse} 操作结果
+ * @returns {Promise<CategoryOperationResponse>} 操作结果
  * @throws {Error} 当请求失败、参数验证失败或分类不存在时抛出错误
  * @example
  * // 更新分类
@@ -127,7 +127,7 @@ export const updateCategory = (params) => {
 /**
  * 删除分类
  * @param {string|number} ids - 分类ID,多个用逗号分隔
- * @returns {CategoryOperationResponse} 操作结果
+ * @returns {Promise<CategoryOperationResponse>} 操作结果
  * @throws {Error} 当请求失败或分类不存在时抛出错误
  * @example
  * // 删除单个分类
@@ -149,7 +149,7 @@ export const removeCategory = (ids) => {
 /**
  * 获取分类详情
  * @param {string|number} id - 分类ID
- * @returns {CategoryDetailResponse} 分类详情
+ * @returns {Promise<CategoryDetailResponse>} 分类详情
  * @throws {Error} 当请求失败或分类不存在时抛出错误
  * @example
  * // 获取分类详情
@@ -171,7 +171,7 @@ export const getCategoryDetail = (id) => {
  * 更新分类状态
  * @param {string|number} id - 分类ID
  * @param {0|1} status - 状态(0-禁用 1-启用)
- * @returns {CategoryOperationResponse} 操作结果
+ * @returns {Promise<CategoryOperationResponse>} 操作结果
  * @throws {Error} 当请求失败或分类不存在时抛出错误
  * @example
  * // 启用分类

+ 7 - 15
src/api/announcement/index.js

@@ -27,7 +27,7 @@ import { ANNOUNCEMENT_STATUS, ROLE_TYPES } from '@/views/announcement/constants'
  * @param {number} current - 当前页码(必须大于0)
  * @param {number} size - 每页大小(建议10-100之间)
  * @param {NoticeQueryParams} [params={}] - 查询参数
- * @returns {NoticeListResponse} 分页公告列表
+ * @returns {Promise<NoticeListResponse>} 分页公告列表
  * @throws {Error} 当请求失败时抛出错误
  * @example
  * // 获取第一页公告列表
@@ -49,7 +49,7 @@ export const getList = (current, size, params = /** @type {Partial<NoticeQueryPa
 /**
  * 新增公告
  * @param {NoticeFormData} row - 公告表单数据
- * @returns {NoticeOperationResponse} 操作结果
+ * @returns {Promise<NoticeOperationResponse>} 操作结果
  * @throws {Error} 当请求失败或数据验证失败时抛出错误
  * @example
  * // 新增公告
@@ -72,7 +72,7 @@ export const add = (row) => {
 /**
  * 修改公告
  * @param {NoticeFormData} row - 公告表单数据(必须包含id)
- * @returns {NoticeOperationResponse} 操作结果
+ * @returns {Promise<NoticeOperationResponse>} 操作结果
  * @throws {Error} 当请求失败、数据验证失败或公告不存在时抛出错误
  * @example
  * // 更新公告
@@ -94,7 +94,7 @@ export const update = (row) => {
 /**
  * 获取公告详情
  * @param {string} id - 公告ID(必填)
- * @returns {NoticeDetailResponse} 公告详情
+ * @returns {Promise<NoticeDetailResponse>} 公告详情
  * @throws {Error} 当请求失败或公告不存在时抛出错误
  * @example
  * // 获取公告详情
@@ -115,7 +115,7 @@ export const getAnnouncement = (id) => {
 
 /**
  * 获取经销商列表(保留兼容性)
- * @returns {DealerListResponse} 经销商列表
+ * @returns {Promise<DealerListResponse>} 经销商列表
  * @throws {Error} 当请求失败时抛出错误
  * @deprecated 建议使用更具体的经销商API
  */
@@ -127,16 +127,8 @@ export const getDealerList = () => {
 };
 
 /**
- * 品牌选项类型
- * @typedef {Object} BrandOption
- * @property {string} id - 品牌ID
- * @property {string} name - 品牌名称
- * @property {string} [code] - 品牌编码
- */
-
-/**
  * 获取品牌列表(保留兼容性)
- * @returns {BrandListResponse} 品牌列表
+ * @returns {Promise<BrandListResponse>} 品牌列表
  * @throws {Error} 当请求失败时抛出错误
  * @deprecated 建议使用更具体的品牌API
  */
@@ -159,7 +151,7 @@ export const getBrandList = () => {
 
 /**
  * 获取分类列表
- * @returns {CategoryListResponse} 分类列表
+ * @returns {Promise<CategoryListResponse>} 分类列表
  * @throws {Error} 当请求失败时抛出错误
  * @example
  * // 获取分类列表

+ 5 - 5
src/api/complaint/reply.js

@@ -14,7 +14,7 @@ import request from '@/router/axios';
 /**
  * 获取投诉回复列表
  * @param {ComplaintReplyQueryParams} params - 查询参数
- * @returns {ComplaintReplyListResponse} 分页结果
+ * @returns {Promise<ComplaintReplyListResponse>} 分页结果
  */
 export const getReplyList = (params) => {
   return request({
@@ -27,7 +27,7 @@ export const getReplyList = (params) => {
 /**
  * 获取投诉回复详情
  * @param {string} replyId - 回复ID
- * @returns {ComplaintReplyDetailResponse} 回复详情
+ * @returns {Promise<ComplaintReplyDetailResponse>} 回复详情
  */
 export const getReplyDetail = (replyId) => {
   return request({
@@ -39,7 +39,7 @@ export const getReplyDetail = (replyId) => {
 /**
  * 新增投诉回复
  * @param {ComplaintReplyFormData} row - 回复表单数据
- * @returns {ComplaintReplySaveResponse} 操作结果
+ * @returns {Promise<ComplaintReplySaveResponse>} 操作结果
  */
 export const addReply = (row) => {
   return request({
@@ -52,7 +52,7 @@ export const addReply = (row) => {
 /**
  * 修改投诉回复
  * @param {ComplaintReplyFormData} row - 回复表单数据
- * @returns {ComplaintReplySaveResponse} 操作结果
+ * @returns {Promise<ComplaintReplySaveResponse>} 操作结果
  */
 export const updateReply = (row) => {
   return request({
@@ -65,7 +65,7 @@ export const updateReply = (row) => {
 /**
  * 删除投诉回复
  * @param {string} ids - 回复ID列表,多个用逗号分隔
- * @returns {ComplaintReplyDeleteResponse} 操作结果
+ * @returns {Promise<ComplaintReplyDeleteResponse>} 操作结果
  */
 export const removeReply = (ids) => {
   return request({

+ 20 - 10
src/api/forecast/forecast-summary.js

@@ -1,14 +1,24 @@
 // @ts-check
 import request from '@/router/axios'
 
-// 导入类型定义
+/**
+ * @typedef {import('../types/forecast').ForecastSummaryQueryParams} ForecastSummaryQueryParams
+ * @typedef {import('../types/forecast').ForecastSummaryForm} ForecastSummaryForm
+ * @typedef {import('../types/forecast').ForecastSummaryRecord} ForecastSummaryRecord
+ * @typedef {import('../types/forecast').ForecastSummaryListResponse} ForecastSummaryListResponse
+ * @typedef {import('../types/forecast').ForecastSummaryOperationResponse} ForecastSummaryOperationResponse
+ * @typedef {import('../types/forecast').ForecastSummaryBatchOperationResponse} ForecastSummaryBatchOperationResponse
+ * @typedef {import('../types/forecast').ForecastSummaryItem} ForecastSummaryItem
+ * @typedef {import('../types/forecast').ApiResponse} ApiResponse
+ * @typedef {import('../types/forecast').ForecastSummaryPageResponse} ForecastSummaryPageResponse
+ */
 
 /**
  * 获取预测汇总列表
  * @param {number} [current=1] - 当前页码
  * @param {number} [size=10] - 每页数量
- * @param {import('../types/forecast').ForecastSummaryQueryParams} [params={}] - 查询参数
- * @returns {Promise<import('../types/forecast').ForecastSummaryListResponse>} 预测汇总列表响应
+ * @param {ForecastSummaryQueryParams} [params={}] - 查询参数
+ * @returns {Promise<ForecastSummaryListResponse>} 预测汇总列表响应
  * @description 获取经销商销售预测汇总列表,支持多条件查询和分页
  * @example
  * // 获取第一页10条数据
@@ -38,7 +48,7 @@ export const getForecastSummaryList = async (current = 1, size = 10, params = {}
 /**
  * 获取预测汇总详情
  * @param {string|number} forecastSummaryId - 预测汇总ID
- * @returns {Promise<import('../types/forecast').ForecastSummaryOperationResponse>} 预测汇总详情响应
+ * @returns {Promise<ForecastSummaryOperationResponse>} 预测汇总详情响应
  * @description 根据ID获取预测汇总的详细信息
  * @example
  * const result = await getForecastSummaryDetail('1954819531796865026')
@@ -58,8 +68,8 @@ export const getForecastSummaryDetail = async (forecastSummaryId) => {
 
 /**
  * 添加预测汇总
- * @param {import('../types/forecast').ForecastSummaryForm} data - 预测汇总表单数据
- * @returns {Promise<import('../types/forecast').ForecastSummaryOperationResponse>} 添加预测汇总响应
+ * @param {ForecastSummaryForm} data - 预测汇总表单数据
+ * @returns {Promise<ForecastSummaryOperationResponse>} 添加预测汇总响应
  * @description 创建新的销售预测汇总记录
  * @example
  * const formData = {
@@ -92,7 +102,7 @@ export const addForecastSummary = async (data) => {
 /**
  * 更新预测汇总
  * @param {Object} data - 预测汇总表单数据(必须包含id)
- * @returns {Promise<import('../types/forecast').ForecastSummaryOperationResponse>} 更新预测汇总响应
+ * @returns {Promise<ForecastSummaryOperationResponse>} 更新预测汇总响应
  * @description 更新现有的销售预测汇总记录
  * @example
  * const formData = {
@@ -126,7 +136,7 @@ export const updateForecastSummary = async (data) => {
 /**
  * 删除预测汇总
  * @param {string|number} id - 预测汇总ID
- * @returns {Promise<import('../types/forecast').ForecastSummaryOperationResponse>} 删除预测汇总响应
+ * @returns {Promise<ForecastSummaryOperationResponse>} 删除预测汇总响应
  * @description 根据ID删除销售预测汇总记录
  * @example
  * const result = await removeForecastSummary('1954819531796865026')
@@ -141,7 +151,7 @@ export const removeForecastSummary = async (id) => {
 /**
  * 批量删除预测汇总
  * @param {Array<string|number>} ids - 预测汇总ID数组
- * @returns {Promise<import('../types/forecast').ForecastSummaryBatchOperationResponse>} 批量删除预测汇总响应
+ * @returns {Promise<ForecastSummaryBatchOperationResponse>} 批量删除预测汇总响应
  * @description 批量删除多个销售预测汇总记录
  * @example
  * const result = await batchRemoveForecastSummary(['1954819531796865026', '1954819531796865027'])
@@ -160,7 +170,7 @@ export const batchRemoveForecastSummary = async (ids) => {
  * @param {string|number} data.id - 预测汇总ID
  * @param {number} data.approvalStatus - 审批状态 1-通过 2-拒绝
  * @param {string} [data.approvalComment] - 审批意见
- * @returns {Promise<import('../types/forecast').ForecastSummaryOperationResponse>} 审批预测汇总响应
+ * @returns {Promise<ForecastSummaryOperationResponse>} 审批预测汇总响应
  * @description 审批销售预测汇总记录
  * @example
  * const result = await approveForecastSummary({ id: '1954819531796865026', approvalStatus: 1, approvalComment: '同意申报' })

+ 7 - 7
src/api/forecast/index.js

@@ -15,7 +15,7 @@ import request from '@/router/axios'
  * @param {number} [current=1] - 当前页码
  * @param {number} [size=10] - 每页数量
  * @param {ForecastQueryParams} [params={}] - 查询参数
- * @returns {ForecastListResponse} 分页查询结果响应
+ * @returns {Promise<ForecastListResponse>} 分页查询结果响应
  * @description 分页查询经销商销售预测申报列表,支持多种筛选条件
  * @example
  * // 基础查询
@@ -42,7 +42,7 @@ export const getForecastList = async (current = 1, size = 10, params = {}) => {
 /**
  * 添加预测申报
  * @param {ForecastForm} data - 预测申报表单数据
- * @returns {ForecastOperationResponse} 添加结果响应
+ * @returns {Promise<ForecastOperationResponse>} 添加结果响应
  * @description 创建新的经销商销售预测申报记录
  * @example
  * const formData = {
@@ -76,7 +76,7 @@ export const addForecast = async (data) => {
 /**
  * 修改预测申报
  * @param {ForecastForm} data - 预测申报表单数据(必须包含id)
- * @returns {ForecastOperationResponse} 修改结果响应
+ * @returns {Promise<ForecastOperationResponse>} 修改结果响应
  * @description 更新现有的经销商销售预测申报记录,只有未审批状态的记录可以修改
  * @example
  * const formData = {
@@ -114,7 +114,7 @@ export const updateForecast = async (data) => {
 /**
  * 获取预测申报详情
  * @param {string|number} id - 预测申报ID
- * @returns {ForecastOperationResponse} 预测申报详情响应
+ * @returns {Promise<ForecastOperationResponse>} 预测申报详情响应
  * @description 根据ID获取预测申报的详细信息
  * @example
  * const result = await getForecastDetail('1954789198347063298')
@@ -129,7 +129,7 @@ export const getForecastDetail = async (id) => {
 /**
  * 删除预测申报
  * @param {string|number} id - 预测申报ID
- * @returns {ForecastOperationResponse} 删除结果响应
+ * @returns {Promise<ForecastOperationResponse>} 删除结果响应
  * @description 根据ID删除预测申报记录
  * @example
  * const result = await removeForecast('1954789198347063298')
@@ -144,7 +144,7 @@ export const removeForecast = async (id) => {
 /**
  * 批量删除预测申报
  * @param {Array<string|number>} ids - 预测申报ID数组
- * @returns {ForecastBatchOperationResponse} 批量删除结果响应
+ * @returns {Promise<ForecastBatchOperationResponse>} 批量删除结果响应
  * @description 批量删除多个预测申报记录
  * @example
  * const result = await batchRemoveForecast(['1954789198347063298', '1954789198347063299'])
@@ -163,7 +163,7 @@ export const batchRemoveForecast = async (ids) => {
  * @param {string|number} data.id - 预测申报ID
  * @param {number} data.approvalStatus - 审批状态 1-通过 2-拒绝
  * @param {string} [data.approvalComment] - 审批意见
- * @returns {ForecastOperationResponse} 审批结果响应
+ * @returns {Promise<ForecastOperationResponse>} 审批结果响应
  * @description 审批预测申报记录
  * @example
  * const result = await approveForecast({ id: '1954789198347063298', approvalStatus: 1, approvalComment: '同意申报' })

+ 4 - 4
src/api/order/order-item.js

@@ -16,7 +16,7 @@ import request from '@/router/axios';
  * @param {number} current - 当前页码
  * @param {number} size - 每页大小
  * @param {OrderItemQueryParams} params - 查询参数
- * @returns {OrderItemListResponse} 分页查询结果
+ * @returns {Promise<OrderItemListResponse>} 分页查询结果
  */
 export const getList = async (current, size, params) => {
   return request({
@@ -33,7 +33,7 @@ export const getList = async (current, size, params) => {
 /**
  * 新增订单明细
  * @param {SalesOrderItemCreateForm} row - 订单明细表单数据
- * @returns {OrderItemOperationResponse} 新增结果
+ * @returns {Promise<OrderItemOperationResponse>} 新增结果
  */
 export const add = async (row) => {
   return request({
@@ -46,7 +46,7 @@ export const add = async (row) => {
 /**
  * 更新订单明细
  * @param {SalesOrderItemCreateForm} row - 订单明细表单数据
- * @returns {OrderItemOperationResponse} 更新结果
+ * @returns {Promise<OrderItemOperationResponse>} 更新结果
  */
 export const update = async (row) => {
   return request({
@@ -59,7 +59,7 @@ export const update = async (row) => {
 /**
  * 获取订单明细详情
  * @param {string | number} id - 明细ID
- * @returns {OrderItemDetailResponse} 明细详情
+ * @returns {Promise<OrderItemDetailResponse>} 明细详情
  */
 export const getDetail = async (id) => {
   return request({

+ 5 - 5
src/api/order/order.js

@@ -17,7 +17,7 @@ import request from '@/router/axios';
  * @param {number} current - 当前页码
  * @param {number} size - 每页大小
  * @param {OrderQueryParams} params - 查询参数
- * @returns {OrderListResponse}
+ * @returns {Promise<OrderListResponse>}
  */
 export const getList = async (current, size, params) => {
   return request({
@@ -34,7 +34,7 @@ export const getList = async (current, size, params) => {
 /**
  * 新增订单
  * @param {OrderForm} row - 订单表单数据
- * @returns {OrderOperationResponse}
+ * @returns {Promise<OrderOperationResponse>}
  */
 export const add = async (row) => {
   return request({
@@ -47,7 +47,7 @@ export const add = async (row) => {
 /**
  * 更新订单
  * @param {OrderForm} row - 订单表单数据
- * @returns {OrderOperationResponse}
+ * @returns {Promise<OrderOperationResponse>}
  */
 export const update = async (row) => {
   return request({
@@ -60,7 +60,7 @@ export const update = async (row) => {
 /**
  * 获取订单详情
  * @param {string | number} id - 订单ID
- * @returns {OrderDetailResponse}
+ * @returns {Promise<OrderDetailResponse>}
  */
 export const getDetail = async (id) => {
   return request({
@@ -72,7 +72,7 @@ export const getDetail = async (id) => {
 /**
  * 获取客户地址列表
  * @param {string} customerCode - 客户编码
- * @returns {CustomerAddressListResponse}
+ * @returns {Promise<CustomerAddressListResponse>}
  */
 export const getCustomerAddressList = async (customerCode) => {
   return request({

+ 16 - 16
src/api/order/sales-order.js

@@ -13,7 +13,7 @@ import request from '@/router/axios'
  * @param {number} current - 当前页码
  * @param {number} size - 每页大小
  * @param {Object} params - 查询参数
- * @returns {AxiosResponse} 分页查询结果
+ * @returns {Promise<AxiosResponse>} 分页查询结果
  */
 export const getInventoryList = async (current, size, params) => {
   return request({
@@ -30,7 +30,7 @@ export const getInventoryList = async (current, size, params) => {
 /**
  * 获取库存详情
  * @param {string | number} id - 库存记录ID
- * @returns {AxiosResponse} 库存详情
+ * @returns {Promise<AxiosResponse>} 库存详情
  */
 export const getInventoryDetail = async (id) => {
   return request({
@@ -42,7 +42,7 @@ export const getInventoryDetail = async (id) => {
 /**
  * 获取完整库存列表(不分页)
  * @param {Object} params - 查询参数
- * @returns {AxiosResponse} 库存列表
+ * @returns {Promise<AxiosResponse>} 库存列表
  */
 export const getInventoryFullList = async (params) => {
   return request({
@@ -57,7 +57,7 @@ export const getInventoryFullList = async (params) => {
  * @param {number} current - 当前页码
  * @param {number} size - 每页大小
  * @param {Object} params - 查询参数
- * @returns {AxiosResponse} 分页查询结果
+ * @returns {Promise<AxiosResponse>} 分页查询结果
  */
 export const getMaterialList = async (current, size, params) => {
   return request({
@@ -74,7 +74,7 @@ export const getMaterialList = async (current, size, params) => {
 /**
  * 获取物料档案详情
  * @param {string | number} id - 物料ID
- * @returns {AxiosResponse} 物料详情
+ * @returns {Promise<AxiosResponse>} 物料详情
  */
 export const getMaterialDetail = async (id) => {
   return request({
@@ -86,7 +86,7 @@ export const getMaterialDetail = async (id) => {
 /**
  * 获取完整物料档案列表(不分页)
  * @param {Object} params - 查询参数
- * @returns {AxiosResponse} 物料列表
+ * @returns {Promise<AxiosResponse>} 物料列表
  */
 export const getMaterialFullList = async (params) => {
   return request({
@@ -99,7 +99,7 @@ export const getMaterialFullList = async (params) => {
 /**
  * 添加订单明细
  * @param {SalesOrderItemCreateForm} row - 订单明细数据
- * @returns {OrderOperationResponse} 添加结果
+ * @returns {Promise<OrderOperationResponse>} 添加结果
  */
 export const addOrderItem = async (row) => {
   return request({
@@ -112,7 +112,7 @@ export const addOrderItem = async (row) => {
 /**
  * 更新订单明细
  * @param {SalesOrderItemCreateForm} row - 订单明细数据
- * @returns {OrderOperationResponse} 更新结果
+ * @returns {Promise<OrderOperationResponse>} 更新结果
  */
 export const updateOrderItem = async (row) => {
   return request({
@@ -125,7 +125,7 @@ export const updateOrderItem = async (row) => {
 /**
  * 更新订单
  * @param {SalesOrderCreateForm} row - 订单数据
- * @returns {OrderOperationResponse} 更新结果
+ * @returns {Promise<OrderOperationResponse>} 更新结果
  */
 export const updateOrder = async (row) => {
   return request({
@@ -138,7 +138,7 @@ export const updateOrder = async (row) => {
 /**
  * 创建销售订单(包含订单明细)
  * @param {SalesOrderCreateForm} data - 销售订单创建表单数据
- * @returns {SalesOrderCreateResponse} 创建结果
+ * @returns {Promise<SalesOrderCreateResponse>} 创建结果
  */
 export const createSalesOrder = async (data) => {
   return request({
@@ -151,7 +151,7 @@ export const createSalesOrder = async (data) => {
 /**
  * 根据PID获取PC Blade发货跟踪信息
  * @param {string} pid - 产品ID或订单ID
- * @returns {AxiosResponse} PC Blade发货跟踪信息
+ * @returns {Promise<AxiosResponse>} PC Blade发货跟踪信息
  */
 export const getPcBladeShipmentTrackingByPid = async (pid) => {
   return request({
@@ -166,7 +166,7 @@ export const getPcBladeShipmentTrackingByPid = async (pid) => {
 /**
  * 根据CID获取PC Blade发货跟踪信息
  * @param {string} cid - 客户ID
- * @returns {AxiosResponse} PC Blade发货跟踪信息
+ * @returns {Promise<AxiosResponse>} PC Blade发货跟踪信息
  */
 export const getPcBladeShipmentTrackingByCid = async (cid) => {
   return request({
@@ -181,7 +181,7 @@ export const getPcBladeShipmentTrackingByCid = async (cid) => {
 /**
  * 根据订单ID获取PC Blade订单发货信息
  * @param {number} orderId - 订单ID
- * @returns {AxiosResponse} 订单发货信息
+ * @returns {Promise<AxiosResponse>} 订单发货信息
  */
 export const getPcBladeOrderShipmentByOrderId = async (orderId) => {
   return request({
@@ -196,7 +196,7 @@ export const getPcBladeOrderShipmentByOrderId = async (orderId) => {
 /**
  * 根据订单代码获取PC Blade订单发货信息
  * @param {string} orderCode - 订单代码
- * @returns {AxiosResponse} 订单发货信息
+ * @returns {Promise<AxiosResponse>} 订单发货信息
  */
 export const getPcBladeOrderShipmentByOrderCode = async (orderCode) => {
   return request({
@@ -211,7 +211,7 @@ export const getPcBladeOrderShipmentByOrderCode = async (orderCode) => {
 /**
  * 根据订单ID获取PC Blade订单发票信息
  * @param {number} orderId - 订单ID
- * @returns {AxiosResponse} 订单发票信息
+ * @returns {Promise<AxiosResponse>} 订单发票信息
  */
 export const getPcBladeOrderInvoiceByIdFind = async (orderId) => {
   return request({
@@ -226,7 +226,7 @@ export const getPcBladeOrderInvoiceByIdFind = async (orderId) => {
 /**
  * 根据订单编码获取PC Blade订单发票信息
  * @param {string} orderCode - 订单编码
- * @returns {AxiosResponse} 订单发票信息
+ * @returns {Promise<AxiosResponse>} 订单发票信息
  */
 export const getPcBladeOrderInvoiceByCodeFind = async (orderCode) => {
   return request({

+ 12 - 16
src/api/shipment/index.js

@@ -5,19 +5,15 @@
 import request from '@/router/axios'
 
 /**
- * @typedef {import('@/api/shipment/types').ShipmentQueryParams} ShipmentQueryParams
- * @typedef {import('@/api/shipment/types').ShipmentRecord} ShipmentRecord
- * @typedef {import('@/api/shipment/types').ShipmentItem} ShipmentItem
- * @typedef {import('@/api/shipment/types').TrackingRecord} TrackingRecord
- * @typedef {import('@/api/shipment/types').ShipmentListResponse} ShipmentListResponse
- * @typedef {import('@/api/shipment/types').ShipmentItemListResponse} ShipmentItemListResponse
- * @typedef {import('@/api/shipment/types').TrackingListResponse} TrackingListResponse
- * @typedef {import('@/api/shipment/types').OrderShipmentItem} OrderShipmentItem
- * @typedef {import('@/api/shipment/types').ShipmentItemDetail} ShipmentItemDetail
- * @typedef {import('@/api/shipment/types').ShipmentTrackingInfo} ShipmentTrackingInfo
- * @typedef {import('@/api/shipment/types').OrderShipmentQueryParams} OrderShipmentQueryParams
- * @typedef {import('@/api/shipment/types').ShipmentItemQueryParams} ShipmentItemQueryParams
- * @typedef {import('@/api/shipment/types').ShipmentTrackingQueryParams} ShipmentTrackingQueryParams
+ * @typedef {import('@/api/types/shipment').ShipmentQueryParams} ShipmentQueryParams
+ * @typedef {import('@/api/types/shipment').ShipmentRecord} ShipmentRecord
+ * @typedef {import('@/api/types/shipment').ShipmentItem} ShipmentItem
+ * @typedef {import('@/api/types/shipment').TrackingRecord} TrackingRecord
+ * @typedef {import('@/api/types/shipment').ShipmentListResponse} ShipmentListResponse
+ * @typedef {import('@/api/types/shipment').ShipmentItemListResponse} ShipmentItemListResponse
+ * @typedef {import('@/api/types/shipment').TrackingListResponse} TrackingListResponse
+ * @typedef {import('@/api/types/shipment').ShipmentFormData} ShipmentItemQueryParams
+ * @typedef {import('@/api/types/shipment').TrackingFormData} ShipmentTrackingQueryParams
  */
 
 
@@ -25,7 +21,7 @@ import request from '@/router/axios'
 /**
  * 获取订单发货主表列表
  * @param {ShipmentQueryParams} params - 查询参数
- * @returns {Promise<AxiosResponse<ApiResponse<ShipmentListResponse>>>}
+ * @returns {Promise<ShipmentListResponse>}
  */
 export const getOrderShipmentList = async (params) => {
   return request({
@@ -38,7 +34,7 @@ export const getOrderShipmentList = async (params) => {
 /**
  * 获取发货单明细列表
  * @param {ShipmentItemQueryParams} params - 查询参数
- * @returns {Promise<AxiosResponse<ApiResponse<ShipmentItemListResponse>>>}
+ * @returns {Promise<ShipmentItemListResponse>}
  */
 export const getShipmentItemList = async (params) => {
   return request({
@@ -51,7 +47,7 @@ export const getShipmentItemList = async (params) => {
 /**
  * 获取物流跟踪信息列表
  * @param {ShipmentTrackingQueryParams} params - 查询参数
- * @returns {Promise<AxiosResponse<ApiResponse<TrackingListResponse>>>}
+ * @returns {Promise<TrackingListResponse>}
  */
 export const getShipmentTrackingList = async (params) => {
   return request({

+ 14 - 13
src/api/shipment/shipment-tracking.js

@@ -5,10 +5,11 @@
 import request from '@/router/axios'
 
 /**
- * @typedef {import('@/api/shipment/types').ShipmentTrackingQueryParams} ShipmentTrackingQueryParams
- * @typedef {import('@/api/shipment/types').TrackingRecord} ShipmentTrackingRecord
- * @typedef {import('@/api/shipment/types').ShipmentTrackingForm} ShipmentTrackingForm
- * @typedef {import('@/api/shipment/types').ShipmentTrackingDetail} ShipmentTrackingDetail
+ * @typedef {import('@/api/types/shipment').TrackingFormData} ShipmentTrackingQueryParams
+ * @typedef {import('@/api/types/shipment').TrackingRecord} ShipmentTrackingRecord
+ * @typedef {import('@/api/types/shipment').TrackingFormData} ShipmentTrackingForm
+ * @typedef {import('@/api/types/shipment').TrackingSaveResponse} TrackingSaveResponse
+ * @typedef {import('@/api/types/shipment').TrackingDeleteResponse} TrackingDeleteResponse
  */
 
 /**
@@ -16,7 +17,7 @@ import request from '@/router/axios'
  * @param {number} current - 当前页码
  * @param {number} size - 每页大小
  * @param {ShipmentTrackingQueryParams} params - 查询参数
- * @returns {Promise<AxiosResponse<ApiResponse<PageResult<ShipmentTrackingRecord>>>>} 分页查询结果
+ * @returns {Promise<TrackingSaveResponse>} 分页查询结果
  */
 export const getList = async (current, size, params) => {
   return request({
@@ -33,7 +34,7 @@ export const getList = async (current, size, params) => {
 /**
  * 添加物流跟踪记录
  * @param {ShipmentTrackingForm} row - 物流跟踪表单数据
- * @returns {Promise<AxiosResponse<ApiResponse<boolean>>>} 添加结果
+ * @returns {Promise<TrackingSaveResponse>} 添加结果
  */
 export const add = async (row) => {
   return request({
@@ -46,7 +47,7 @@ export const add = async (row) => {
 /**
  * 修改物流跟踪记录
  * @param {ShipmentTrackingForm} row - 物流跟踪表单数据
- * @returns {Promise<AxiosResponse<ApiResponse<boolean>>>} 修改结果
+ * @returns {Promise<TrackingSaveResponse>} 修改结果
  */
 export const update = async (row) => {
   return request({
@@ -59,7 +60,7 @@ export const update = async (row) => {
 /**
  * 删除物流跟踪记录
  * @param {string} ids - 要删除的ID,多个用逗号分隔
- * @returns {Promise<AxiosResponse<ApiResponse<boolean>>>} 删除结果
+ * @returns {Promise<TrackingDeleteResponse>} 删除结果
  */
 export const remove = async (ids) => {
   return request({
@@ -74,7 +75,7 @@ export const remove = async (ids) => {
 /**
  * 获取物流跟踪记录详情
  * @param {string|number} id - 跟踪记录ID
- * @returns {Promise<AxiosResponse<ApiResponse<ShipmentTrackingRecord>>>} 物流跟踪记录详情
+ * @returns {Promise<TrackingSaveResponse>} 物流跟踪记录详情
  */
 export const getDetail = async (id) => {
   return request({
@@ -86,7 +87,7 @@ export const getDetail = async (id) => {
 /**
  * 根据物流单号获取跟踪详情
  * @param {string} trackingNo - 物流单号
- * @returns {Promise<AxiosResponse<ApiResponse<ShipmentTrackingDetail>>>} 物流跟踪详情
+ * @returns {Promise<TrackingSaveResponse>} 物流跟踪详情
  */
 export const getTrackingDetail = async (trackingNo) => {
   return request({
@@ -101,7 +102,7 @@ export const getTrackingDetail = async (trackingNo) => {
 /**
  * 根据发货单ID获取跟踪记录列表
  * @param {string|number} shipmentId - 发货单ID
- * @returns {Promise<AxiosResponse<ApiResponse<Array<ShipmentTrackingRecord>>>>} 跟踪记录列表
+ * @returns {Promise<TrackingSaveResponse>} 跟踪记录列表
  */
 export const getTrackingByShipmentId = async (shipmentId) => {
   return request({
@@ -116,7 +117,7 @@ export const getTrackingByShipmentId = async (shipmentId) => {
 /**
  * 根据订单ID获取跟踪记录列表
  * @param {string|number} orderId - 订单ID
- * @returns {Promise<AxiosResponse<ApiResponse<Array<ShipmentTrackingRecord>>>>} 跟踪记录列表
+ * @returns {Promise<TrackingSaveResponse>} 跟踪记录列表
  */
 export const getTrackingByOrderId = async (orderId) => {
   return request({
@@ -132,7 +133,7 @@ export const getTrackingByOrderId = async (orderId) => {
  * 同步物流信息
  * @param {string} trackingNo - 物流单号
  * @param {string} logisticsCompanyCode - 物流公司编码
- * @returns {Promise<AxiosResponse<ApiResponse<boolean>>>} 同步结果
+ * @returns {Promise<TrackingSaveResponse>} 同步结果
  */
 export const syncTrackingInfo = async (trackingNo, logisticsCompanyCode) => {
   return request({

+ 0 - 240
src/api/shipment/types.d.ts

@@ -1,240 +0,0 @@
-/**
- * 发货管理模块类型定义
- */
-
-/**
- * 发货查询参数
- */
-export interface ShipmentQueryParams {
-  current: number
-  size: number
-  shipmentNo?: string
-  orderCode?: string
-  carrierName?: string
-  shipmentStatus?: number
-}
-
-/**
- * 发货记录
- */
-export interface ShipmentRecord {
-  id: string
-  shipmentNo: string
-  orderId: number
-  orderCode: string
-  shipmentDate: string
-  carrierId: number
-  carrierName: string
-  trackingNo: string
-  shippingMethod: string
-  shipmentStatus: number
-  totalPackages: number
-  totalWeight: string
-  totalVolume: string
-  shipperId: number
-  shipperName: string
-  createUser: string
-  createDept: string
-  createTime: string
-  updateUser: string
-  updateTime: string
-  status: number
-  isDeleted: number
-}
-
-/**
- * 发货明细项
- */
-export interface ShipmentItem {
-  id: string
-  shipmentId: number
-  shipmentNo: string
-  orderId: number
-  orderItemId: number
-  itemId: number
-  itemCode: string
-  itemName: string
-  specs: string
-  shippedQuantity: string
-  packageNo: string
-  batchNo: string
-  createUser: string
-  createDept: string
-  createTime: string
-  updateUser: string
-  updateTime: string
-  status: number
-  isDeleted: number
-}
-
-/**
- * 物流跟踪记录
- */
-export interface TrackingRecord {
-  id: string
-  shipmentId: number
-  shipmentNo: string
-  trackingNo: string
-  trackingStatus: string
-  location: string
-  eventTime: string
-  eventDesc: string
-  isException: number
-  exceptionType: string
-  createUser: string
-  createDept: string
-  createTime: string
-  updateUser: string
-  updateTime: string
-  status: number
-  isDeleted: number
-}
-
-/**
- * 发货明细查询参数
- */
-export interface ShipmentItemQueryParams {
-  current: number
-  size: number
-  shipmentNo?: string
-  itemCode?: string
-  itemName?: string
-}
-
-/**
- * 物流跟踪查询参数
- */
-export interface ShipmentTrackingQueryParams {
-  current: number
-  size: number
-  shipmentNo?: string
-  trackingNo?: string
-  trackingStatus?: string
-}
-
-/**
- * 发货列表响应
- */
-export interface ShipmentListResponse extends PageResult<ShipmentRecord> {}
-
-/**
- * 发货明细列表响应
- */
-export interface ShipmentItemListResponse extends PageResult<ShipmentItem> {}
-
-/**
- * 物流跟踪列表响应
- */
-export interface TrackingListResponse extends PageResult<TrackingRecord> {}
-
-/**
- * 订单发货主表数据
- */
-export interface OrderShipmentItem {
-  id: string
-  shipmentNo: string
-  orderId: number
-  orderCode: string
-  shipmentDate: string
-  carrierId: number
-  carrierName: string
-  trackingNo: string
-  shippingMethod: string
-  shipmentStatus: number
-  totalPackages: number
-  totalWeight: string
-  totalVolume: string
-  shipperId: number
-  shipperName: string
-}
-
-/**
- * 发货单明细数据
- */
-export interface ShipmentItemDetail {
-  id: string
-  shipmentId: number
-  shipmentNo: string
-  orderId: number
-  orderItemId: number
-  itemId: number
-  itemCode: string
-  itemName: string
-  specs: string
-  shippedQuantity: string
-  packageNo: string
-  batchNo: string
-}
-
-/**
- * 物流跟踪信息
- */
-export interface ShipmentTrackingInfo {
-  id: string
-  shipmentId: number
-  shipmentNo: string
-  trackingNo: string
-  trackingStatus: string
-  location: string
-  eventTime: string
-  eventDesc: string
-  isException: number
-  exceptionType: string
-}
-
-/**
- * 物流跟踪表单数据
- */
-export interface ShipmentTrackingForm {
-  id?: string | number
-  shipmentId: string | number
-  shipmentNo: string
-  orderId: string | number
-  orderNo: string
-  trackingNo: string
-  logisticsCompany: string
-  logisticsCompanyCode: string
-  status: string
-  statusDesc: string
-  location?: string
-  operateTime?: string
-  operator?: string
-  remark?: string
-}
-
-/**
- * 物流跟踪详情
- */
-export interface ShipmentTrackingDetail {
-  trackingNo: string
-  logisticsCompany: string
-  logisticsCompanyCode: string
-  currentStatus: string
-  currentLocation: string
-  lastUpdateTime: string
-  trackingSteps: ShipmentTrackingStep[]
-}
-
-/**
- * 物流跟踪步骤
- */
-export interface ShipmentTrackingStep {
-  time: string
-  status: string
-  statusDesc: string
-  location: string
-  operator?: string
-  remark?: string
-}
-
-/**
- * 订单发货查询参数
- */
-export interface OrderShipmentQueryParams {
-  current: number
-  size: number
-  shipmentNo?: string
-  orderCode?: string
-  carrierName?: string
-  shipmentStatus?: number
-}

+ 6 - 1
src/api/types/forecast.d.ts

@@ -317,11 +317,16 @@ export type ForecastSummaryListResponse = AxiosResponse<ApiResponse<PageResult<F
 export type ForecastBatchOperationResponse = AxiosResponse<ApiResponse<boolean>>;
 
 /**
- * 销售预测汇总批量操作响应接口
+ * 销售预测汇总批量操作响应类型
  */
 export type ForecastSummaryBatchOperationResponse = AxiosResponse<ApiResponse<boolean>>;
 
 /**
+ * 销售预测汇总分页响应类型
+ */
+export type ForecastSummaryPageResponse = AxiosResponse<ApiResponse<PageResult<ForecastSummaryItem>>>;
+
+/**
  * 下拉选择器选项接口
  */
 export interface SelectOption<T = any> {