From d5bafa63b4dcc7ad6840560134dd41f38ded1390 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 30 六月 2023 18:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Tree/classifyTrees.vue |   37 +++++++++++++++----------------------
 1 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 6793b75..a95f7dd 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -433,14 +433,11 @@
   mounted() {
     this.type = this.tabOption.column[0];
     this.getAttr();
-    console.log('11',this.nodeClickList)
   },
   computed:{
     crudTreeOption(){
       return{
         index: true,
-        indexClassName:"搴忓彿",
-        indexLabelClassName:'搴忓彿',
         border: true,
         height:180,
         selection:true,
@@ -460,11 +457,13 @@
           },
           {
             label:"鐗堟湰鍙�",
-            prop:"revisionSeq"
+            prop:"revisionSeq",
+            display:false
           },
           {
             label:"鐘舵��",
-            prop:"lcStatusText"
+            prop:"lcStatusText",
+            display:false
           }
         ]
       }
@@ -477,7 +476,6 @@
       this.crudArray=selection;
       gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
         this.ProData = res.data.data;
-        console.log(this.ProData)
       }).catch(res => {
         this.$message.error(res)
       })
@@ -595,16 +593,14 @@
     },
     //淇敼鍥炲～
     TreeEdit() {
-    //   if (this.nodeClickList == "") {
-    //     this.$message({
-    //       type: 'warning',
-    //       message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
-    //     });
-    //   } else {
-    //     this.TreeEditFormVisible = true;
-    //     console.log('---',this.CloneTreedata)
-    //   }
-        this.TreeEditFormVisible=true;
+      if (this.nodeClickList == "") {
+        this.$message({
+          type: 'warning',
+          message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
+        });
+      } else {
+        this.TreeEditFormVisible = true;
+      }
     },
     //鏍戝埛鏂�
     flushed() {
@@ -677,7 +673,6 @@
     async nodeClick(data) {
       //瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
       this.nodeClickList = data
-      console.log(data)
       this.ProData=[]
       try {
         await TreeObjcet(data.oid).then(res => {
@@ -694,7 +689,7 @@
             }
           })
         }).catch(res => {
-          console.log(res)
+          this.$message.error(res)
         })
         //  鍩烘湰淇℃伅琛ㄥ崟鏁版嵁
         await getObjectByOid(this.nodeClickList.oid).then(res => {
@@ -703,13 +698,12 @@
           this.$message.error(res)
         })
       } catch (error) {
-        console.log(error)
+        this.$message.error(error)
       }
     },
     //鍏嬮殕妯℃澘鏍戠殑鐐瑰嚮鍒囨崲鏁版嵁
     async ClonenodeClick(data){
       this.ClonenodeClickList=data;
-      console.log("aaa",this.ClonenodeClickList.oid)
       await gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}).then(res=>{
         this.CloneFormlist = res.data.data.filter(item => {
           if (item.codeclassifyoid != "") {
@@ -824,7 +818,7 @@
         });
         done()
       }).catch(res => {
-        console.log(res)
+        this.$message.error(res)
       })
     },
     //妯℃澘绠＄悊鍒犻櫎
@@ -840,7 +834,6 @@
     },
     //妯℃澘绠＄悊琛ㄦ牸鏌ヨ
     EnterFind() {
-      console.log(this.Formlist)
       if (this.FindText == "") {
         gridCodeClassifyTemplate().then(res => {
           this.Formlist = res.data.data

--
Gitblit v1.9.3