From cdba4febf23c6f55346a474579361923aacf0bc9 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 02 十二月 2024 14:54:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
index efaba17..c044f35 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
@@ -92,6 +92,11 @@
icon="el-icon-check"
v-if="scope.type === 'add'"
@click="handleSaveNext()">淇濆瓨鍚庣户缁坊鍔�</el-button>
+ <el-button type="primary"
+ size="small"
+ icon="el-icon-circle-plus-outline"
+ v-if="scope.type === 'add'"
+ @click="$refs.BottomCrud.rowSave()">淇濆瓨</el-button>
</template>
</avue-crud>
</div>
@@ -154,6 +159,7 @@
selection: false,
refreshBtn: false,
dialogWidth:'700',
+ saveBtn:false,
// height:'auto',
column: [
{
@@ -384,9 +390,10 @@
// 鍙充晶琛ㄦ牸淇℃伅
getRightTableList(row) {
+ console.log(row);
this.tableLoading = true;
const params = {
- plactioncls: row.id
+ plactioncls: row.id ? row.id : ''
}
getActionTableData(params).then(res => {
const data = res.data.data;
@@ -427,7 +434,7 @@
}
this.tableLoading = true;
const apiParams = {
- plactioncls: this.treeNodeRow.id === 'root' ? '' : this.treeNodeRow.id,
+ plactioncls: this.treeNodeRow.id === 'root' ? '' : this.treeNodeRow.id ? this.treeNodeRow.id : '',
...params
}
@@ -451,12 +458,13 @@
beforeOpen(done, type, loading) {
if ([ 'edit'].includes(type)) {
// 缂栬緫閫昏緫
- this.option.column[32].disabled = false;
+ this.$set(this.option.column[2],'disabled',false);
} else {
// 鏂板閫昏緫
- this.option.column[2].disabled = true;
+ this.$set(this.option.column[2],'disabled',true);
}
done();
+ console.log(this.option.column)
},
// action鍒楄〃澧炲姞
addClickHandler() {
@@ -664,8 +672,8 @@
this.$message.success('鍒嗙被鍒涘缓鎴愬姛');
this.getTreeList();
}
- done();
})
+ done();
loading();
},
--
Gitblit v1.9.3