From 7ce592bb5a5b9e0dc78786e727f042b95ebc81c8 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期四, 13 七月 2023 16:00:59 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue |   58 +++++++++++++++++++++++++++-------------------------------
 1 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index 9a71b38..1ad84bd 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>
@@ -122,6 +122,7 @@
       simOid:"",
       btmName:"",
       btmOid:"",
+      btmId:"",
       masterInput:'',
       MasterSearchSelects:"",
       masterData:[],
@@ -226,7 +227,7 @@
           },
           {
             label: '瀛樺偍鐨勪笟鍔＄被鍨�',
-            prop: 'btmtypename',
+            prop: 'btmTypeName',
             labelWidth:128,
             disabled: true,
             rules: [{
@@ -294,7 +295,7 @@
             },
             {
               label: '瀛樺偍鐨勪笟鍔＄被鍨�',
-              prop: 'btmtypename',
+              prop: 'btmTypeName',
               labelWidth:128,
               focus:this.btmFoucus,
                 // readonly: true,
@@ -333,34 +334,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()
-        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(){
@@ -397,7 +397,6 @@
         this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName)
         this.$set(this.loneTreeNewForm,'coderuleoid',this.masterOid)
         this.$emit('MasterHandler',this.loneTreeNewForm)
-        // console.log(this.loneTreeNewForm)
       }
     },
     //缂栫爜澶氶��
@@ -405,7 +404,6 @@
       this.masterSelectList=row;
       this.masterName=row[0].name;
       this.masterOid=row[0].oid;
-      // console.log('oid',this.oid)
     },
     //缂栫爜鎺ュ彛
     MasterdefaultRend(masterParameter){
@@ -435,7 +433,6 @@
         this.$set(this.loneTreeNewForm,'codekeyattrrepeatoidName',this.KeyName)
         this.$set(this.loneTreeNewForm,'codekeyattrrepeatoid',this.KeyOid)
         this.$emit('MasterHandler',this.loneTreeNewForm)
-        console.log(this.loneTreeNewForm)
       }
     },
     //鍏抽敭灞炴�ф煡璇�
@@ -514,7 +511,6 @@
       this.simSelectList=row;
       this.simName=row[0].name;
       this.simOid=row[0].oid;
-      console.log('oid',this.oid)
     },
     //鐩镐技椤归」鎺ュ彛
     simdefaultRend(){
@@ -540,8 +536,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.btmId)
         this.$emit('MasterHandler',this.loneTreeNewForm)
       }
     },
@@ -568,11 +564,11 @@
       this.btmSelectList=row;
       this.btmName=row[0].name;
       this.btmOid=row[0].oid;
+      this.btmId=row[0].id;
     },
     //涓氬姟绫诲瀷鎺ュ彛
     btmdefaultRend(masterParameter){
       referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
-        // console.log(res)
         this.BtmData=res.data.data.records
       })
     }

--
Gitblit v1.9.3