From 4a9cb99da50561faf6bca6e298859fa39965f8b0 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 13 七月 2023 15:10:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 48 ++++++++++++++++++++----------------------------
1 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index 236d931..9b1469a 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -333,36 +333,33 @@
}
},
watch:{
- nodeClickList:{
- handler(newval,oldval){
- console.log('newVal',newval,oldval)
- },
- deep:true,
- immediate:true
- },
- TreeFlag:{
- handler(newval,oldval){
- console.log('鏍戠姸鎬�',newval,oldval)
- },
- deep:true,
- immediate:true
- }
},
created() {
},
methods: {
submits(form,done){
- TreeEditSave(this.loneTreeNewForm).then(res=>{
- this.$message.success('淇敼鎴愬姛');
- this.Editclose()
- this.$emit('referTreeForm');
- this.$emit('flushed');
- done()
- })
+ if(this.TreeFlag){
+ TreeEditSave(this.loneTreeNewForm).then(res=>{
+ this.$message.success('淇敼鎴愬姛');
+ this.Editclose()
+ this.$emit('referTreeForm');
+ this.$emit('flushed');
+ done()
+ })
+ }else {
+ this.loneTreeNewForm.btmTypeName='';
+ this.loneTreeNewForm.btmTypeId='';
+ TreeEditSave(this.loneTreeNewForm).then(res=>{
+ this.$message.success('淇敼鎴愬姛');
+ this.Editclose()
+ this.$emit('referTreeForm');
+ this.$emit('flushed');
+ done()
+ })
+ }
},
error(err) {
- this.$message.success('璇锋煡鐪嬫帶鍒跺彴');
- console.log(err)
+ this.$message.success(err);
},
//缂栫爜瑙勫垯鏌ヨ
SelectFindeHandler(){
@@ -399,7 +396,6 @@
this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName)
this.$set(this.loneTreeNewForm,'coderuleoid',this.masterOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
- // console.log(this.loneTreeNewForm)
}
},
//缂栫爜澶氶��
@@ -407,7 +403,6 @@
this.masterSelectList=row;
this.masterName=row[0].name;
this.masterOid=row[0].oid;
- // console.log('oid',this.oid)
},
//缂栫爜鎺ュ彛
MasterdefaultRend(masterParameter){
@@ -437,7 +432,6 @@
this.$set(this.loneTreeNewForm,'codekeyattrrepeatoidName',this.KeyName)
this.$set(this.loneTreeNewForm,'codekeyattrrepeatoid',this.KeyOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
- console.log(this.loneTreeNewForm)
}
},
//鍏抽敭灞炴�ф煡璇�
@@ -516,7 +510,6 @@
this.simSelectList=row;
this.simName=row[0].name;
this.simOid=row[0].oid;
- console.log('oid',this.oid)
},
//鐩镐技椤归」鎺ュ彛
simdefaultRend(){
@@ -574,7 +567,6 @@
//涓氬姟绫诲瀷鎺ュ彛
btmdefaultRend(masterParameter){
referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
- // console.log(res)
this.BtmData=res.data.data.records
})
}
--
Gitblit v1.9.3