From 10d4c82e729694bd49a29f589d607690dc4b71f8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 五月 2025 16:42:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main.js | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main.js b/src/main.js
index 93b940f..12c1e3a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -46,6 +46,7 @@
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import { getToken } from "@/utils/auth";
+import {calculateTaxExclusiveTotalPrice, summarizeTable} from "@/utils/summarizeTable.js";
const app = createApp(App)
@@ -54,11 +55,13 @@
app.config.globalProperties.download = download
app.config.globalProperties.parseTime = parseTime
app.config.globalProperties.resetForm = resetForm
+app.config.globalProperties.summarizeTable = summarizeTable
+app.config.globalProperties.calculateTaxExclusiveTotalPrice = calculateTaxExclusiveTotalPrice
app.config.globalProperties.handleTree = handleTree
app.config.globalProperties.addDateRange = addDateRange
app.config.globalProperties.selectDictLabel = selectDictLabel
app.config.globalProperties.selectDictLabels = selectDictLabels
-app.config.globalProperties.javaApi = 'http://192.168.1.36:8080'
+app.config.globalProperties.javaApi = 'http://114.132.189.42:7003'
app.config.globalProperties.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val));
};
--
Gitblit v1.9.3