yz 5 dias atrás
pai
commit
d4a4362540

+ 35 - 11
src/api/types/common.d.ts

@@ -126,16 +126,40 @@ export interface ItemQueryParams extends BaseQueryParams {
  */
 export interface ItemRecord {
   id: string;
-  itemCode: string;
-  itemName: string;
-  specs: string;
-  unit: string;
-  category: string;
-  brand: string;
-  model: string;
-  description: string;
-  unitPrice: string;
-  remark: string;
+  createUser: string;
+  createDept: string;
+  createTime: string;
+  updateUser: string;
+  updateTime: string;
+  status: number;
+  isDeleted: number;
+  ORG_ID: number;
+  ORG_CODE: string;
+  ORG_NAME: string;
+  Item_ID: number;
+  Item_Code: string;
+  Item_Name: string;
+  Item_PECS: string;
+  Item_Description: string | null;
+  Item_Code1: string;
+  Item_Code2: string;
+  MainItemCategory_ID: number;
+  MainItemCategory_Code: string;
+  MainItemCategory_Name: string;
+  InventoryInfo_ID: number;
+  InventoryInfo_Code: string;
+  InventoryInfo_Name: string;
+  Warehouse_ID: number | null;
+  Warehouse_Code: string | null;
+  Warehouse_Name: string | null;
+  Saleser_ID: number | null;
+  Saleser_CODE: string | null;
+  Saleser_NAME: string | null;
+  ShipmentWarehouse_ID: number | null;
+  ShipmentWarehouse_Code: string | null;
+  ShipmentWarehouse_Name: string | null;
+  createdon: string;
+  ModifiedOn: string;
 }
 
 /**
@@ -151,4 +175,4 @@ export type CustomerDetailResponse = AxiosResponse<ApiResponseData<CustomerItem>
 /**
  * 物料列表响应类型
  */
-export type ItemListResponse = AxiosResponse<ApiResponseData<PageResult<ItemRecord>>>;
+export type ItemListResponse = AxiosResponse<ApiResponseData<PageResult<ItemRecord>>>;

+ 5 - 4
src/components/forecast-form/forecast-form-mixin.js

@@ -627,10 +627,11 @@ export default {
           const { records } = res.data.data
           this.itemOptions = records.map(item => ({
             value: item.id,
-            label: item.itemName,
-            itemName: item.itemName,
-            itemCode: item.itemCode,
-            specs: item.specs
+            label: `${item.Item_Name} (${item.Item_Code})`,
+            itemName: item.Item_Name,
+            itemCode: item.Item_Code,
+            specs: item.Item_PECS || '',
+            id: item.id
           }))
         }
       } catch (error) {