diff --git a/src/api/erp/product/product/index.ts b/src/api/erp/product/product/index.ts index d77b8829..c84f1831 100644 --- a/src/api/erp/product/product/index.ts +++ b/src/api/erp/product/product/index.ts @@ -28,8 +28,8 @@ export const ProductApi = { }, // 查询产品精简列表 - getProductSimpleList: async () => { - return await request.get({ url: `/erp/product/simple-list-all` }) + getProductSimpleList: async (params?: { categoryId?: string | number }) => { + return await request.get({ url: `/erp/product/simple-list-all`, params }) }, // 查询原料精简列表 getItemSimpleList: async () => { diff --git a/src/api/iot/recipeConfig/index.ts b/src/api/iot/recipeConfig/index.ts index 6ab87269..0cbedf17 100644 --- a/src/api/iot/recipeConfig/index.ts +++ b/src/api/iot/recipeConfig/index.ts @@ -7,6 +7,7 @@ export interface RecipeConfigVO { name?: string recipeType?: string | number recipeTypeId?: string | number + productCategoryId?: number productId?: number productName?: string machineName?: string @@ -123,6 +124,7 @@ export const RecipeConfigApi = { name: data.name ?? data.recipeName, recipeCode: data.recipeCode, recipeTypeId: (data as any).recipeTypeId ?? data.recipeType, + productCategoryId: (data as any).productCategoryId, productId: data.productId, machineId: (data as any).machineId ?? data.deviceId, recipeDesc: data.recipeDesc ?? data.remark, @@ -138,6 +140,7 @@ export const RecipeConfigApi = { name: data.name ?? data.recipeName, recipeCode: data.recipeCode, recipeTypeId: (data as any).recipeTypeId ?? data.recipeType, + productCategoryId: (data as any).productCategoryId, productId: data.productId, machineId: (data as any).machineId ?? data.deviceId, recipeDesc: data.recipeDesc ?? data.remark, diff --git a/src/locales/en.ts b/src/locales/en.ts index f727d94e..94721077 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -2542,6 +2542,8 @@ export default { dialogNamePlaceholder: 'Please enter recipe name', dialogRecipeTypeLabel: 'Recipe Type', dialogRecipeTypePlaceholder: 'Please select recipe type', + dialogProductCategoryLabel: 'Product Category', + dialogProductCategoryPlaceholder: 'Please select product category', dialogProductNameLabel: 'Related Product', dialogProductNamePlaceholder: 'Please select related product', dialogMachineNameLabel: 'Related Device', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 8ab66d7a..d6777c9b 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -2125,6 +2125,8 @@ export default { dialogNamePlaceholder: '请输入配方名称', dialogRecipeTypeLabel: '配方类型', dialogRecipeTypePlaceholder: '请选择配方类型', + dialogProductCategoryLabel: '关联产品分类', + dialogProductCategoryPlaceholder: '请选择产品分类', dialogProductNameLabel: '关联产品', dialogProductNamePlaceholder: '请选择关联产品', dialogMachineNameLabel: '关联设备', diff --git a/src/views/formula/formulaConfig/index.vue b/src/views/formula/formulaConfig/index.vue index 61970a60..75ba37f9 100644 --- a/src/views/formula/formulaConfig/index.vue +++ b/src/views/formula/formulaConfig/index.vue @@ -168,6 +168,20 @@ ref="detailRef" :visible="detailVisible" + + + + + + @@ -290,6 +305,7 @@ ref="detailRef" :visible="detailVisible"