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 | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/main.js b/src/main.js index c01e80d..12c1e3a 100644 --- a/src/main.js +++ b/src/main.js @@ -42,6 +42,11 @@ import ImagePreview from "@/components/ImagePreview" // 瀛楀吀鏍囩缁勪欢 import DictTag from '@/components/DictTag' +// 琛ㄦ牸缁勪欢 +import PIMTable from "@/components/PIMTable/PIMTable.vue"; + +import { getToken } from "@/utils/auth"; +import {calculateTaxExclusiveTotalPrice, summarizeTable} from "@/utils/summarizeTable.js"; const app = createApp(App) @@ -50,10 +55,19 @@ 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://114.132.189.42:7003' +app.config.globalProperties.HaveJson = (val) => { + return JSON.parse(JSON.stringify(val)); +}; +app.config.globalProperties.uploadHeader = { + Authorization: "Bearer " + getToken(), +}; // 鍏ㄥ眬缁勪欢鎸傝浇 app.component('DictTag', DictTag) @@ -63,6 +77,7 @@ app.component('ImagePreview', ImagePreview) app.component('RightToolbar', RightToolbar) app.component('Editor', Editor) +app.component('PIMTable', PIMTable) app.use(router) app.use(store) @@ -78,5 +93,6 @@ // 鏀寔 large銆乨efault銆乻mall size: Cookies.get('size') || 'default' }) +app._context.components.ElDialog.props.closeOnClickModal.default = false app.mount('#app') -- Gitblit v1.9.3