From 51542c2d2272cfe19db8e7dbc07cccc1c448d22a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 20 九月 2024 15:17:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
index 5b03358..5e6ad14 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/versioning/index.vue
@@ -18,8 +18,8 @@
@click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
</el-button>
</div>
- <!-- 宸︿晶鏍� -->
- <div style="height: calc(100vh - 300px);">
+ <!-- 宸︿晶鏍� -->
+ <div style="height: calc(100vh - 260px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
@@ -104,7 +104,7 @@
</basic-container>
</el-main>
- <!-- 鏂板 淇敼 -->
+ <!-- 鏂板 淇敼 -->
<el-dialog
v-dialogDrag
:title="dialogTitle === 'add' ? '鍒涘缓' : '淇敼'"
@@ -164,11 +164,11 @@
</span>
</el-dialog>
- <!-- 瀵煎叆 -->
+ <!-- 瀵煎叆 -->
<upload-file ref="upload" :fileType="upFileType" :fileUrl="fileUrl" :tipList="tipList" title="瀵煎叆"
@updata="getTreeList"></upload-file>
- <!-- 鏌ョ湅浣跨敤鑼冨洿 -->
+ <!-- 鏌ョ湅浣跨敤鑼冨洿 -->
<el-dialog
v-dialogDrag
:visible.sync="checkViewVisible"
@@ -302,7 +302,7 @@
this.getTreeList();
},
methods: {
- //宸︿晶鏍戞煡璇�
+ // 宸︿晶鏍戞煡璇�
getTreeList() {
getVersionRuleAllList().then(res => {
const data = res.data.data;
@@ -354,17 +354,22 @@
// 鏂板 缂栬緫 淇濆瓨
addSaveHandler() {
const saveFunction = this.dialogTitle === 'add' ? addVersionRule : updateVersionRule;
-
- saveFunction(this.form).then(res => {
- if (res.data.code === 200) {
- this.$message.success(res.data.obj);
- this.getTreeList();
- this.visible = false;
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ saveFunction(this.form).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.getTreeList();
+ this.visible = false;
+ } else {
+ this.$message.error(res.data.obj);
+ }
+ }).catch(error => {
+ this.$message.error(error);
+ });
} else {
- this.$message.error(res.data.obj);
+ return false;
}
- }).catch(error => {
- this.$message.error(error);
});
},
@@ -468,7 +473,6 @@
width: 82px;
}
}
-
}
.headerCon {
--
Gitblit v1.9.3