From 54e14bff397221b5b0d64720f77217f4d34ebf98 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 14 七月 2023 09:50:53 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/views/modeling/Business.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index c29b168..6dd1b28 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -15,7 +15,7 @@
<avue-tree id="basic" :data="treeData" :option="treeOption" @node-click="nodeClick" class="businessTree">
<span class="el-tree-node__label" slot-scope="{ node, data }">
<span>
- <i class="el-icon-star-on"></i>
+ <i :class="(node || {}).level === 2 ? 'el-icon-star-off' : 'el-icon-folder-opened'"></i>
{{ (node || {}).label }}
</span>
</span>
@@ -82,7 +82,7 @@
<i :class="icons.revisionRule"></i>
鐗堟湰瑙勫垯
</template>
- {{ obj.revisionRuleName }}
+ {{ obj.revisionRuleName ? obj.revisionRuleName+ '(' + obj.revisionRuleId + ')' : ''}}
</el-descriptions-item>
<el-descriptions-item :labelStyle="descriptionOption.labelStyle"
:contentStyle="descriptionOption.contentStyle">
@@ -90,7 +90,7 @@
<i :class="icons.lifeCycle"></i>
鐢熷懡鍛ㄦ湡
</template>
- {{ obj.lifeCycleId }}
+ {{ obj.lifeCycleName ? obj.lifeCycleName + '(' + obj.lifeCycleId + ')' : ''}}
</el-descriptions-item>
<el-descriptions-item :labelStyle="descriptionOption.labelStyle"
:contentStyle="descriptionOption.contentStyle">
@@ -176,6 +176,7 @@
defaultExpandAll: true,
title: '涓氬姟绫诲瀷鏍�',
addBtn: false,
+ menu:false,
props: {
labelText: '',
label: 'label',
@@ -237,7 +238,8 @@
revisionRule: 'el-icon-s-check',
lifeCycle: 'el-icon-refresh-right',
view: 'el-icon-view',
- desc: 'el-icon-chat-line-square'
+ desc: 'el-icon-chat-line-square',
+ referType: 'el-icon-search'
},
ref: {
// 浠庤〃涓�夋嫨dialog鐘舵��
@@ -278,7 +280,7 @@
this.initDomainOption();
},
methods: {
- nodeClick(data) {
+ nodeClick(data,node,leaf) {
if (data.oid) {
getDetail(data.oid).then(res => {
this.obj = res.data.data;
@@ -347,6 +349,7 @@
},
businessAdd() {
this.$refs.btmAdd.showSubmitDialog = true;
+ this.$refs.btmAdd.btmType = {};
this.ifRefreshBtmAddRefresh();
},
businessEdit() {
--
Gitblit v1.9.3