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/components/Tree/attrCrud.vue |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index faa8b02..5e22116 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag" class="app">
-      <el-button-group>
+    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
+
       <!--鏂板-->
       <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">娣诲姞 {{ msg }}</el-button>
       <!--        鍏ㄥ睆缂栬緫-->
@@ -10,8 +10,8 @@
       <el-button icon="el-icon-info" size="small" @click="ruleAddHandler">楠岃瘉瑙勫垯</el-button>
       <!--        灞炴�у垎缁�-->
       <el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
-      </el-button-group>
-      <el-button-group>
+
+
       <!--        鍒嗙被娉ㄥ叆-->
       <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
         <!--    缁勫悎瑙勫垯-->
@@ -22,8 +22,8 @@
       <el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
       <!--    棰勮鎺掑簭-->
         <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
-      </el-button-group>
-      <el-button-group>
+
+
       <!--    淇濆瓨-->
       <el-button size="small" @click="addsHandler" icon="el-icon-check">淇濆瓨</el-button>
       <!--    鍒犻櫎-->
@@ -32,7 +32,7 @@
       <el-button size="small" @click="reset" icon="el-icon-refresh-right">閲嶇疆</el-button>
       <!--    鍚屾鍒板叾浠栨ā鏉�-->
       <el-button size="small"@click="syncHandle" icon="el-icon-share">鍚屾鍒板叾浠栨ā鏉�</el-button>
-      </el-button-group>
+
       <!--    缂栫爜鐢宠棰勮-->
       <el-button size="small" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
       <!--        楠岃瘉瑙勫垯-->
@@ -242,7 +242,7 @@
     </div>
     <el-table :data="ProData"
               style="width: 100%"
-              :height='attrEditVisible == false && attrFlagChiledren==false?400 :750'
+              height="280"
               @cell-click="handleCellClicks"
               @select="selectHandle"
               @selection-change="selectionChange"
@@ -936,13 +936,11 @@
         column: [
           {
             label: "灞炴�ц嫳鏂囧悕绉�",
-            prop: "id",
-            width:110
+            prop: "id"
           },
           {
             label: "灞炴�т腑鏂囧悕绉�",
-            prop: "name",
-            width:110
+            prop: "name"
           },
           {
             label: "闀垮害",
@@ -1486,7 +1484,6 @@
     //涓氬姟绫诲瀷閫夋嫨
     businessSelect(selection, row) {
       this.busineSelectList = selection
-      console.log(selection)
     },
     // 浠庝笟鍔＄被鍨嬩腑閫夋嫨鏁版嵁寮圭獥
     busineHandle() {
@@ -1548,7 +1545,7 @@
       console.log(row)
     },
     //琛ㄦ牸閫夋嫨
-    selectionChange(list,) {
+    selectionChange(list) {
       this.attrSelectList = list;
       console.log(list)
     },
@@ -1590,6 +1587,8 @@
       }else if(column.property == 'verifyRule'){
         this.RulesForm.expressionTextt=this.CurrentCell.verifyRule;
         this.rulesVisible=true;
+        console.log(this.CurrentCell.verifyRule)
+        console.log(this.RulesForm.expressionText)
       }
     },
     saveRows() {
@@ -1816,11 +1815,7 @@
 </script>
 
 <style scoped lang="scss" >
-///deep/ .el-button {
-//  margin: 0 10px 10px 0;
-//}
-.app el-button{
-  z-index: 1;
-  margin: 0 10px 10px 0 !important;
+/deep/ .el-button {
+  margin: 0 10px 10px 0;
 }
 </style>

--
Gitblit v1.9.3