diff --git a/src/views/canteen/canteenDailyMenu/form.vue b/src/views/canteen/canteenDailyMenu/form.vue
index 84084d1..5320845 100644
--- a/src/views/canteen/canteenDailyMenu/form.vue
+++ b/src/views/canteen/canteenDailyMenu/form.vue
@@ -62,6 +62,7 @@
查询
重置
+ 取消所有勾选
diff --git a/src/views/canteen/canteenOnlineSpu/form.vue b/src/views/canteen/canteenOnlineSpu/form.vue
index 3ac6bb8..e99e72b 100644
--- a/src/views/canteen/canteenOnlineSpu/form.vue
+++ b/src/views/canteen/canteenOnlineSpu/form.vue
@@ -22,11 +22,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -164,6 +164,7 @@ const getcanteenOnlineSpuData = (id: string) => {
price: Number(displayPrice(res.data.price, "")),
marketPrice: Number(displayPrice(res.data.marketPrice, "")),
status: "" + res.data.status,
+ description: res.data.description ?? "",
})
})
.finally(() => {
diff --git a/src/views/canteen/canteenOnlineSpu/index.vue b/src/views/canteen/canteenOnlineSpu/index.vue
index c6e673b..90884d1 100644
--- a/src/views/canteen/canteenOnlineSpu/index.vue
+++ b/src/views/canteen/canteenOnlineSpu/index.vue
@@ -118,8 +118,8 @@
-
-
+
+
@@ -151,13 +151,17 @@ const state: BasicTableProps = reactive({
})
onMounted(async () => {
+ await getCanteenOnlineCategoryAll()
+})
+
+const getCanteenOnlineCategoryAll = async () => {
try {
const res = await getCanteenOnlineCategory()
categoryOptions.value = res.data.records
} catch (error) {
categoryOptions.value = []
}
-})
+}
const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
@@ -197,4 +201,10 @@ const handleDelete = async (ids: string[]) => {
useMessage().error(err.msg)
}
}
+
+// 导入每日菜品成功刷新
+const exportRefresh = () => {
+ getDataList(false)
+ getCanteenOnlineCategoryAll()
+}
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
index fc543eb..8c13c3f 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
@@ -69,8 +69,16 @@
:data="vxeTableData"
:edit-rules="validRules"
show-footer
- :footer-data="[{ seq: '合计', totalAmount }]"
- :merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 7 }]"
+ :footer-data="[
+ {
+ seq: '合计',
+ quantity: total.quantity,
+ purchasePrice: total.purchasePrice,
+ realPrice: `${total.realPrice}元`,
+ totalAmount: total.totalAmount,
+ },
+ ]"
+ :merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 4 }]"
@checkbox-all=""
@checkbox-change=""
size="mini"
@@ -148,7 +156,7 @@
- {{ totalAmount }} 元
+ {{ total.totalAmount }}元
@@ -235,9 +243,15 @@ const validRules = ref>({
})
// 合计总金额
-const totalAmount = computed(() =>
- vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.totalAmount || 0), 0).toFixed(2),
-)
+const total = computed(() => {
+ const quantity = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.quantity || 0), 0).toFixed(2)
+ const purchasePrice = displayPrice(
+ vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.purchasePrice || 0), 0),
+ )
+ const realPrice = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.realPrice || 0), 0)
+ const totalAmount = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.totalAmount || 0), 0).toFixed(2)
+ return { quantity, purchasePrice, realPrice, totalAmount }
+})
onMounted(async () => {
await getInitData()
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index 513c756..ff1aba3 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -97,8 +97,16 @@
:data="vxeTableData"
:edit-rules="validRules"
show-footer
- :footer-data="[{ seq: '合计', totalAmount }]"
- :merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 7 }]"
+ :footer-data="[
+ {
+ seq: '合计',
+ quantity: total.quantity,
+ purchasePrice: total.purchasePrice,
+ realPrice: `${total.realPrice}元`,
+ totalAmount: total.totalAmount,
+ },
+ ]"
+ :merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 4 }]"
@checkbox-all=""
@checkbox-change=""
size="mini"
@@ -176,7 +184,7 @@
- {{ totalAmount }} 元
+ {{ total.totalAmount }}元
@@ -263,9 +271,15 @@ const validRules = ref>({
})
// 合计总金额
-const totalAmount = computed(() =>
- vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.totalAmount || 0), 0).toFixed(2),
-)
+const total = computed(() => {
+ const quantity = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.quantity || 0), 0).toFixed(2)
+ const purchasePrice = displayPrice(
+ vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.purchasePrice || 0), 0),
+ )
+ const realPrice = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.realPrice || 0), 0)
+ const totalAmount = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.totalAmount || 0), 0).toFixed(2)
+ return { quantity, purchasePrice, realPrice, totalAmount }
+})
onMounted(async () => {
await getInitData()