From 2a83f67065457d639c88ca48379cddbd1e372056 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 28 Feb 2026 18:17:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mes):=20=E8=B0=83=E6=95=B4=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E9=80=80=E8=B4=A7=E6=A8=A1=E5=9D=97=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=98=A0=E5=B0=84=20refactor(mes):=20=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=80=E8=B4=A7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/wm/returnvendor/detail/index.ts | 2 +- src/api/mes/wm/returnvendor/index.ts | 4 +- src/api/mes/wm/returnvendor/line/index.ts | 2 +- .../returnvendor/ReturnVendorDetailForm.vue | 8 +-- .../returnvendor/ReturnVendorDetailList.vue | 2 +- .../mes/wm/returnvendor/ReturnVendorForm.vue | 46 +++++++---------- .../wm/returnvendor/ReturnVendorLineList.vue | 20 ++++---- src/views/mes/wm/returnvendor/index.vue | 50 ++++++------------- 8 files changed, 52 insertions(+), 82 deletions(-) diff --git a/src/api/mes/wm/returnvendor/detail/index.ts b/src/api/mes/wm/returnvendor/detail/index.ts index 909e42712..de4d7a1b0 100644 --- a/src/api/mes/wm/returnvendor/detail/index.ts +++ b/src/api/mes/wm/returnvendor/detail/index.ts @@ -3,7 +3,7 @@ import request from '@/config/axios' // MES 供应商退货明细 VO export interface WmReturnVendorDetailVO { id?: number - returnVendorId: number + returnId: number lineId: number materialStockId: number itemId: number diff --git a/src/api/mes/wm/returnvendor/index.ts b/src/api/mes/wm/returnvendor/index.ts index 5fd604b48..830d53473 100644 --- a/src/api/mes/wm/returnvendor/index.ts +++ b/src/api/mes/wm/returnvendor/index.ts @@ -5,11 +5,11 @@ export interface WmReturnVendorVO { id?: number code?: string name: string - poCode?: string + purchaseOrderCode?: string vendorId?: number + vendorCode?: string vendorName?: string vendorNickname?: string - batchCode?: string returnDate?: string returnReason?: string transportCode?: string diff --git a/src/api/mes/wm/returnvendor/line/index.ts b/src/api/mes/wm/returnvendor/line/index.ts index 8611f58ff..b8715d2c2 100644 --- a/src/api/mes/wm/returnvendor/line/index.ts +++ b/src/api/mes/wm/returnvendor/line/index.ts @@ -3,7 +3,7 @@ import request from '@/config/axios' // MES 供应商退货单行 VO export interface WmReturnVendorLineVO { id?: number - returnVendorId: number + returnId: number itemId: number itemCode?: string itemName?: string diff --git a/src/views/mes/wm/returnvendor/ReturnVendorDetailForm.vue b/src/views/mes/wm/returnvendor/ReturnVendorDetailForm.vue index 1b71324c8..5e8e9503a 100644 --- a/src/views/mes/wm/returnvendor/ReturnVendorDetailForm.vue +++ b/src/views/mes/wm/returnvendor/ReturnVendorDetailForm.vue @@ -56,7 +56,7 @@ import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehou defineOptions({ name: 'ReturnVendorDetailForm' }) const props = defineProps<{ - returnVendorId: number + returnId: number }>() const emit = defineEmits(['success']) @@ -73,7 +73,7 @@ const formRef = ref() // 表单 Ref const formData = ref({ id: undefined as number | undefined, lineId: undefined as number | undefined, - returnVendorId: undefined as number | undefined, + returnId: undefined as number | undefined, itemId: undefined as number | undefined, quantity: undefined as number | undefined, batchCode: undefined as string | undefined, @@ -119,7 +119,7 @@ const submitForm = async () => { try { const data = { ...formData.value, - returnVendorId: props.returnVendorId, + returnId: props.returnId, lineId: currentLineId.value } as unknown as WmReturnVendorDetailVO if (formType.value === 'create') { @@ -142,7 +142,7 @@ const resetForm = () => { formData.value = { id: undefined, lineId: undefined, - returnVendorId: undefined, + returnId: undefined, itemId: undefined, quantity: undefined, batchCode: undefined, diff --git a/src/views/mes/wm/returnvendor/ReturnVendorDetailList.vue b/src/views/mes/wm/returnvendor/ReturnVendorDetailList.vue index f1e2b78e8..58d5244ed 100644 --- a/src/views/mes/wm/returnvendor/ReturnVendorDetailList.vue +++ b/src/views/mes/wm/returnvendor/ReturnVendorDetailList.vue @@ -34,7 +34,7 @@ import { defineOptions({ name: 'ReturnVendorDetailList' }) const props = defineProps<{ - returnVendorId: number + returnId: number lineId: number itemId: number formType: string diff --git a/src/views/mes/wm/returnvendor/ReturnVendorForm.vue b/src/views/mes/wm/returnvendor/ReturnVendorForm.vue index 69512a615..163935b32 100644 --- a/src/views/mes/wm/returnvendor/ReturnVendorForm.vue +++ b/src/views/mes/wm/returnvendor/ReturnVendorForm.vue @@ -33,21 +33,19 @@ - - - - - - - + - + + + + + - - - - - - - + - - + - @@ -124,7 +126,7 @@ import ReturnVendorDetailForm from './ReturnVendorDetailForm.vue' defineOptions({ name: 'ReturnVendorLineList' }) const props = defineProps<{ - returnVendorId: number + returnId: number formType: string }>() @@ -141,14 +143,14 @@ const total = ref(0) // 列表的总页数 const queryParams = reactive({ pageNo: 1, pageSize: 10, - returnVendorId: undefined as number | undefined + returnId: undefined as number | undefined }) /** 查询行列表 */ const getList = async () => { loading.value = true try { - queryParams.returnVendorId = props.returnVendorId + queryParams.returnId = props.returnId const data = await WmReturnVendorLineApi.getReturnVendorLinePage(queryParams) list.value = data.list total.value = data.total @@ -174,7 +176,7 @@ const formLoading = ref(false) // 表单的加载中 const lineFormType = ref('') // 行表单的类型 const formData = ref({ id: undefined, - returnVendorId: undefined as number | undefined, + returnId: undefined as number | undefined, itemId: undefined, quantity: undefined, remark: undefined @@ -215,7 +217,7 @@ const submitForm = async () => { try { const data = { ...formData.value, - returnVendorId: props.returnVendorId + returnId: props.returnId } as unknown as WmReturnVendorLineVO if (lineFormType.value === 'create') { await WmReturnVendorLineApi.createReturnVendorLine(data) @@ -235,7 +237,7 @@ const submitForm = async () => { const resetForm = () => { formData.value = { id: undefined, - returnVendorId: undefined, + returnId: undefined, itemId: undefined, quantity: undefined, remark: undefined diff --git a/src/views/mes/wm/returnvendor/index.vue b/src/views/mes/wm/returnvendor/index.vue index f6b1ad677..b768aab3b 100644 --- a/src/views/mes/wm/returnvendor/index.vue +++ b/src/views/mes/wm/returnvendor/index.vue @@ -25,34 +25,17 @@ class="!w-240px" /> - - - - - + - - - - + + 搜索 @@ -88,11 +71,9 @@ - - - - - + + + - -