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

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

diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 624ebf8..a95f7dd 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -49,7 +49,7 @@
         </el-dialog>
         <!--        淇敼瀵硅瘽妗�-->
         <el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
-          <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList"></classifyTreeform>
+          <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'"></classifyTreeform>
         </el-dialog>
         <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false"
                    :option="Treeoption"
@@ -65,7 +65,7 @@
         <!--        鍙充晶琛ㄦ牸-->
         <avue-tabs :option="tabOption" @change="handleChange"></avue-tabs>
         <span v-if="type.prop==='tab1'">
-           <classifyTreeform ref="childForm" :TreeNewForm="TreeList" :nodeList="nodeList"></classifyTreeform>
+           <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'renonly'"></classifyTreeform>
         </span>
         <span v-else-if="type.prop==='tab2'">
             <basic-container>
@@ -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)
       })
@@ -601,7 +599,7 @@
           message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
         });
       } else {
-        this.TreeEditFormVisible = true
+        this.TreeEditFormVisible = true;
       }
     },
     //鏍戝埛鏂�
@@ -675,7 +673,6 @@
     async nodeClick(data) {
       //瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
       this.nodeClickList = data
-      console.log(data)
       this.ProData=[]
       try {
         await TreeObjcet(data.oid).then(res => {
@@ -692,7 +689,7 @@
             }
           })
         }).catch(res => {
-          console.log(res)
+          this.$message.error(res)
         })
         //  鍩烘湰淇℃伅琛ㄥ崟鏁版嵁
         await getObjectByOid(this.nodeClickList.oid).then(res => {
@@ -701,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 != "") {
@@ -822,7 +818,7 @@
         });
         done()
       }).catch(res => {
-        console.log(res)
+        this.$message.error(res)
       })
     },
     //妯℃澘绠＄悊鍒犻櫎
@@ -838,7 +834,6 @@
     },
     //妯℃澘绠＄悊琛ㄦ牸鏌ヨ
     EnterFind() {
-      console.log(this.Formlist)
       if (this.FindText == "") {
         gridCodeClassifyTemplate().then(res => {
           this.Formlist = res.data.data

--
Gitblit v1.9.3