From ba642d2510ca51edf0b5e64a78b0088fe2ee3b4f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 18:03:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/modeling/Business.vue |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 35923fd..317fdb0 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-header class="businessHeader" style="height: 40px;">
+    <el-header class="businessHeader" style="height: 40px;padding:0 8px">
       <el-button-group>
         <el-button type="primary" @click="businessAdd" size="small"> <i class="el-icon-plus"></i>&nbsp; 鏂板</el-button>
         <el-button type="primary" @click="businessEdit" size="small"><i class="el-icon-edit"></i>&nbsp; 淇敼</el-button>
@@ -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>
@@ -58,9 +58,10 @@
                   <i :class="icons.domain"></i>
                   鎵�灞為鍩�
                 </template>
-                <el-tag size="small">
+                <el-tag v-if="obj.domainText" size="small">
                   {{ obj.domainText }}
                 </el-tag>
+                <span v-else></span>
               </el-descriptions-item>
               <!-- <el-descriptions-item>
             <template slot="label">
@@ -82,7 +83,7 @@
                   <i :class="icons.revisionRule"></i>
                   鐗堟湰瑙勫垯
                 </template>
-                {{ obj.versionRule }}
+                {{ obj.revisionRuleName ? obj.revisionRuleName+ '(' + obj.revisionRuleId + ')' : ''}}
               </el-descriptions-item>
               <el-descriptions-item :labelStyle="descriptionOption.labelStyle"
                 :contentStyle="descriptionOption.contentStyle">
@@ -90,7 +91,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">
@@ -98,9 +99,10 @@
                   <i :class="icons.view"></i>
                   瑙嗗浘
                 </template>
-                <el-tag size="small">
+                <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">
@@ -176,6 +178,7 @@
         defaultExpandAll: true,
         title: '涓氬姟绫诲瀷鏍�',
         addBtn: false,
+        menu:false,
         props: {
           labelText: '',
           label: 'label',
@@ -188,7 +191,7 @@
       },
       loadOption: {
         border: true,
-        height: 466,
+        height: 478,
         editBtn: false,
         addBtn: false,
         menu: false,
@@ -237,7 +240,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 +282,7 @@
     this.initDomainOption();
   },
   methods: {
-    nodeClick(data) {
+    nodeClick(data,node,leaf) {
       if (data.oid) {
         getDetail(data.oid).then(res => {
           this.obj = res.data.data;
@@ -347,11 +351,16 @@
     },
     businessAdd() {
       this.$refs.btmAdd.showSubmitDialog = true;
+      this.$refs.btmAdd.btmType = {};
       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