From ea88772e71997a83274e47ad9d0eb8a0efbeae41 Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 17 Mar 2025 20:43:03 +0800 Subject: [PATCH] =?UTF-8?q?refactor(wms):=20=E9=87=8D=E6=9E=84=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=A4=A7=E7=B1=BB=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改物料大类相关的属性名称，统一为 materialCategoryId - 更新物料大类的获取方式，使用 getBaseMaterialCategoryList 方法 - 调整物料大类在表格和表单中的显示方式 - 优化物料大类的选择逻辑 --- src/api/wms/allocateOrder/types.ts | 12 ++- src/api/wms/baseWarehouse/types.ts | 12 ++- src/api/wms/instockDetail/types.ts | 13 ++- src/api/wms/instockOrder/types.ts | 12 ++- src/api/wms/instockPrint/types.ts | 12 ++- src/api/wms/instockRecord/types.ts | 12 ++- src/api/wms/inventory/types.ts | 10 ++- src/api/wms/inventoryCheck/types.ts | 12 ++- src/api/wms/inventoryCheckRecord/types.ts | 8 +- src/api/wms/moveOrder/types.ts | 12 ++- src/api/wms/outstockDetail/types.ts | 14 ++- src/api/wms/outstockOrder/types.ts | 13 ++- src/api/wms/outstockRecord/types.ts | 13 ++- src/api/wms/returnOrder/types.ts | 13 ++- src/api/wms/wmsPurchaseOrder/types.ts | 9 +- .../mes/baseMaterialInfo/addMaterialInWMS.vue | 36 +++++--- src/views/wms/allocateOrder/index copy.vue | 37 ++++---- src/views/wms/allocateOrder/index.vue | 47 +++++----- .../wms/allocateOrderDetail/indexbackuo.vue | 23 +++-- src/views/wms/baseWarehouse/index.vue | 51 ++++++----- src/views/wms/hsmTooling/index.vue | 59 +++++-------- src/views/wms/instockDetail/index.vue | 44 ++++++---- src/views/wms/instockOrder/index.vue | 57 ++++++++----- src/views/wms/instockOrderCopy/index.vue | 69 ++++++++------- src/views/wms/instockPrint/index.vue | 48 +++++++---- src/views/wms/instockRecord/index.vue | 48 +++++++---- src/views/wms/inventory/index.vue | 43 +++++++--- src/views/wms/inventoryAlarm/index.vue | 40 ++++++--- src/views/wms/inventoryCheck/index.vue | 46 ++++++---- src/views/wms/inventoryCheckRecord/index.vue | 52 +++++++----- src/views/wms/linkage/index.vue | 49 ++++++----- src/views/wms/moveOrder/index.vue | 58 ++++++++----- src/views/wms/outstockDetail/index.vue | 38 +++++---- src/views/wms/outstockOrder/index.vue | 51 ++++++----- src/views/wms/outstockOrderCopy/index.vue | 85 ++++++++++--------- src/views/wms/outstockRecord/index.vue | 57 ++++++++----- src/views/wms/psmInLoad/index.vue | 2 +- src/views/wms/psmInStock/index.vue | 10 ++- src/views/wms/returnOrder/index.vue | 58 ++++++++----- src/views/wms/wmsPurchaseOrder/index.vue | 48 +++++++---- src/views/wms/wmsPurchaseOrderCopy/index.vue | 75 +++++++++------- 41 files changed, 875 insertions(+), 533 deletions(-) diff --git a/src/api/wms/allocateOrder/types.ts b/src/api/wms/allocateOrder/types.ts index ec1592a..5356fa9 100644 --- a/src/api/wms/allocateOrder/types.ts +++ b/src/api/wms/allocateOrder/types.ts @@ -12,7 +12,9 @@ export interface AllocateOrderVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName: string; /** * 出库仓库ID @@ -90,7 +92,9 @@ export interface AllocateOrderForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 出库仓库ID @@ -169,7 +173,9 @@ export interface AllocateOrderQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 出库仓库ID diff --git a/src/api/wms/baseWarehouse/types.ts b/src/api/wms/baseWarehouse/types.ts index 350e203..f745c5c 100644 --- a/src/api/wms/baseWarehouse/types.ts +++ b/src/api/wms/baseWarehouse/types.ts @@ -17,7 +17,9 @@ export interface BaseWarehouseVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName: string; /** * 仓库位置 @@ -75,7 +77,9 @@ export interface BaseWarehouseForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 仓库位置 @@ -129,7 +133,9 @@ export interface BaseWarehouseQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 关联车间 diff --git a/src/api/wms/instockDetail/types.ts b/src/api/wms/instockDetail/types.ts index dc1beb0..39c8229 100644 --- a/src/api/wms/instockDetail/types.ts +++ b/src/api/wms/instockDetail/types.ts @@ -66,8 +66,9 @@ export interface InstockDetailVO { /** * 物料大类 */ - materialCategories: string; - + materialCategoryId: string; + + materialCategoryName?: string; } @@ -135,7 +136,9 @@ export interface InstockDetailForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; } @@ -204,7 +207,9 @@ export interface InstockDetailQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 日期范围参数 diff --git a/src/api/wms/instockOrder/types.ts b/src/api/wms/instockOrder/types.ts index 5b69c5a..b5d537d 100644 --- a/src/api/wms/instockOrder/types.ts +++ b/src/api/wms/instockOrder/types.ts @@ -12,7 +12,9 @@ export interface InstockOrderVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName: string; /** * 工单类型(1采购订单,2生产订单,3手工,4系统生成) @@ -65,7 +67,9 @@ export interface InstockOrderForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 工单类型(1采购订单,2生产订单,3手工,4系统生成) @@ -119,7 +123,9 @@ export interface InstockOrderQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 工单类型(1采购订单,2生产订单,3手工,4系统生成) diff --git a/src/api/wms/instockPrint/types.ts b/src/api/wms/instockPrint/types.ts index 450b473..f182ff1 100644 --- a/src/api/wms/instockPrint/types.ts +++ b/src/api/wms/instockPrint/types.ts @@ -57,7 +57,9 @@ export interface InstockPrintVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName: string; } @@ -120,7 +122,9 @@ export interface InstockPrintForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; } @@ -184,7 +188,9 @@ export interface InstockPrintQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 日期范围参数 diff --git a/src/api/wms/instockRecord/types.ts b/src/api/wms/instockRecord/types.ts index ed697b0..be457f7 100644 --- a/src/api/wms/instockRecord/types.ts +++ b/src/api/wms/instockRecord/types.ts @@ -43,7 +43,9 @@ export interface InstockRecordVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName?: string; /** * 入库人 @@ -116,7 +118,9 @@ export interface InstockRecordForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 入库人 @@ -175,7 +179,9 @@ export interface InstockRecordQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 入库时间 diff --git a/src/api/wms/inventory/types.ts b/src/api/wms/inventory/types.ts index 211ff35..ddad62a 100644 --- a/src/api/wms/inventory/types.ts +++ b/src/api/wms/inventory/types.ts @@ -22,7 +22,9 @@ export interface InventoryVO { /** * 物料大类 */ - materialCategories: number; + materialCategoryId: number; + + materialCategoryName?: string; /** * 库存数量 @@ -70,7 +72,9 @@ export interface InventoryForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: number; + materialCategoryId?: number; + + materialCategoryName?: string; /** * 库存数量 @@ -119,7 +123,7 @@ export interface InventoryQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: number; + materialCategoryId?: number; /** * 库存数量 diff --git a/src/api/wms/inventoryCheck/types.ts b/src/api/wms/inventoryCheck/types.ts index f2bc411..6864c77 100644 --- a/src/api/wms/inventoryCheck/types.ts +++ b/src/api/wms/inventoryCheck/types.ts @@ -12,7 +12,9 @@ export interface InventoryCheckVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName?: string; /** * 计划仓库ID @@ -75,7 +77,9 @@ export interface InventoryCheckForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 计划仓库ID @@ -139,7 +143,9 @@ export interface InventoryCheckQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 计划仓库ID diff --git a/src/api/wms/inventoryCheckRecord/types.ts b/src/api/wms/inventoryCheckRecord/types.ts index 02aca53..8d9b1e9 100644 --- a/src/api/wms/inventoryCheckRecord/types.ts +++ b/src/api/wms/inventoryCheckRecord/types.ts @@ -7,7 +7,9 @@ export interface InventoryCheckRecordVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName?: string; /** * 盘点单号 @@ -110,7 +112,7 @@ export interface InventoryCheckRecordForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; /** * 盘点单号 @@ -214,7 +216,7 @@ export interface InventoryCheckRecordQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; /** * 盘点单号 diff --git a/src/api/wms/moveOrder/types.ts b/src/api/wms/moveOrder/types.ts index ef2dc58..a284c83 100644 --- a/src/api/wms/moveOrder/types.ts +++ b/src/api/wms/moveOrder/types.ts @@ -12,7 +12,9 @@ export interface MoveOrderVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName?: string; /** * 仓库ID @@ -80,7 +82,9 @@ export interface MoveOrderForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 仓库ID @@ -149,7 +153,9 @@ export interface MoveOrderQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 仓库ID diff --git a/src/api/wms/outstockDetail/types.ts b/src/api/wms/outstockDetail/types.ts index dd1ef76..124beed 100644 --- a/src/api/wms/outstockDetail/types.ts +++ b/src/api/wms/outstockDetail/types.ts @@ -27,7 +27,11 @@ export interface OutstockDetailVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName?: string; + + /** * 物料代码 */ @@ -64,7 +68,9 @@ export interface OutstockDetailForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; } @@ -98,7 +104,9 @@ export interface OutstockDetailQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 日期范围参数 diff --git a/src/api/wms/outstockOrder/types.ts b/src/api/wms/outstockOrder/types.ts index b1a271c..68c27a6 100644 --- a/src/api/wms/outstockOrder/types.ts +++ b/src/api/wms/outstockOrder/types.ts @@ -22,7 +22,10 @@ export interface OutstockOrderVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName?: string; + /** * 工单类型(字典：1销售订单,2生产订单,3手工,4系统生成) @@ -80,7 +83,9 @@ export interface OutstockOrderForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 工单类型(字典：1销售订单,2生产订单,3手工,4系统生成) @@ -139,7 +144,9 @@ export interface OutstockOrderQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 工单类型(字典：1销售订单,2生产订单,3手工,4系统生成) diff --git a/src/api/wms/outstockRecord/types.ts b/src/api/wms/outstockRecord/types.ts index 8f10770..1807bb4 100644 --- a/src/api/wms/outstockRecord/types.ts +++ b/src/api/wms/outstockRecord/types.ts @@ -37,7 +37,10 @@ export interface OutstockRecordVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName?: string; + /** * 出库人 @@ -100,7 +103,9 @@ export interface OutstockRecordForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 出库人 @@ -134,7 +139,9 @@ export interface OutstockRecordQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * erp同步状态 diff --git a/src/api/wms/returnOrder/types.ts b/src/api/wms/returnOrder/types.ts index 7d4df2b..f5178e6 100644 --- a/src/api/wms/returnOrder/types.ts +++ b/src/api/wms/returnOrder/types.ts @@ -12,7 +12,9 @@ export interface ReturnOrderVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName?: string; /** * 批次条码 @@ -95,7 +97,10 @@ export interface ReturnOrderForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; + /** * 批次条码 @@ -179,7 +184,9 @@ export interface ReturnOrderQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; + + materialCategoryName?: string; /** * 批次条码 diff --git a/src/api/wms/wmsPurchaseOrder/types.ts b/src/api/wms/wmsPurchaseOrder/types.ts index e1d51be..0baea19 100644 --- a/src/api/wms/wmsPurchaseOrder/types.ts +++ b/src/api/wms/wmsPurchaseOrder/types.ts @@ -67,7 +67,10 @@ export interface WmsPurchaseOrderVO { /** * 物料大类 */ - materialCategories: string; + materialCategoryId: string; + + materialCategoryName?: string; + /** * 审核人 @@ -135,7 +138,7 @@ export interface WmsPurchaseOrderForm extends BaseEntity { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; /** * 审核人 @@ -194,7 +197,7 @@ export interface WmsPurchaseOrderQuery extends PageQuery { /** * 物料大类 */ - materialCategories?: string; + materialCategoryId?: string; /** * 审核人 diff --git a/src/views/mes/baseMaterialInfo/addMaterialInWMS.vue b/src/views/mes/baseMaterialInfo/addMaterialInWMS.vue index 9fd1185..5d4e677 100644 --- a/src/views/mes/baseMaterialInfo/addMaterialInWMS.vue +++ b/src/views/mes/baseMaterialInfo/addMaterialInWMS.vue @@ -8,8 +8,8 @@ - - + + @@ -39,10 +39,8 @@ - - + + @@ -166,6 +164,8 @@ import { listBaseMaterialInfo, getBaseMaterialInfo, delBaseMaterialInfo, addBase import { BaseMaterialInfoVO, BaseMaterialInfoQuery, BaseMaterialInfoForm } from '@/api/mes/baseMaterialInfo/types'; import { getFactoryList } from "@/api/mes/baseFactoryInfo"; +import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory'; + const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { apply_flag, inner_tube_flag, mes_material_categories, always_flag, mes_accessories_flag, @@ -257,7 +257,8 @@ const initFormData: BaseMaterialInfoForm = { oldMaterialCode: undefined, materialName: undefined, materialTypeId: undefined, - materialCategories: undefined, + materialCategoryId: undefined, + materialCategoryName: undefined, materialSubclass: undefined, batchFlag: undefined, batchAmount: undefined, @@ -311,7 +312,8 @@ const data = reactive>({ oldMaterialCode: undefined, materialName: undefined, materialTypeId: undefined, - materialCategories: undefined, + materialCategoryId: undefined, + materialCategoryName: undefined, materialSubclass: undefined, batchFlag: undefined, batchAmount: undefined, @@ -371,11 +373,11 @@ const data = reactive>({ const { queryParams, form, rules } = toRefs(data); const props = defineProps({ - materialTypeId: Object, - materialCategories: String,// 新增接收物料大类参数 + materialTypeId: String , + materialCategoryId: String,// 新增接收物料大类参数 }); -const { materialTypeId, materialCategories } = toRefs(props); +const { materialTypeId, materialCategoryId } = toRefs(props); const emits = defineEmits(['selection']); // 定义事件 @@ -393,8 +395,8 @@ const getList = async () => { queryParams.value.materialTypeId = materialTypeId.value; // 如果传入了物料大类，则设置查询参数并禁用修改 - if (materialCategories.value) { - queryParams.value.materialCategories = materialCategories.value; + if (materialCategoryId.value) { + queryParams.value.materialCategoryId = materialCategoryId.value; } proxy?.addDateRange(queryParams.value, dateRangeApproveDate.value, 'ApproveDate'); @@ -493,9 +495,17 @@ const handleRowClick = (row) => { emits('selection', row); }; +//获取物料大类下拉框 +let mategoryOptions = ref([]); +const getMaterialCategorySelect = async () => { + const res = await getBaseMaterialCategoryList(null); + mategoryOptions.value = res.data; +}; + defineExpose({tableRef}) onMounted(() => { getFactorySelect(); getList(); + getMaterialCategorySelect(); }); diff --git a/src/views/wms/allocateOrder/index copy.vue b/src/views/wms/allocateOrder/index copy.vue index d3055ab..4cb6a51 100644 --- a/src/views/wms/allocateOrder/index copy.vue +++ b/src/views/wms/allocateOrder/index copy.vue @@ -10,8 +10,8 @@ - - + + @@ -90,10 +90,8 @@ - - + + @@ -157,14 +155,13 @@ - - - + + + @@ -279,7 +276,7 @@ import api from '@/api/system/user'; import { useRouter } from 'vue-router'; let router = useRouter(); const { proxy } = getCurrentInstance() as ComponentInternalInstance; -const { approve_status, material_mategories, wms_out_type, wms_allocate_status, wms_allocate_create, wms_allocate_way } = toRefs(proxy?.useDict('approve_status', 'material_mategories', 'wms_out_type','wms_allocate_status','wms_allocate_create','wms_allocate_way')); +const { approve_status, wms_out_type, wms_allocate_status, wms_allocate_create, wms_allocate_way } = toRefs(proxy?.useDict('approve_status' , 'wms_out_type','wms_allocate_status','wms_allocate_create','wms_allocate_way')); const allocateOrderList = ref([]); const buttonLoading = ref(false); const loading = ref(true); @@ -325,7 +322,8 @@ const columns = ref([ const initFormData: AllocateOrderForm = { aoId: undefined, allocateOrderCode: undefined, - materialCategories: undefined, + materialCategoryId: undefined, + materialCategoryName: undefined,//字段映射 planWarehouseId: undefined, orderStatus: undefined, targetWarehouseId: undefined, @@ -346,7 +344,8 @@ const data = reactive>({ pageSize: 10, aoId: undefined, allocateOrderCode: undefined, - materialCategories: undefined, + materialCategoryId: undefined, + materialCategoryName: undefined,//字段映射 planWarehouseId: undefined, orderStatus: undefined, targetWarehouseId: undefined, @@ -369,7 +368,7 @@ const data = reactive>({ allocateOrderCode: [ { required: true, message: "调拨单号不能为空", trigger: "blur" } ], - materialCategories: [ + materialCategoryId: [ { required: true, message: "物料大类不能为空", trigger: "blur" } ], planWarehouseId: [ @@ -439,7 +438,7 @@ const cancel = () => { } const HandleInfo = async (row?: AllocateOrderVO) => { const aoId = row?.aoId; - const materialCategories = row?.materialCategories; + const materialCategoryId = row?.materialCategoryId; // const instockCode = row?.instockCode; router.push({ path: '/wms/allocateOrderDetail',query: {'aoId': aoId} diff --git a/src/views/wms/allocateOrder/index.vue b/src/views/wms/allocateOrder/index.vue index 4b52598..6c3d30c 100644 --- a/src/views/wms/allocateOrder/index.vue +++ b/src/views/wms/allocateOrder/index.vue @@ -10,9 +10,9 @@ - - - + @@ -90,10 +90,8 @@ - - + + @@ -157,14 +155,13 @@ - - - + + + @@ -279,7 +276,7 @@ import api from '@/api/system/user'; import { useRouter } from 'vue-router'; let router = useRouter(); const { proxy } = getCurrentInstance() as ComponentInternalInstance; -const { approve_status, material_mategories, wms_out_type, wms_allocate_status, wms_allocate_create, wms_allocate_way } = toRefs(proxy?.useDict('approve_status', 'material_mategories', 'wms_out_type','wms_allocate_status','wms_allocate_create','wms_allocate_way')); +const { approve_status, wms_out_type, wms_allocate_status, wms_allocate_create, wms_allocate_way } = toRefs(proxy?.useDict('approve_status' , 'wms_out_type','wms_allocate_status','wms_allocate_create','wms_allocate_way')); const allocateOrderList = ref([]); const buttonLoading = ref(false); const loading = ref(true); @@ -325,7 +322,8 @@ const columns = ref([ const initFormData: AllocateOrderForm = { aoId: undefined, allocateOrderCode: undefined, - materialCategories: undefined, + materialCategoryId: undefined, + materialCategoryName: undefined,//字段映射 planWarehouseId: undefined, orderStatus: undefined, targetWarehouseId: undefined, @@ -346,7 +344,8 @@ const data = reactive>({ pageSize: 10, aoId: undefined, allocateOrderCode: undefined, - materialCategories: undefined, + materialCategoryId: undefined, + materialCategoryName: undefined,//字段映射 planWarehouseId: undefined, orderStatus: undefined, targetWarehouseId: undefined, @@ -369,7 +368,7 @@ const data = reactive>({ allocateOrderCode: [ { required: true, message: "调拨单号不能为空", trigger: "blur" } ], - materialCategories: [ + materialCategoryId: [ { required: true, message: "物料大类不能为空", trigger: "blur" } ], planWarehouseId: [ @@ -439,7 +438,7 @@ const cancel = () => { } const HandleInfo = async (row?: AllocateOrderVO) => { const aoId = row?.aoId; - const materialCategories = row?.materialCategories; + const materialCategoryId = row?.materialCategoryId; // const instockCode = row?.instockCode; router.push({ path: '/wms/allocateOrderDetail',query: {'aoId': aoId} @@ -520,7 +519,15 @@ const handleExport = () => { }, `allocateOrder_${new Date().getTime()}.xlsx`) } +//获取物料大类下拉框 +let mategoryOptions = ref([]); +const getMaterialCategorySelect = async () => { + const res = await getBaseMaterialCategoryList(null); + mategoryOptions.value = res.data; +}; + onMounted(() => { + getMaterialCategorySelect(); getUserList(); getBaseWarehouseListsss(); getList(); diff --git a/src/views/wms/allocateOrderDetail/indexbackuo.vue b/src/views/wms/allocateOrderDetail/indexbackuo.vue index 8f49691..3185664 100644 --- a/src/views/wms/allocateOrderDetail/indexbackuo.vue +++ b/src/views/wms/allocateOrderDetail/indexbackuo.vue @@ -14,8 +14,8 @@ - - + + @@ -59,7 +59,7 @@ - + @@ -114,14 +116,14 @@ - - + + + v-for="item in mategoryOptions" + :key="item.materialCategoryId" + :label="item.materialCategoryName" + :value="item.materialCategoryId" + /> @@ -164,9 +166,10 @@ import { listBaseWarehouse, getBaseWarehouse, delBaseWarehouse, addBaseWarehouse, updateBaseWarehouse } from '@/api/wms/baseWarehouse'; import { BaseWarehouseVO, BaseWarehouseQuery, BaseWarehouseForm } from '@/api/wms/baseWarehouse/types'; import {getWorkshopList} from "@/api/mes/baseWorkshopInfo"; +import { getBaseMaterialCategoryList } from '@/api/mes/baseMaterialCategory'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; -const { material_mategories, wms_wharehouse_type } = toRefs(proxy?.useDict('material_mategories', 'wms_wharehouse_type')); +const { wms_wharehouse_type } = toRefs(proxy?.useDict( 'wms_wharehouse_type')); const baseWarehouseList = ref([]); const buttonLoading = ref(false); @@ -213,7 +216,8 @@ const initFormData: BaseWarehouseForm = { warehouseId: undefined, warehouseCode: undefined, warehouseName: undefined, - materialCategories: undefined, + materialCategoryId: undefined, + materialCategoryName: undefined,//字段映射 warehouseLocation: undefined, workshopId: undefined, warehouseType: undefined, @@ -229,7 +233,8 @@ const data = reactive>({ pageSize: 10, warehouseCode: undefined, warehouseName: undefined, - materialCategories: undefined, + materialCategoryId: undefined, + materialCategoryName: undefined,//字段映射 workshopId: undefined, warehouseType: undefined, params: { @@ -245,7 +250,7 @@ const data = reactive>({ warehouseName: [ { required: true, message: "仓库名称不能为空", trigger: "blur" } ], - materialCategories: [ + materialCategoryId: [ { required: true, message: "物料大类不能为空", trigger: "change" } ], warehouseLocation: [ @@ -352,7 +357,15 @@ const handleExport = () => { }, `baseWarehouse_${new Date().getTime()}.xlsx`) } +//获取物料大类下拉框 +let mategoryOptions = ref([]); +const getMaterialCategorySelect = async () => { + const res = await getBaseMaterialCategoryList(null); + mategoryOptions.value = res.data; +}; + onMounted(() => { + getMaterialCategorySelect(); getWorkshopListSelect(); getList(); }); diff --git a/src/views/wms/hsmTooling/index.vue b/src/views/wms/hsmTooling/index.vue index 54917b7..ebe6391 100644 --- a/src/views/wms/hsmTooling/index.vue +++ b/src/views/wms/hsmTooling/index.vue @@ -4,10 +4,10 @@
- - + + - + @@ -45,26 +45,24 @@ - - - - + + + + + + - + - - - -