From 1f0a10ab714699acc85430b90bcb5a1eeaad1eec Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期一, 17 七月 2023 10:14:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/main.js | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js index 3f3b231..7ad2bdd 100644 --- a/Source/UBCS-WEB/src/main.js +++ b/Source/UBCS-WEB/src/main.js @@ -38,19 +38,19 @@ 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" import businessAdd from "@/views/modeling/BusinessAdd" -import TableCrud from "@/components/Crud/Crud" +import VciMasterCrud from "@/components/Crud/VciMasterCrud" import originalAdd from "@/views/modeling/originalAdd" import FormTemplateDialog from "@/components/FormTemplate/index" import linkTypeAdd from "@/views/modeling/LinkTypeAdd" import MasterTree from "@/components/Master/MasterTree"; import FlowPath from "@/components/template/FlowPath"; import Stage from "@/components/template/Stage"; +import businesswork from "@/components/work/BusinessWork" // 灏嗗伐鍏峰嚱鏁版坊鍔犲埌鍏ㄥ眬 import utilFunc from './util/func' @@ -89,12 +89,11 @@ 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) -Vue.component('TableCrud',TableCrud) +Vue.component('VciMasterCrud',VciMasterCrud) Vue.component('originalAdd',originalAdd) Vue.component('referBtmTypeCrudDialog',referBtmTypeCrudDialog) Vue.component('referSelectBtmAttrDialog',referSelectBtmAttrDialog) @@ -104,6 +103,7 @@ Vue.component('FlowPath',FlowPath) Vue.component('Stage',Stage) Vue.component('Divider', Divider) +Vue.component('businesswork', businesswork) // 鍔犺浇鐩稿叧url鍦板潃 Object.keys(urls).forEach(key => { -- Gitblit v1.9.3