From dc1a5a77fb195d9fdbe3dfeccaf00c45d4a67b19 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 12 七月 2023 19:08:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index 9a71b38..236d931 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -94,7 +94,7 @@
</template>
<avue-crud :data="BtmData" :option="masterOption" @select="btmSelect"></avue-crud>
<div style="height: 30px">
- <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.btmtypename}}]</div>
+ <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.btmTypeName}}]</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
<el-button type="primary" size="small" @click="btmHandlerClick">纭畾</el-button>
<el-button size="small" @click="BtmdialogVisible=false">鍙栨秷</el-button>
@@ -226,7 +226,7 @@
},
{
label: '瀛樺偍鐨勪笟鍔＄被鍨�',
- prop: 'btmtypename',
+ prop: 'btmTypeName',
labelWidth:128,
disabled: true,
rules: [{
@@ -294,7 +294,7 @@
},
{
label: '瀛樺偍鐨勪笟鍔＄被鍨�',
- prop: 'btmtypename',
+ prop: 'btmTypeName',
labelWidth:128,
focus:this.btmFoucus,
// readonly: true,
@@ -355,6 +355,8 @@
TreeEditSave(this.loneTreeNewForm).then(res=>{
this.$message.success('淇敼鎴愬姛');
this.Editclose()
+ this.$emit('referTreeForm');
+ this.$emit('flushed');
done()
})
},
@@ -540,8 +542,8 @@
}else {
this.BtmdialogVisible=false;
this.btmSelectList=[]
- this.$set(this.loneTreeNewForm,'btmtypename',this.btmName ||this.btmOid)
- this.$set(this.loneTreeNewForm,'btmtypeid',this.btmOid)
+ this.$set(this.loneTreeNewForm,'btmTypeName',this.btmName ||this.btmOid)
+ this.$set(this.loneTreeNewForm,'btmTypeid',this.btmOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
}
},
--
Gitblit v1.9.3