Merge pull request #112 from Jzow/master

Fix typescript syntax errors
wansenai · Oct 25, 2023 · eeaf335 · eeaf335
2 parents 13a7d84 + 8043204
commit eeaf335
Show file tree

Hide file tree

Showing 9 changed files with 396 additions and 309 deletions.
diff --git a/src/api/product/model/productAttributeModel.ts b/src/api/product/model/productAttributeModel.ts
@@ -24,5 +24,7 @@ export interface AddOrUpdateProductAttributeReq {
 }
 
 export interface ProductAttributeListReq {
-    attributeName: string;
+    attributeName: string | undefined;
+    page: number;
+    pageSize: number;
 }
diff --git a/src/api/product/model/productModel.ts b/src/api/product/model/productModel.ts
@@ -19,34 +19,34 @@ export interface AddProductPriceReq {
 }
 
 export interface AddProductImageReq {
-    productImageId: number | string;
-    uid: string;
-    type: string;
-    status: string;
-    imageName: string;
-    imageUrl: string;
-    imageSize: number;
+    productImageId: number | string | null;
+    uid: string | null;
+    type: string | null | undefined;
+    status: string | null | undefined;
+    imageName: string | null;
+    imageUrl: string | null;
+    imageSize: number | null | undefined;
 }
 
 export interface AddProductReq {
     productId: number | string;
     productName: string;
     productStandard: string;
-    productModel: string;
-    productUnit: string | undefined,
-    productUnitId: number | string | undefined;
-    productColor: string;
-    productWeight: number;
-    productExpiryNum: number;
-    productCategoryId: number | string | undefined;
-    enableSerialNumber: number;
-    enableBatchNumber: number;
-    warehouseShelves: string;
-    remark: string;
-    productManufacturer: string;
-    otherFieldOne: string;
-    otherFieldTwo: string;
-    otherFieldThree: string;
+    productModel: string
+    productUnit: string
+    productUnitId: number | string;
+    productColor: string
+    productWeight: number | string;
+    productExpiryNum: number | string;
+    productCategoryId: number | string;
+    enableSerialNumber: number | string;
+    enableBatchNumber: number | string;
+    warehouseShelves: string
+    remark: string
+    productManufacturer: string
+    otherFieldOne: string
+    otherFieldTwo: string
+    otherFieldThree: string
     priceList: AddProductPriceReq[];
     stockList: AddProductStockReq[];
     imageList: AddProductImageReq[];
@@ -67,6 +67,8 @@ export interface QueryProductReq {
 export interface ProductInfoDetailResp {
     productId: string;
     productCategoryId: string;
+    productUnitId: string;
+    productUnit: string;
     productName: string;
     productStandard: string;
     productModel: string;
@@ -81,17 +83,20 @@ export interface ProductInfoDetailResp {
     otherFieldOne: string;
     otherFieldTwo: string;
     otherFieldThree: string;
+    remark: string;
     priceList: ProductPriceResp[];
     stockList: ProductStockResp[];
     imageList: ProductImageResp[];
 }
 
 export interface ProductImageResp {
+    productImageId: string;
     imageName: string;
-    iImageUrl: string;
+    imageUrl: string;
 }
 
 export interface ProductPriceResp {
+    productPriceId: string;
     barCode: number;
     productUnit: string;
     multiAttribute: string;
@@ -102,7 +107,7 @@ export interface ProductPriceResp {
 }
 
 export interface ProductStockResp {
-    id: number | string;
+    productStockId: number | string;
     warehouseId: number | string;
     warehouseName: string;
     initStockQuantity: number;

diff --git a/src/api/product/model/productUnitModel.ts b/src/api/product/model/productUnitModel.ts
@@ -22,7 +22,7 @@ export interface AddOrUpdateProductUnitReq {
 }
 
 export interface ProductUnitQueryReq {
-    computeUnit: string;
+    computeUnit: string | undefined;
     page: number;
     pageSize: number;
 }
diff --git a/src/api/product/productAttribute.ts b/src/api/product/productAttribute.ts
@@ -10,16 +10,12 @@ enum Api {
     GetAttributeById = '/product/attribute/getValuesById',
 }
 
-export function getAttributeList(params: ProductAttributeListReq ,mode: ErrorMessageMode = 'notice') {
+export function getAttributeList(params: ProductAttributeListReq) {
     return defHttp.post<BaseDataResp<ProductAttributeResp>>(
         {
             url: Api.List,
             params,
-        },
-        {
-            errorMessageMode: mode,
-            successMessageMode: mode,
-        },
+        }
     );
 }
 

diff --git a/src/api/product/productCategory.ts b/src/api/product/productCategory.ts
@@ -9,14 +9,11 @@ enum Api {
     deleteBatch = '/product/category/deleteBatch',
 }
 
-export function getCategoryList(mode: ErrorMessageMode = 'notice') {
+export function getCategoryList() {
     return defHttp.get<BaseDataResp<ProductCategoryResp>>(
         {
             url: Api.List,
-        },
-        {
-            errorMessageMode: mode,
-        },
+        }
     );
 }
 

diff --git a/src/api/product/productUnit.ts b/src/api/product/productUnit.ts
@@ -10,16 +10,12 @@ enum Api {
     UpdateStatus = '/product/unit/updateUnitStatus',
 }
 
-export function getUnitList(params: ProductUnitQueryReq ,mode: ErrorMessageMode = 'notice') {
+export function getUnitList(params: ProductUnitQueryReq) {
     return defHttp.post<BaseDataResp<ProductUnitResp>>(
         {
             url: Api.List,
             params,
-        },
-        {
-            errorMessageMode: mode,
-            successMessageMode: mode,
-        },
+        }
     );
 }