-
+
@@ -29,22 +28,41 @@
-
+
新 增
-
+
删 除
-
+
-
+
@@ -63,8 +81,7 @@
@@ -82,15 +99,24 @@
-
+
-
+
@@ -124,29 +150,28 @@
-
+ min-width="300"
+ align="center"
+ >
-
+
刷新二维码
-
+
配置
-
+
编辑
- 删除
+ 删除
-
+
diff --git a/src/views/panel/index.vue b/src/views/panel/index.vue
index 710c205..6ce87b8 100644
--- a/src/views/panel/index.vue
+++ b/src/views/panel/index.vue
@@ -14,12 +14,9 @@ const loading = ref(false)
onMounted(async () => {
try {
- // 是否生成环境
- if (import.meta.env.VITE_ENV === "prod") {
- openPlanUrl("https://stgl.pj.gov.cn/cockpit/#/canteen")
- } else {
- openPlanUrl("http://localhost:5173/#/canteen")
- }
+ const isDev = import.meta.env.MODE === "development"
+ const url = isDev ? "http://localhost:5173/#/canteen" : "https://stgl.pj.gov.cn/cockpit/#/canteen"
+ openPlanUrl(url)
loading.value = true
router.back()
} catch (error: any) {
diff --git a/src/views/panel/setting/components/nutrition-setting.vue b/src/views/panel/setting/components/nutrition-setting.vue
index 8a31b28..9bc8df9 100644
--- a/src/views/panel/setting/components/nutrition-setting.vue
+++ b/src/views/panel/setting/components/nutrition-setting.vue
@@ -42,6 +42,19 @@
+
+
+
今日菜品复购排行
+
+
+
+ 需要排除的菜品分类
+
+
+
+
+
@@ -66,6 +79,8 @@ const form = reactive
({
scCategoryIds: [],
// 主食菜品分类
zsCategoryIds: [],
+ // 复购排行需要排除的菜品分类
+ repurchaseTopExcludeCategoryIds: [],
},
})
@@ -91,6 +106,7 @@ async function getSetting() {
hcCategoryIds: [],
scCategoryIds: [],
zsCategoryIds: [],
+ repurchaseTopExcludeCategoryIds: [],
}
}
if (data) {
diff --git a/src/views/supermarket/mallProduct/form.vue b/src/views/supermarket/mallProduct/form.vue
index d92eae7..fe41dc4 100644
--- a/src/views/supermarket/mallProduct/form.vue
+++ b/src/views/supermarket/mallProduct/form.vue
@@ -30,18 +30,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -72,7 +72,7 @@
-
+
@@ -134,7 +134,7 @@
-
+
diff --git a/src/views/supermarketerp/report/inventory/index.vue b/src/views/supermarketerp/report/inventory/index.vue
index 7bc11a5..9993797 100644
--- a/src/views/supermarketerp/report/inventory/index.vue
+++ b/src/views/supermarketerp/report/inventory/index.vue
@@ -68,19 +68,19 @@
-
+
-
+
-
+
@@ -89,18 +89,26 @@
-
+
-
-
+
+
+ {{ row.salesCost.toFixed(2) }}
+
+
+
+
+ {{ row.grossProfit.toFixed(2) }}
+
+
-
+
-
+
@@ -157,7 +165,7 @@ const exportExcel = () => {
params.endDate = params.dateRange[1]
}
delete params.dateRange
-
+
downBlobFile("/supermarket/superMarketReport/inventory/export", params, "进销存报表.xlsx")
}
@@ -187,4 +195,3 @@ onMounted(() => {
getCategoryList()
})
-
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index 921a6b9..b2d425b 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -1,43 +1,65 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
- {{ $t("common.queryBtn")
- }}
- {{ $t("common.resetBtn") }}
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ $t("common.queryBtn") }}
+ {{ $t("common.resetBtn") }}
+
-
+
删除
-
+
-
+
@@ -81,29 +103,49 @@
-
+
- 详情
- 详情
+ 充值/扣款
- 充值/扣款
+
+ @click="doTransferAccounts(row)"
+ >
转账
-
+
diff --git a/src/views/wallet/wallet-manage/transfer-accounts.vue b/src/views/wallet/wallet-manage/transfer-accounts.vue
index 17540b5..901b8c6 100644
--- a/src/views/wallet/wallet-manage/transfer-accounts.vue
+++ b/src/views/wallet/wallet-manage/transfer-accounts.vue
@@ -33,13 +33,15 @@
{{ userConfigDetail.sourceWalletTypeName }}
- {{ displayPrice(userConfigDetail.sourceWalletBalance - form.balance * 100) }}
+ {{ displayPrice(userConfigDetail.sourceWalletBalance - form.balance
+ * 100) }}
{{ userConfigDetail.targetWalletTypeName }}
- {{ displayPrice(userConfigDetail.targetWalletBalance + form.balance * 100) }}
+ {{ displayPrice(userConfigDetail.targetWalletBalance + form.balance
+ * 100) }}
@@ -52,8 +54,8 @@
{{ displayPrice(userConfigDetail.maxTransferBalance) }}
- {{ displayPrice(userConfigDetail.totalTransferBalance) }}
+ {{
+ displayPrice(userConfigDetail.totalTransferBalance) }}
@@ -61,19 +63,14 @@
用户
{{ walletDetail.username }}
将
-
+
元从
{{ walletDetail.walletTypeName }}
转到
-
+