diff --git a/src/api/supermarketerp/stockTaking.ts b/src/api/supermarketerp/stockTaking.ts index b208261..d1830f4 100644 --- a/src/api/supermarketerp/stockTaking.ts +++ b/src/api/supermarketerp/stockTaking.ts @@ -12,8 +12,8 @@ export function addObj(data?: object) { // 库存盘点修改 export function putObj(data?: object) { return request({ - url: "/supermarket/smErpInventoryRecords/savePD", - method: "post", + url: "/supermarket/smErpInventoryRecords/updatePD", + method: "put", data, }) } diff --git a/src/views/supermarketerp/stockTaking/form.vue b/src/views/supermarketerp/stockTaking/form.vue index 80d7197..6233f15 100644 --- a/src/views/supermarketerp/stockTaking/form.vue +++ b/src/views/supermarketerp/stockTaking/form.vue @@ -95,7 +95,9 @@ - 单位:{{ item.unit }} 装数:{{ item.packageNum }} 进价:{{ displayPrice(item.purchasePrice, "元") }} + 单位:{{ item.unit }} 装数:{{ item.packageNum }} 进价:{{ displayPrice(item.purchasePrice, "元") }} + 规格:{{ item.spec }} + @@ -144,17 +146,17 @@ {{ computeLoss(row) }} - + {{ row.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0) || 0 }} - + - + {{ ( @@ -407,20 +409,26 @@ const settledTableItems = computed(() => { return vxeTableData.value.map((item: any) => { return { ...item, + erpSpuId: item.erpSpuId, + profit: item._cachedProfit, + loss: item._cachedLoss, + // 盘盈就是1,盘亏就是2 + orderType: item._cachedProfit === item._cachedLoss ? "0" : item._cachedProfit > item._cachedLoss ? "1" : "2", + accountNumber: item.stock, + realNumber: item.erpUnitVos.reduce((prev: number, curr: any) => prev + Number(curr.realNumber), 0), unitPrice: Number( displayPrice( item.erpUnitVos.reduce((pre: any, cur: any) => pre + cur.purchasePrice * Number(cur.accountNumber), 0), "", ), ), - realPrice: Number( - displayPrice( - item.erpUnitVos.reduce((pre: any, cur: any) => pre + cur.purchasePrice * Number(cur.realNumber), 0), - "", - ), - ), - profit: item._cachedProfit, - loss: item._cachedLoss, + realPrice: item.pdPrice, + // realPrice: Number( + // displayPrice( + // item.erpUnitVos.reduce((pre: any, cur: any) => pre + cur.purchasePrice * Number(cur.realNumber), 0), + // "", + // ), + // ), totalNumber: item.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0) || 0, totalAmount: Number( ( @@ -428,8 +436,6 @@ const settledTableItems = computed(() => { (item.erpUnitVos.reduce((pre: any, cur: any) => pre + Number(cur.realNumber) * cur.packageNum, 0) || 0) ).toFixed(2) || 0, ), - // 盘盈就是1,盘亏就是2 - orderType: item._cachedProfit === item._cachedLoss ? "0" : item._cachedProfit > item._cachedLoss ? "1" : "2", } }) }) @@ -449,6 +455,7 @@ const onContinueAdd = async () => { const onSave = async () => { console.log("baseDataForm", baseDataForm) console.log("vxeTableData", vxeTableData.value) + console.log("settledTableItems", settledTableItems.value) ;(await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) && (await submitData(baseDataForm, settledTableItems.value, loading, putObj, addObj)) && clearData() &&