From 9ac9c0634c89858942ddcf5ff0914e01784f9784 Mon Sep 17 00:00:00 2001 From: weiwei Date: Tue, 25 Feb 2025 16:59:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=91=E9=A2=9D=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/supermarketerp/common.ts | 4 +++- src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue | 4 ++-- src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue | 4 ++-- .../smErpInventoryRecords/smErpInventoryRecordsOption.vue | 4 ++-- .../supermarketerp/smErpRetailBack/smErpRetailBackOption.vue | 4 ++-- .../smErpRetailDelivery/smErpRetailDeliveryOption.vue | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/api/supermarketerp/common.ts b/src/api/supermarketerp/common.ts index 115f4a2..6b212f1 100644 --- a/src/api/supermarketerp/common.ts +++ b/src/api/supermarketerp/common.ts @@ -4,7 +4,9 @@ import request from "/@/utils/request" // type:2 获取采购订单编号 // type:3 获取采购入库编号 // type:4 获取采购退货编号 -export function getPlanCode(params: { type: 1 | 2 | 3 | 4 }) { +// type:5 获取零售出库编号 +// type:4 获取零售退货编号 +export function getPlanCode(params: { type: 1 | 2 | 3 | 4 | 5 | 6 }) { return request({ url: "/supermarket/sm/common/getSequence", method: "get", diff --git a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue index 68914b8..c5a2fd4 100644 --- a/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue +++ b/src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue @@ -427,8 +427,8 @@ const cgPlanSpuItems = computed(() => { id: item.isNew ? undefined : item.id, erpSpuId: item.erpSpuId, quantity: item.quantity, - unitPrice: item.unitPrice ? Number(item.unitPrice) : 0, - totalAmount: Number(item.unitPrice || 0) * item.quantity, + unitPrice: item.purchasePrice ? Number(item.purchasePrice) : 0, + totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, } diff --git a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue index 5c8a31e..b5ee6b8 100644 --- a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue +++ b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue @@ -432,8 +432,8 @@ const cgPlanSpuItems = computed(() => { id: item.isNew ? undefined : item.id, erpSpuId: item.erpSpuId, quantity: item.quantity, - unitPrice: item.unitPrice ? Number(item.unitPrice) : 0, - totalAmount: Number(item.unitPrice || 0) * item.quantity, + unitPrice: item.purchasePrice ? Number(item.purchasePrice) : 0, + totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, } diff --git a/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue b/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue index 95548a0..ea52fbe 100644 --- a/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue +++ b/src/views/supermarketerp/smErpInventoryRecords/smErpInventoryRecordsOption.vue @@ -431,8 +431,8 @@ const cgPlanSpuItems = computed(() => { id: item.isNew ? undefined : item.id, erpSpuId: item.erpSpuId, quantity: item.quantity, - unitPrice: item.unitPrice ? Number(item.unitPrice) : 0, - totalAmount: Number(item.unitPrice || 0) * item.quantity, + unitPrice: item.purchasePrice ? Number(item.purchasePrice) : 0, + totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, } diff --git a/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue b/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue index 533a703..5b73e3c 100644 --- a/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue +++ b/src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue @@ -469,8 +469,8 @@ const cgPlanSpuItems = computed(() => { id: item.isNew ? undefined : item.id, erpSpuId: item.erpSpuId, quantity: item.quantity, - unitPrice: item.unitPrice ? Number(item.unitPrice) : 0, - totalAmount: item.unitPrice ? Number(item.unitPrice) * item.quantity : 0, + unitPrice: item.purchasePrice ? Number(item.purchasePrice) : 0, + totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, } diff --git a/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue b/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue index 77c024c..ed31e14 100644 --- a/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue +++ b/src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue @@ -469,8 +469,8 @@ const cgPlanSpuItems = computed(() => { id: item.isNew ? undefined : item.id, erpSpuId: item.erpSpuId, quantity: item.quantity, - unitPrice: item.unitPrice ? Number(item.unitPrice) : 0, - totalAmount: item.unitPrice ? Number(item.unitPrice) * item.quantity : 0, + unitPrice: item.purchasePrice ? Number(item.purchasePrice) : 0, + totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, }