From 7a6bb589a47ff7ef5b1553dc0fcf34a05af1b6cb Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 12 七月 2023 18:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 92ee657..7cd78ef 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" class="app">
+ <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
<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='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,9 +1815,7 @@
</script>
<style scoped lang="scss" >
-.app {
- /deep/ .el-button {
- margin: 0 10px 10px 0;
- }
+/deep/ .el-button {
+ margin: 0 10px 10px 0;
}
</style>
--
Gitblit v1.9.3