diff --git a/src/views/canteen/canteenInventoryRecords/form.vue b/src/views/canteen/canteenInventoryRecords/form.vue index 333d84f..2106faa 100644 --- a/src/views/canteen/canteenInventoryRecords/form.vue +++ b/src/views/canteen/canteenInventoryRecords/form.vue @@ -183,14 +183,20 @@ const getInitData = async () => { baseForm.id = undefined const id = props.formId if (id) { - // loading.value = true - // // 获取清单数据 - // const [cgPlanData] = await Promise.allSettled([getObj(id)]) - // .then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null))) - // .finally(() => (loading.value = false)) - // if (cgPlanData && cgPlanData.code === 0) { - // Object.assign(baseForm, cgPlanData.data) - // } + loading.value = true + // 获取清单数据 + const [res] = await Promise.allSettled([getObj(id)]) + .then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null))) + .finally(() => (loading.value = false)) + if (res && res.code == 0) { + Object.assign(baseForm, res.data, { items: "" }) + state.itemTableForm = res.data.items.map((item: any) => ({ + ...item, + realPrice: displayPrice(item.realPrice, ""), + totalAmount: displayPrice(item.totalNumber, ""), + unitPrice: displayPrice(item.unitPrice, ""), + })) + } } else { loading.value = true // 获取采购入库编号 @@ -260,7 +266,6 @@ const tableFormItems = () => { totalAmount: storePrice((Number(item.quantity || 0) * Number(item.realPrice || 0)).toFixed(2)), stock: item.stock, remark: item.remark, - orderType: 1, totalNumber: item.totalNumber, } }) diff --git a/src/views/canteen/canteenInventoryRecords/index.vue b/src/views/canteen/canteenInventoryRecords/index.vue index a00a938..e644e54 100644 --- a/src/views/canteen/canteenInventoryRecords/index.vue +++ b/src/views/canteen/canteenInventoryRecords/index.vue @@ -60,7 +60,7 @@ - + @@ -174,6 +174,6 @@ const handleDelete = async (ids: string[]) => { const formClose = () => { formState.showForm = false formState.formId = undefined - fetchList() + getDataList() }