Pārlūkot izejas kodu

refactor(order): 统一类型定义从keyof到实际类型

yz 1 mēnesi atpakaļ
vecāks
revīzija
5cc5ff0134

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

@@ -14,7 +14,7 @@ import { ORDER_ITEM_STATUS } from '@/constants';
  * @property {string} [mainItemCategoryName] - 主物料分类名称
  * @property {string|number} [warehouseId] - 仓库ID
  * @property {string} [warehouseName] - 仓库名称
- * @property {keyof typeof ORDER_ITEM_STATUS} [itemStatus] - 明细状态
+ * @property {typeof ORDER_ITEM_STATUS[keyof typeof ORDER_ITEM_STATUS]} [itemStatus] - 明细状态
  */
 
 /**
@@ -38,7 +38,7 @@ import { ORDER_ITEM_STATUS } from '@/constants';
  * @property {string|number} taxRate - 税率
  * @property {string|number} taxAmount - 税额
  * @property {string|number} totalAmount - 总金额
- * @property {keyof typeof ORDER_ITEM_STATUS} itemStatus - 明细状态
+ * @property {typeof ORDER_ITEM_STATUS[keyof typeof ORDER_ITEM_STATUS]} itemStatus - 明细状态
  */
 
 /**
@@ -69,7 +69,7 @@ import { ORDER_ITEM_STATUS } from '@/constants';
  * @property {string} taxRate - 税率
  * @property {string} taxAmount - 税额
  * @property {string} totalAmount - 总金额
- * @property {keyof typeof ORDER_ITEM_STATUS} itemStatus - 明细状态
+ * @property {typeof ORDER_ITEM_STATUS[keyof typeof ORDER_ITEM_STATUS]} itemStatus - 明细状态
  */
 
 /**

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

@@ -76,7 +76,7 @@ export const getDetail = (id) => {
 /**
  * 获取客户地址列表
  * @param {string} customerCode - 客户编码
- * @returns {Promise<AxiosResponse<PageResult<CustomerAddressOption>>>} 客户地址列表响应
+ * @returns {Promise<AxiosResponse<CustomerAddressOption[]>>} 客户地址列表响应
  */
 export const getCustomerAddressList = (customerCode) => {
   return request({
@@ -97,8 +97,8 @@ export const getCustomerAddressList = (customerCode) => {
  * @property {string} [orgName] - 组织名称
  * @property {string} [customerCode] - 客户编码
  * @property {string} [customerName] - 客户名称
- * @property {keyof typeof ORDER_TYPES} [orderType] - 订单类型
- * @property {keyof typeof ORDER_STATUS} [status] - 订单状态
+ * @property {typeof ORDER_TYPES[keyof typeof ORDER_TYPES]} [orderType] - 订单类型
+ * @property {typeof ORDER_STATUS[keyof typeof ORDER_STATUS]} [status] - 订单状态
  * @property {string} [receiverName] - 收货人姓名
  * @property {string} [receiverPhone] - 收货人电话
  * @property {string} [createTimeStart] - 创建时间开始
@@ -116,7 +116,7 @@ export const getCustomerAddressList = (customerCode) => {
  * @property {string|number} customerId - 客户ID
  * @property {string} customerCode - 客户编码
  * @property {string} customerName - 客户名称
- * @property {keyof typeof ORDER_TYPES} orderType - 订单类型
+ * @property {typeof ORDER_TYPES[keyof typeof ORDER_TYPES]} orderType - 订单类型
  * @property {number|string} totalAmount - 订单总金额
  * @property {number|string} totalQuantity - 订单总数量
  * @property {string|number} addressId - 收货地址ID
@@ -124,7 +124,7 @@ export const getCustomerAddressList = (customerCode) => {
  * @property {string} receiverPhone - 收货人电话
  * @property {string} receiverAddress - 收货详细地址
  * @property {string} receiverRegion - 收货地区
- * @property {keyof typeof ORDER_STATUS} status - 订单状态
+ * @property {typeof ORDER_STATUS[keyof typeof ORDER_STATUS]} status - 订单状态
  */
 
 /**

+ 3 - 3
src/components/order-item-management/index.vue

@@ -64,7 +64,7 @@ import {
  * @property {string} [mainItemCategoryName] - 主物料分类名称
  * @property {string|number} [warehouseId] - 仓库ID
  * @property {string} [warehouseName] - 仓库名称
- * @property {keyof typeof ORDER_ITEM_STATUS} [itemStatus] - 明细状态
+ * @property {typeof ORDER_ITEM_STATUS[keyof typeof ORDER_ITEM_STATUS]} [itemStatus] - 明细状态
  */
 
 /**
@@ -88,7 +88,7 @@ import {
  * @property {string|number} taxRate - 税率
  * @property {string|number} taxAmount - 税额
  * @property {string|number} totalAmount - 总金额
- * @property {keyof typeof ORDER_ITEM_STATUS} itemStatus - 明细状态
+ * @property {typeof ORDER_ITEM_STATUS[keyof typeof ORDER_ITEM_STATUS]} itemStatus - 明细状态
  */
 
 /**
@@ -119,7 +119,7 @@ import {
  * @property {string} taxRate - 税率
  * @property {string} taxAmount - 税额
  * @property {string} totalAmount - 总金额
- * @property {keyof typeof ORDER_ITEM_STATUS} itemStatus - 明细状态
+ * @property {typeof ORDER_ITEM_STATUS[keyof typeof ORDER_ITEM_STATUS]} itemStatus - 明细状态
  */
 
 /**

+ 4 - 4
src/mixins/order/orderDataMixin.js

@@ -14,7 +14,7 @@ import { ORDER_TYPES, ORDER_STATUS } from '@/constants'
  * @property {string} createTime - 创建时间
  * @property {string} updateUser - 更新用户ID
  * @property {string} updateTime - 更新时间
- * @property {keyof typeof ORDER_STATUS} status - 订单状态
+ * @property {typeof ORDER_STATUS[keyof typeof ORDER_STATUS]} status - 订单状态
  * @property {0|1} isDeleted - 是否删除 0-未删除 1-已删除
  * @property {string} orderCode - 订单编码
  * @property {number} orgId - 组织ID
@@ -23,7 +23,7 @@ import { ORDER_TYPES, ORDER_STATUS } from '@/constants'
  * @property {number} customerId - 客户ID
  * @property {string} customerCode - 客户编码
  * @property {string} customerName - 客户名称
- * @property {keyof typeof ORDER_TYPES} orderType - 订单类型
+ * @property {typeof ORDER_TYPES[keyof typeof ORDER_TYPES]} orderType - 订单类型
  * @property {string} totalAmount - 订单总金额
  * @property {string} totalQuantity - 订单总数量
  * @property {number} addressId - 收货地址ID
@@ -109,8 +109,8 @@ export default {
      * @returns {void}
      */
     handleSelectionChange(selection) {
-      this.selectionList = selection
-    },
+       this.selectionList = selection
+     },
 
     /**
      * 页大小改变处理

+ 2 - 2
src/mixins/order/orderFormMixin.js

@@ -21,7 +21,7 @@ import {
  * @property {string|number} customerId - 客户ID
  * @property {string} customerCode - 客户编码
  * @property {string} customerName - 客户名称
- * @property {keyof typeof ORDER_TYPES} orderType - 订单类型
+ * @property {typeof ORDER_TYPES[keyof typeof ORDER_TYPES]} orderType - 订单类型
  * @property {number|string} totalAmount - 订单总金额
  * @property {number|string} totalQuantity - 订单总数量
  * @property {string|number} addressId - 收货地址ID
@@ -29,7 +29,7 @@ import {
  * @property {string} receiverPhone - 收货人电话
  * @property {string} receiverAddress - 收货详细地址
  * @property {string} receiverRegion - 收货地区
- * @property {keyof typeof ORDER_STATUS} status - 订单状态
+ * @property {typeof ORDER_STATUS[keyof typeof ORDER_STATUS]} status - 订单状态
  * @property {string} createTime - 创建时间
  * @property {string} updateTime - 更新时间
  * @property {string} submitTime - 提交时间

+ 2 - 2
src/mixins/order/orderSearchMixin.js

@@ -13,8 +13,8 @@ import { ORDER_TYPES, ORDER_STATUS } from '@/constants'
  * @property {string} [orgName] - 组织名称
  * @property {string} [customerCode] - 客户编码
  * @property {string} [customerName] - 客户名称
- * @property {keyof typeof ORDER_TYPES} [orderType] - 订单类型
- * @property {keyof typeof ORDER_STATUS} [status] - 订单状态
+ * @property {typeof ORDER_TYPES[keyof typeof ORDER_TYPES]} [orderType] - 订单类型
+ * @property {typeof ORDER_STATUS[keyof typeof ORDER_STATUS]} [status] - 订单状态
  * @property {string} [receiverName] - 收货人姓名
  * @property {string} [receiverPhone] - 收货人电话
  * @property {string} [createTimeStart] - 创建时间开始