diff --git a/src/api/canteen/common.ts b/src/api/canteen/common.ts index e22cd06..5488dc9 100644 --- a/src/api/canteen/common.ts +++ b/src/api/canteen/common.ts @@ -1,7 +1,7 @@ import request from "/@/utils/request" // 获取食堂业务流水编号 -export function getCanteenSequence(params?: { type: string | number }) { +export function getCanteenSequence(params?: { date?:string ; type: string | number }) { return request({ url: "/canteen/canteen/common/getSequence", method: "get", diff --git a/src/views/canteen/canteenInventoryRecords/form.vue b/src/views/canteen/canteenInventoryRecords/form.vue index 23956eb..33c698f 100644 --- a/src/views/canteen/canteenInventoryRecords/form.vue +++ b/src/views/canteen/canteenInventoryRecords/form.vue @@ -64,17 +64,19 @@ > - - - + + + - + @@ -112,9 +114,6 @@ 保存 - @@ -178,9 +177,17 @@ const validRules = ref>({ totalNumber: [{ required: true, type: "number", min: 1, message: "必填" }], }) +watch( + () => props.formId, + async (val) => { + await getInitData() + }, +) + // 初始化数据 const getInitData = async () => { baseForm.id = undefined + clearData() const id = props.formId if (id) { loading.value = true @@ -193,8 +200,8 @@ const getInitData = async () => { state.itemTableForm = res.data.items.map((item: any) => ({ ...item, realPrice: displayPrice(item.realPrice, ""), - totalAmount: displayPrice(item.totalNumber, ""), - price: displayPrice(item.unitPrice, ""), + totalAmount: displayPrice(item.totalAmount, ""), + unitPrice: displayPrice(item.unitPrice, ""), })) } } else { @@ -205,13 +212,6 @@ const getInitData = async () => { .finally(() => (loading.value = false)) sequenceCode && sequenceCode.code === 0 && (baseForm.inventoryCode = sequenceCode.data) } - - // loading.value = true - // 获取简要食材列表 - // const [erpSpuSimpleAll] = await Promise.allSettled([getErpSpuSimpleAll()]) - // .then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null))) - // .finally(() => (loading.value = false)) - // erpSpuSimpleAll && erpSpuSimpleAll.code === 0 && (state.erpSpuSimpleAll = erpSpuSimpleAll.data) } // 点击食材选择 @@ -224,7 +224,7 @@ const getSelectedRows = (selectionRows: any) => { // 筛选新勾选的项并处理 const addedItems = selectionRows .filter((selectionRowsItem: any) => !state.itemTableForm.some((item: any) => item.erpMaterialId === selectionRowsItem.erpMaterialId)) - .map((addItem: any) => ({ ...addItem, price: displayPrice(addItem.price, ""), isNew: true })) + .map((addItem: any) => ({ ...addItem, isNew: true })) state.itemTableForm = [...state.itemTableForm, ...addedItems] @@ -258,10 +258,10 @@ const removeSelectedRows = () => { const tableFormItems = () => { return state.itemTableForm.map((item: any) => { return { - // id: item.isNew ? undefined : item.id, + id: item.isNew ? undefined : item.id, erpMaterialId: item.erpMaterialId, quantity: item.quantity, - unitPrice: storePrice(item.price), + unitPrice: storePrice(item.unitPrice), realPrice: item.realPrice ? storePrice(item.realPrice) : 0, totalAmount: storePrice((Number(item.quantity || 0) * Number(item.realPrice || 0)).toFixed(2)), stock: item.stock, diff --git a/src/views/canteen/canteenInventoryRecords/index.vue b/src/views/canteen/canteenInventoryRecords/index.vue index ed2ecc9..27c906f 100644 --- a/src/views/canteen/canteenInventoryRecords/index.vue +++ b/src/views/canteen/canteenInventoryRecords/index.vue @@ -1,6 +1,6 @@ diff --git a/src/views/canteen/canteenInventoryRecords/select-dialog.vue b/src/views/canteen/canteenInventoryRecords/select-dialog.vue index 79711af..f7d4e97 100644 --- a/src/views/canteen/canteenInventoryRecords/select-dialog.vue +++ b/src/views/canteen/canteenInventoryRecords/select-dialog.vue @@ -13,6 +13,7 @@ { const rowsToSelect = [ ...props.selectedRows.filter((row) => dataList.value.some((item) => item.erpMaterialId === row.erpMaterialId)), ] - // 去重 - const uniqueRowsToSelect = Array.from(new Map(rowsToSelect.map((row) => [row.erpMaterialId, row])).values()) // 为匹配的行设置选中状态 - uniqueRowsToSelect.forEach((row) => { + rowsToSelect.forEach((row) => { const targetRow = dataList.value.find((item) => item.erpMaterialId === row.erpMaterialId) targetRow && tableRef.value?.toggleRowSelection(targetRow, true) }) @@ -131,10 +130,7 @@ const dialogConfirm = () => { ...currentSelectedRows, ...props.selectedRows.filter((row) => !dataList.value.some((item) => item.erpMaterialId === row.erpMaterialId)), ] - // 去重 - const uniqueSelectedRows = Array.from(new Map(allSelectedRows.map((row) => [row.erpMaterialId, row])).values()) - - emit("getSelectedRows", uniqueSelectedRows) + emit("getSelectedRows", allSelectedRows) } } diff --git a/src/views/canteen/canteenProductionRecord/form.vue b/src/views/canteen/canteenProductionRecord/form.vue index 1e3ed47..3c80f35 100644 --- a/src/views/canteen/canteenProductionRecord/form.vue +++ b/src/views/canteen/canteenProductionRecord/form.vue @@ -2,7 +2,7 @@ @@ -178,12 +178,12 @@ @current-change="val => { templateQuery.current = val; searchTemplate() }" /> - -
- 取消 - 确定 -
+ + diff --git a/src/views/canteen/canteenProductionRecord/index.vue b/src/views/canteen/canteenProductionRecord/index.vue index 8a36175..299c0a4 100644 --- a/src/views/canteen/canteenProductionRecord/index.vue +++ b/src/views/canteen/canteenProductionRecord/index.vue @@ -37,7 +37,7 @@ @selection-change="selectionChangHandle" @sort-change="sortChangeHandle"> - + diff --git a/src/views/canteen/canteenProductionTemplate/index.vue b/src/views/canteen/canteenProductionTemplate/index.vue index ac02694..b9ef745 100644 --- a/src/views/canteen/canteenProductionTemplate/index.vue +++ b/src/views/canteen/canteenProductionTemplate/index.vue @@ -34,7 +34,7 @@ @selection-change="selectionChangHandle" @sort-change="sortChangeHandle"> - + diff --git a/src/views/canteen/canteenSupplier/index.vue b/src/views/canteen/canteenSupplier/index.vue index d4bdf29..231a653 100644 --- a/src/views/canteen/canteenSupplier/index.vue +++ b/src/views/canteen/canteenSupplier/index.vue @@ -37,7 +37,7 @@ @selection-change="selectionChangHandle" @sort-change="sortChangeHandle"> - + diff --git a/src/views/supermarketerp/components/erpSpuSelectDialog.vue b/src/views/supermarketerp/components/erpSpuSelectDialog.vue index e242376..46a2099 100644 --- a/src/views/supermarketerp/components/erpSpuSelectDialog.vue +++ b/src/views/supermarketerp/components/erpSpuSelectDialog.vue @@ -27,6 +27,7 @@ - + @@ -45,18 +46,17 @@ - - - - - + - + --> +