From 9f38704fb05676220542f639ba85104625c3f446 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期五, 26 一月 2024 15:44:43 +0800 Subject: [PATCH] 添加主数据手动同步,元数据管理添加下拉框条件搜索,业务类型修复bug拆分组件 --- Source/UBCS-WEB/src/views/modeling/Business.vue | 42 ++++++++++++++---------------------------- 1 files changed, 14 insertions(+), 28 deletions(-) diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue index f568592..433d618 100644 --- a/Source/UBCS-WEB/src/views/modeling/Business.vue +++ b/Source/UBCS-WEB/src/views/modeling/Business.vue @@ -6,7 +6,7 @@ <el-container> <el-aside style="width: 300px"> <basic-container class="businessTreeContainer"> - <div class="app"> + <div class="app"style="overflow: auto;height: 84.3vh;"> <div style="display: flex;margin-bottom: 10px;justify-content: space-around;"> <el-button v-if="permissionList.addBtn" plain size="mini" type="primary" @click="businessAdd"> @@ -20,7 +20,7 @@ type="primary" @click="selectFromTable"> 浠庡凡鏈変腑鑾峰彇 </el-button> </div> - <avue-tree :data="treeData" :option="treeOption" class="businessTree" style="height: 70.3vh" + <avue-tree :data="treeData" :option="treeOption" class="businessTree" style="height: 74.3vh" @node-click="nodeClick"> <template slot-scope="{ node, data }" class="el-tree-node__label"> <el-tooltip :content="$createElement('div', { domProps: { innerHTML: node.label } })" class="item" effect="dark" @@ -94,24 +94,6 @@ </template> {{ obj.lifeCycleName ? obj.lifeCycleName + '(' + obj.lifeCycleId + ')' : '' }} </el-descriptions-item> - <!-- <el-descriptions-item :contentStyle="descriptionOption.contentStyle"--> - <!-- :labelStyle="descriptionOption.labelStyle">--> - <!-- <template slot="label">--> - <!-- <i :class="icons.view"></i>--> - <!-- 瑙嗗浘--> - <!-- </template>--> - <!-- <el-tag v-if="obj.viewText" size="small">--> - <!-- {{ obj.viewText }}--> - <!-- </el-tag>--> - <!-- <span v-else></span>--> - <!-- </el-descriptions-item>--> - <!-- <el-descriptions-item> - <template slot="label"> - <i class="el-icon-arrow-down"></i> - 瀹炵幇绫� - </template> - {{ obj.implClass }} - </el-descriptions-item> --> <el-descriptions-item :contentStyle="descriptionOption.contentStyle" :labelStyle="descriptionOption.labelStyle"> <template slot="label"> @@ -132,7 +114,7 @@ </avue-crud> </basic-container> </el-main> - <el-dialog :visible="ref.visible" append-to-body title="浠庢暟鎹簱涓坊鍔�" top="9vh" width="700px" + <el-dialog :visible="ref.visible" append-to-body title="浠庢暟鎹簱涓坊鍔�" top="4vh" width="600px" @close="dialoghandelfalse"> 閫夋嫨棰嗗煙锛� <el-select v-model="domain" placeholder="璇烽�夋嫨" size="small" @change="refOnLoad"> @@ -155,6 +137,10 @@ <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions" :icons="icons" :type="type" @refreshTable="initTreeOnLoad"> </business-add> + <business-edit ref="btmEdit" :btmType="addOption.btmEditType" :domainOption="domainOptions" :icons="icons" :type="type" + @refreshTable="initTreeOnLoad"> + + </business-edit> </el-container> </template> <script> @@ -193,6 +179,7 @@ }, addOption: { btmType: {}, + btmEditType:{} }, loadOption: { height: 'auto', @@ -262,6 +249,7 @@ tabs: true, addBtn: false, menu: false, + refreshBtn:false, highlightCurrentRow: true, column: [ { @@ -301,6 +289,7 @@ if (data.oid) { getDetail(data.oid).then(res => { this.obj = res.data.data; + this.addOption.btmEditType = res.data.data; }) } else { this.$message.warning('璇风偣鍑诲瓙鑺傜偣'); @@ -379,9 +368,9 @@ this.$message.warning("璇烽�夋嫨涓�鏉″彾瀛愯妭鐐圭殑涓氬姟绫诲瀷"); return; } - const json = JSON.stringify(this.obj); - this.$refs.btmAdd.btmType = JSON.parse(json); - this.$refs.btmAdd.showSubmitDialog = true; + // const json = JSON.stringify(this.obj); + // this.$refs.btmAdd.btmType = JSON.parse(json); + this.$refs.btmEdit.showSubmitDialog = true; this.type = 'edit' this.ifRefreshBtmAddRefresh(); }, @@ -403,10 +392,7 @@ } -.app { - overflow-y: auto; - height: 84.3vh; -} + // //.app::-webkit-scrollbar { -- Gitblit v1.9.3