From 02dbaaa04bc443e860a715cf907bc0fb5c1a7da4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 11 七月 2023 09:09:34 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue |   49 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index c64b81b..5eb3f23 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -78,7 +78,7 @@
         </div>
       </el-dialog>
 <!--      瀛樺偍鐨勪笟鍔＄被鍨�-->
-      <el-dialog  :visible.sync="BtmdialogVisible"   title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�" append-to-body>
+      <el-dialog  :visible.sync="BtmdialogVisible"   title="涓恒�愪笟鍔＄被鍨嬨�戦�夊彇鍊�" append-to-body>
         <template>
           <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px !important;">
             <el-option
@@ -110,7 +110,7 @@
 import {TreeEditSave} from '@/api/template/templateAttr'
 export default {
   name: "classifyTreeform.vue",
-  props: ['loneTreeNewForm','flag','Editclose'],
+  props: ['loneTreeNewForm','flag','Editclose','TreeFlag','nodeClickList'],
   data() {
     return {
       SelectFInd:"",
@@ -226,7 +226,7 @@
           },
           {
             label: '瀛樺偍鐨勪笟鍔＄被鍨�',
-            prop: 'btmTypeName',
+            prop: 'btmtypename',
             labelWidth:128,
             disabled: true,
             rules: [{
@@ -237,13 +237,13 @@
           },
           {
             label:"缂栫爜瑙勫垯",
-            prop:"coderuleOidName",
+            prop:"coderuleoidName",
             labelWidth:128,
             disabled: true,
           },
           {
             label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
-            prop:"codeKeyAttrRepeatOidName",
+            prop:"codekeyattrrepeatoidName",
             labelWidth:128,
             disabled: true,
           },
@@ -284,10 +284,11 @@
           },
           {
             label: '瀛樺偍鐨勪笟鍔＄被鍨�',
-            prop: 'btmTypeName',
+            prop: 'btmtypename',
             labelWidth:128,
             focus:this.btmFoucus,
             readonly: true,
+            display:false,
             rules: [{
               required: true,
               message: "瀛樺偍鐨勪笟鍔＄被鍨�",
@@ -296,14 +297,14 @@
           },
           {
             label:"缂栫爜瑙勫垯",
-            prop:"coderuleOidName",
+            prop:"coderuleoidName",
             labelWidth:128,
             focus:this.CodeFoucus,
             readonly: true,
           },
           {
             label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
-            prop:"codeKeyAttrRepeatOidName",
+            prop:"codekeyattrrepeatoidName",
             labelWidth:128,
             focus:this.Keyfouce,
             readonly: true,
@@ -323,6 +324,15 @@
       KeySelectLIst:[],
       simSelectList:[],
       btmSelectList:[]
+    }
+  },
+  watch:{
+    nodeClickList:{
+      handler(newval,oldval){
+        console.log('newVal',newval,oldval)
+      },
+      deep:true,
+      immediate:true
     }
   },
   created() {
@@ -372,7 +382,7 @@
         this.MasterdialogVisible=false;
         this.masterSelectList=[]
         this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName)
-        this.$set(this.loneTreeNewForm,'coderuleOid',this.masterOid)
+        this.$set(this.loneTreeNewForm,'coderuleoid',this.masterOid)
         this.$emit('MasterHandler',this.loneTreeNewForm)
         // console.log(this.loneTreeNewForm)
       }
@@ -395,7 +405,7 @@
         this.masterData=res.data.records;
       })
     },
-    // 鍏抽敭灞炴�уけ鐒�
+    //鍏抽敭灞炴�уけ鐒�
     Keyfouce(){
       this.KeydialogVisible=true;
       this.KeydefaultRend()
@@ -409,9 +419,10 @@
       }else {
         this.KeydialogVisible=false;
         this.KeySelectLIst=[]
-        this.$set(this.loneTreeNewForm,'codeResembleRuleOidName',this.simName)
-        this.$set(this.loneTreeNewForm,'codeResembleRuleOid',this.simOid)
+        this.$set(this.loneTreeNewForm,'codekeyattrrepeatoidName',this.KeyName)
+        this.$set(this.loneTreeNewForm,'codekeyattrrepeatoid',this.KeyOid)
         this.$emit('MasterHandler',this.loneTreeNewForm)
+        console.log(this.loneTreeNewForm)
       }
     },
     //鍏抽敭灞炴�ф煡璇�
@@ -442,13 +453,13 @@
         this.KeyData=res.data.records;
       })
     },
-    // 鍏抽敭澶氶��
+    //鍏抽敭澶氶��
     KeySelect(row){
       this.KeySelectLIst=row;
       this.KeyName=row[0].name;
       this.KeyOid=row[0].oid;
     },
-    // 鐩镐技椤瑰け鐒�
+    //鐩镐技椤瑰け鐒�
     simFouce(){
       this.SimidialogVisible=true;
       this.simdefaultRend()
@@ -485,7 +496,7 @@
         this.SelectFInd=""
       }
     },
-  //  鐩镐技椤瑰閫�
+    //鐩镐技椤瑰閫�
     simSelect(row){
       this.simSelectList=row;
       this.simName=row[0].name;
@@ -507,7 +518,7 @@
       this.BtmdialogVisible=true;
       this.btmdefaultRend()
     },
-  //  涓氬姟绫诲瀷纭畾
+    //涓氬姟绫诲瀷纭畾
     btmHandlerClick(){
       if(this.btmSelectList.length>1){
         this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
@@ -516,8 +527,8 @@
       }else {
         this.BtmdialogVisible=false;
         this.btmSelectList=[]
-        this.$set(this.loneTreeNewForm,'btmTypeName',this.btmName)
-        this.$set(this.loneTreeNewForm,'btmTypeOid',this.btmOid)
+        this.$set(this.loneTreeNewForm,'btmtypename',this.btmName ||this.btmOid)
+        this.$set(this.loneTreeNewForm,'btmtypeid',this.btmOid)
         this.$emit('MasterHandler',this.loneTreeNewForm)
       }
     },
@@ -539,7 +550,7 @@
         this.SelectFInd=""
       }
     },
-  //  涓氬姟绫诲瀷澶氶��
+    //涓氬姟绫诲瀷澶氶��
     btmSelect(row){
       this.btmSelectList=row;
       this.btmName=row[0].name;

--
Gitblit v1.9.3