fix: 挂账管理更新,耗材盘点更新,代客下单更新
This commit is contained in:
@@ -81,15 +81,16 @@ export const useCartsStore = defineStore("carts", () => {
|
||||
const giftMoney = computed(() => {
|
||||
let oldGiftMoney = 0
|
||||
for (let i in oldOrder.value.detailMap) {
|
||||
oldGiftMoney += oldOrder.value.detailMap[i].reduce((prve: number, cur: any) => {
|
||||
oldGiftMoney += oldOrder.value.detailMap[i].filter((v: any) => v.isGift).reduce((prve: number, cur: any) => {
|
||||
const memberPrice = cur.memberPrice || cur.salePrice
|
||||
return prve + cur.number * (useVipPrice.value ? memberPrice : cur.salePrice)
|
||||
}, 0)
|
||||
}
|
||||
return giftList.value.reduce((acc: number, cur: any) => {
|
||||
const nowTotal = giftList.value.reduce((acc: number, cur: any) => {
|
||||
const memberPrice = cur.memberPrice || cur.salePrice
|
||||
return acc + cur.number * (useVipPrice.value ? memberPrice : cur.salePrice)
|
||||
}, 0)
|
||||
return (nowTotal + oldGiftMoney)
|
||||
})
|
||||
//打包数量
|
||||
const packNum = computed(() => {
|
||||
@@ -174,6 +175,10 @@ export const useCartsStore = defineStore("carts", () => {
|
||||
for (let i in oldOrder.value.detailMap) {
|
||||
console.log(oldOrder.value)
|
||||
total += oldOrder.value.detailMap[i].reduce((prve: number, cur: any) => {
|
||||
console.log(cur)
|
||||
if (cur.isGift) {
|
||||
return prve + 0
|
||||
}
|
||||
const discount_sale_amount = cur.discount_sale_amount * 1 || 0
|
||||
const memberPrice = cur.skuData ? (cur.skuData.memberPrice || cur.skuData.salePrice) : 0
|
||||
const price = (discount_sale_amount || cur.salePrice || 0)
|
||||
@@ -411,7 +416,15 @@ export const useCartsStore = defineStore("carts", () => {
|
||||
number: v.num,
|
||||
id: v.id,
|
||||
pack_number: v.packNumber,
|
||||
discount_sale_amount: v.discountSaleAmount * 1 || 0
|
||||
discount_sale_amount: v.discountSaleAmount * 1 || 0,
|
||||
is_print: v.isPrint,
|
||||
is_wait_call: v.isWaitCall,
|
||||
is_gift: v.isGift,
|
||||
is_temporary: v.isTemporary,
|
||||
discount_sale_note: v.discountSaleNote,
|
||||
product_name: v.productName,
|
||||
sku_name: v.skuName,
|
||||
sku_id: v.skuId
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -592,6 +605,7 @@ export const useCartsStore = defineStore("carts", () => {
|
||||
WebSocketManager.sendMessage(msg);
|
||||
}
|
||||
return {
|
||||
giftMoney,
|
||||
goodsTotal,
|
||||
isLinkFinshed,
|
||||
setOldOrder,
|
||||
|
||||
Reference in New Issue
Block a user