From 875be114d48b0591186030819233fdcc20a8cd0a Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期四, 20 七月 2023 14:09:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/main.js | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js
index fe04f15..d6b2346 100644
--- a/Source/UBCS-WEB/src/main.js
+++ b/Source/UBCS-WEB/src/main.js
@@ -38,8 +38,7 @@
import TemplatePro from "@/components/Tree/TemplatePro"
import attrCrud from "@/components/Tree/attrCrud"
import formulaEditor from "@/components/code-dialog-page/formulaEditor"
-import referConfigCrudDialog from "@/components/code-dialog-page/referConfigCrudDialog"
-import referConfigFormDialog from "@/components/code-dialog-page/referConfigFormDialog"
+import referConfigDialog from "@/components/code-dialog-page/referConfigDialog"
import referBtmTypeCrudDialog from "@/components/code-dialog-page/referBtmTypeCrudDialog"
import referSelectBtmAttrDialog from "@/components/code-dialog-page/referSelectBtmAttrDialog"
import advancedQuery from "@/components/advanced-query/advancedQuery"
@@ -52,10 +51,9 @@
import FlowPath from "@/components/template/FlowPath";
import Stage from "@/components/template/Stage";
import businesswork from "@/components/work/BusinessWork"
-
+import MasterTransfer from "@/components/Master/MasterTransfer";
// 灏嗗伐鍏峰嚱鏁版坊鍔犲埌鍏ㄥ眬
import utilFunc from './util/func'
-import flowPath from "@/views/flow/flowPath";
Vue.prototype.$utilFunc = utilFunc
// 娉ㄥ唽鍏ㄥ眬crud椹卞姩
window.$crudCommon = crudCommon;
@@ -90,8 +88,7 @@
Vue.component('classifyTreeform',classifyTreeform)
Vue.component('TemplatePro',TemplatePro)
Vue.component('formulaEditor',formulaEditor)
-Vue.component('referConfigCrudDialog',referConfigCrudDialog)
-Vue.component('referConfigFormDialog',referConfigFormDialog)
+Vue.component('referConfigDialog',referConfigDialog)
Vue.component('advancedQuery',advancedQuery)
Vue.component('businessAdd',businessAdd)
Vue.component('attrCrud',attrCrud)
@@ -106,6 +103,7 @@
Vue.component('Stage',Stage)
Vue.component('Divider', Divider)
Vue.component('businesswork', businesswork)
+Vue.component('MasterTransfer', MasterTransfer)
// 鍔犺浇鐩稿叧url鍦板潃
Object.keys(urls).forEach(key => {
--
Gitblit v1.9.3