From eae62469c0b1dbaf11f2ce7518bf5612644c6da9 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 11 七月 2023 09:30:52 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Tree/attrCrud.vue |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index e73549b..faa8b02 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
+    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag" class="app">
       <el-button-group>
       <!--鏂板-->
       <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">娣诲姞 {{ msg }}</el-button>
@@ -242,7 +242,7 @@
     </div>
     <el-table :data="ProData"
               style="width: 100%"
-              height="280"
+              :height='attrEditVisible == false && attrFlagChiledren==false?400 :750'
               @cell-click="handleCellClicks"
               @select="selectHandle"
               @selection-change="selectionChange"
@@ -936,11 +936,13 @@
         column: [
           {
             label: "灞炴�ц嫳鏂囧悕绉�",
-            prop: "id"
+            prop: "id",
+            width:110
           },
           {
             label: "灞炴�т腑鏂囧悕绉�",
-            prop: "name"
+            prop: "name",
+            width:110
           },
           {
             label: "闀垮害",
@@ -1484,6 +1486,7 @@
     //涓氬姟绫诲瀷閫夋嫨
     businessSelect(selection, row) {
       this.busineSelectList = selection
+      console.log(selection)
     },
     // 浠庝笟鍔$被鍨嬩腑閫夋嫨鏁版嵁寮圭獥
     busineHandle() {
@@ -1813,7 +1816,11 @@
 </script>
 
 <style scoped lang="scss" >
-/deep/ .el-button {
-  margin: 0 10px 10px 0;
+///deep/ .el-button {
+//  margin: 0 10px 10px 0;
+//}
+.app el-button{
+  z-index: 1;
+  margin: 0 10px 10px 0 !important;
 }
 </style>

--
Gitblit v1.9.3