From 8fd0ad7a95d85cd09c5bf98bc0c05235a162a8af Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 16 十一月 2023 16:40:34 +0800
Subject: [PATCH] bug列表：180(分类上增加关键属性查重校验字段当前分类是否参与校验，历史数据导入代码逻辑中关键属性校验增加过滤条件)

---
 Source/UBCS-WEB/src/views/modeling/LinkType.vue |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/LinkType.vue b/Source/UBCS-WEB/src/views/modeling/LinkType.vue
index afadda5..a26c55d 100644
--- a/Source/UBCS-WEB/src/views/modeling/LinkType.vue
+++ b/Source/UBCS-WEB/src/views/modeling/LinkType.vue
@@ -2,16 +2,14 @@
     <el-container>
         <!-- 椤剁鎸夐挳 -->
         <el-header class="businessHeader" style="height: 40px;">
-                <el-button-group>
-                    <el-button type="primary" @click="linkTypeAdd" size="small">
-                        <i class="el-icon-plus"></i>&nbsp;
-                        鏂板
-                    </el-button>
-                    <el-button type="primary" @click="linkTypeEdit" size="small">
-                        <i class="el-icon-edit"></i>&nbsp;
-                        淇敼
-                    </el-button>
-                </el-button-group>
+          <div>
+            <el-button type="primary" @click="linkTypeAdd" size="small" icon="el-icon-plus" v-if="permissionList.addBtn" plain>
+              鏂板
+            </el-button>
+            <el-button type="primary" @click="linkTypeEdit" size="small" icon="el-icon-edit" v-if="permissionList.editBtn" plain>
+              淇敼
+            </el-button>
+          </div>
             </el-header>
         <!-- 渚ц竟鏍忔爲 -->
         <el-container>
@@ -64,7 +62,7 @@
                                     <i :class="icons.domain"></i>
                                     鎵�灞為鍩�
                                 </template>
-                                <el-tag size="small">
+                                <el-tag v-if="obj.domainText" size="small">
                                     {{ obj.domainText }}
                                 </el-tag>
                             </el-descriptions-item>
@@ -97,7 +95,7 @@
                         </el-descriptions>
 
                        <el-descriptions class="margin-top" :column="2" size="medium" border>
-                        <!-- 
+                        <!--
                             <el-descriptions-item :labelStyle="descriptionOption.labelStyle"
                                 :contentStyle="descriptionOption.contentStyle">
                                 <template slot="label">
@@ -122,7 +120,7 @@
                                 </template>
                                 {{ obj.description }}
                             </el-descriptions-item>
-                        </el-descriptions> 
+                        </el-descriptions>
                     </basic-container>
                     <!-- 灞炴�у垪琛�-->
                     <basic-container>
@@ -142,7 +140,7 @@
 
     </el-container>
 </template>
-  
+
 <script>
 import {
     initTree,
@@ -151,6 +149,7 @@
     saveFromTable,
     getDetail
 } from "@/api/omd/linkType"
+import {mapGetters} from "vuex";
 export default {
     name: "LinkType",
     data() {
@@ -179,7 +178,7 @@
             },
             loadOption: {
                 border: true,
-                height: 360,
+                height: 395,
                 editBtn: false,
                 addBtn: false,
                 menu: false,
@@ -228,6 +227,15 @@
             },
         }
     },
+    computed:{
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          addBtn: this.vaildData(this.permission.modeling_LinkType.LinkType_add, false),
+          editBtn: this.vaildData(this.permission.modeling_LinkType.LinkType_edit, false),
+        }
+      }
+    },
     created() {
         this.initTreeOnLoad();
         this.initDomainOption();
@@ -255,7 +263,6 @@
             this.addOption.linkType = JSON.parse(json);
             this.$refs.linkAdd.linkType = this.addOption.linkType;
             this.$refs.linkAdd.showSubmitDialog = true;
-            console.log(this.obj);
         },
         // 浠庡凡鏈変腑鑾峰彇鎸夐挳鐐瑰嚮浜嬩欢
         selectFromTable() {
@@ -277,10 +284,9 @@
     }
 }
 </script>
-  
+
 <style lang="scss">
 .attributeCrud>.el-card:nth-of-type(2)>.el-card__body>.avue-crud__menu {
     display: none !important;
 }
 </style>
-  
\ No newline at end of file

--
Gitblit v1.9.3