From 2871cb99e018f6bf9e2ef76a424a1429a7c818f0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 13 七月 2023 11:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/Business.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 35923fd..12bf821 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -82,7 +82,7 @@
<i :class="icons.revisionRule"></i>
鐗堟湰瑙勫垯
</template>
- {{ obj.versionRule }}
+ {{ 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.lifeCycleId + ')' }}
</el-descriptions-item>
<el-descriptions-item :labelStyle="descriptionOption.labelStyle"
:contentStyle="descriptionOption.contentStyle">
@@ -350,8 +350,12 @@
this.ifRefreshBtmAddRefresh();
},
businessEdit() {
- var json = JSON.stringify(this.obj);
- this.$refs.btmAdd.btmType = JSON.parse(json);
+ if (!this.obj.oid){
+ this.$message.warning("璇烽�夋嫨涓�鏉″彾瀛愯妭鐐圭殑涓氬姟绫诲瀷");
+ return;
+ }
+ const json = JSON.stringify(this.obj);
+ this.$refs.btmAdd.btmType =JSON.parse(json);
this.$refs.btmAdd.showSubmitDialog = true;
this.ifRefreshBtmAddRefresh();
},
--
Gitblit v1.9.3