From 05d45bd440ffc92e14e6c8728ac8956a0488c0ab Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 07 十二月 2023 17:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 0fe3d8e..91b2025 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -43,7 +43,7 @@
:defaultExpandAll="false"
:option="Treeoption"
class="classifyTree"
- style="height: calc(100vh - 280px)"
+ style="height: calc(100vh - 290px)"
@node-click="nodeClick"
>
</avue-tree>
@@ -53,7 +53,7 @@
<el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
:title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
style="width: 1700px;margin: auto">
- <el-form ref="myForm" :model="TreeAddform" :rules="rules">
+ <el-form ref="myForm" :model="TreeAddform" :rules= "rules">
<el-form-item :label="this.TreeFlag ? '鍒嗙被缂栧彿锛�' :'涓婚搴撶紪鍙凤細'" label-width="150px" prop="id"
style="display: inline-block">
<el-input v-model="TreeAddform.id" autocomplete="off" style="width: 170px"></el-input>
@@ -892,7 +892,6 @@
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
return;
}
- console.log(this.nodeClickList.oid)
flowingDependencyGen(this.nodeClickList.oid).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
}).catch(res => {
@@ -902,7 +901,6 @@
// switch
switchChange() {
this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0;
- // console.log(this.TreeAddform.isParticipateCheck)
},
//瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
BtmEscHandler() {
@@ -1346,7 +1344,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1389,7 +1387,7 @@
});
}
} catch (error) {
- console.error(error);
+ // console.error(error);
} finally {
this.loading = false;
}
@@ -1459,7 +1457,7 @@
}
},
treeClick(e) {
- console.log(e);
+ // console.log(e);
},
//鍩烘湰淇℃伅琛ㄥ崟鍒锋柊
referTreeForm() {
--
Gitblit v1.9.3