From 1c407a93546036bc0438fbe019aeaf03f6ef1805 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 05 七月 2023 19:15:38 +0800
Subject: [PATCH] 提交代码

---
 Source/UBCS-WEB/src/components/Tree/classifyTrees.vue |   94 ++++++++++++++++++++++++++++-------------------
 1 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 6793b75..4741278 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -7,8 +7,10 @@
         <div>
           <div style="display: flex;justify-content: space-around">
             <el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞</el-button>
-            <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>
-            <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</el-button>
+            <el-button plain size="small" type="primary" @click="TreeEdit">淇敼</el-button>
+            <el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button>
+<!--            <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>-->
+<!--            <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</el-button>-->
             <el-button plain size="small" type="primary" @click="flushed">鍒锋柊</el-button>
           </div>
           <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
@@ -79,14 +81,23 @@
             <template slot="menuLeft">
               <el-button plain size="small" type="primary" @click="FindeHanler">鏌ヨ</el-button>
               <el-button plain size="small" type="primary" @click="TemRefresh">鍒锋柊</el-button>
-                    <el-button plain size="small" type="primary" @click="TreeEdit">淇敼</el-button>
-            <el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button>
             <el-button plain size="small" type="primary" @click="Enable">鍚敤</el-button>
             <el-button plain size="small" type="primary" @click="Deactivate">鍋滅敤</el-button>
               <el-button plain size="small" type="primary" @click="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button>
-              <div style="display: inline-block"> <el-input v-model="FindText" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
-                                                            size="small"
-                                                            @keyup.enter.native="EnterFind"></el-input></div>
+              <!-- <div style="display: inline-block">
+                <el-select v-model="searchTemplate.searchCondition" placeholder="璇烽�夋嫨" class="search-condition">
+                  <el-option
+                    v-for="item in searchTemplateOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+                <el-input v-model="searchTemplate.findText" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
+                  size="small"
+                  @keyup.enter.native="EnterFind">
+                </el-input>
+              </div> -->
               <!--              鏌ヨ瀵硅瘽妗�-->
            <el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ">
               <div>
@@ -95,7 +106,7 @@
               </div>
              <div style="padding-left: 80px;margin-top: 15px;">
                <template v-for="(value, key) in FindSelect">
-                <div style="display: flex;justify-content: space-around;width: 85%;margin-bottom: 15px">
+                <div style="display: flex; justify-content: space-around; width: 85%; margin-bottom: 15px">
                 <el-select v-model="FindSelect[key]" placeholder="璇烽�夋嫨" style="width: 28%"
                            @change="handleSelectChange(key)">
                   <el-option label="妯℃澘缂栧彿" value="0"></el-option>
@@ -236,6 +247,15 @@
       //     }
       //   ]
       // },
+      // searchTemplateOptions: [
+      //   {
+      //     value: 'id',
+      //     label: '妯℃澘缂栧彿'
+      //   }, {
+      //     value: 'name',
+      //     label: '妯℃澘鍚嶇О'
+      //   }
+      // ],
       addFlag:false,
       // 琛ㄦ牸褰撳墠琛宨d
       crudOid:"",
@@ -244,7 +264,11 @@
       //妯℃澘灞炴�у睍绀哄唴瀹�
       ProData: [],
       //鍥炶溅閿悳绱㈢粦瀹氬��
-      FindText: "",
+      searchTemplate: {
+        searchCondition: 'id',
+        findText: "",
+      },
+      
       //楂樼骇鏌ヨ瀵硅瘽妗�
       FindFormVisible: false,
       //鍏嬮殕妯℃澘瀵硅瘽妗�
@@ -433,14 +457,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 +481,13 @@
           },
           {
             label:"鐗堟湰鍙�",
-            prop:"revisionSeq"
+            prop:"revisionSeq",
+            display:false
           },
           {
             label:"鐘舵��",
-            prop:"lcStatusText"
+            prop:"lcStatusText",
+            display:false
           }
         ]
       }
@@ -477,7 +500,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 +617,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 +697,6 @@
     async nodeClick(data) {
       //瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠$悊琛ㄦ牸閲岄潰鐨刼id
       this.nodeClickList = data
-      console.log(data)
       this.ProData=[]
       try {
         await TreeObjcet(data.oid).then(res => {
@@ -694,7 +713,7 @@
             }
           })
         }).catch(res => {
-          console.log(res)
+          this.$message.error(res)
         })
         //  鍩烘湰淇℃伅琛ㄥ崟鏁版嵁
         await getObjectByOid(this.nodeClickList.oid).then(res => {
@@ -703,13 +722,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 != "") {
@@ -797,8 +815,7 @@
           message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
         });
       } else {
-        let codeClassifyOid = this.codeClassifyOid
-        this.$set(row, "codeclassifyoid", codeClassifyOid)
+        this.$set(row, "codeclassifyoid", this.nodeClickList.oid)
         addSave(row).then(() => {
           this.$message({
             type: "success",
@@ -813,6 +830,7 @@
           });
         })
       }
+      console.log('123',this.codeClassifyOid)
     },
     //妯℃澘绠$悊淇敼
     CrudRowUpdata(row,index,done) {
@@ -824,7 +842,7 @@
         });
         done()
       }).catch(res => {
-        console.log(res)
+        this.$message.error(res)
       })
     },
     //妯℃澘绠$悊鍒犻櫎
@@ -838,21 +856,20 @@
         });
       })
     },
-    //妯℃澘绠$悊琛ㄦ牸鏌ヨ
-    EnterFind() {
-      console.log(this.Formlist)
-      if (this.FindText == "") {
+    //妯℃澘绠$悊琛ㄦ牸鏌ヨ,鍙湁涓�鏉℃暟鎹病蹇呰鍋氭悳绱�
+    /*nterFind() {
+      if (this.findText == "") {
         gridCodeClassifyTemplate().then(res => {
           this.Formlist = res.data.data
         })
       } else {
         gridCodeClassifyTemplate().then(res => {
           this.Formlist = res.data.data.filter(item => {
-            return item.name.includes(this.FindText)
+            return item.name.includes(this.findText)
           })
         })
       }
-    },
+    },*/
     //鍏嬮殕妯℃澘鏌ヨ
     CloneEnterFind(){
       gridCodeClassifyTemplate().then(res => {
@@ -964,4 +981,5 @@
 .my-messageboxs {
   width: 500px;
 }
+
 </style>

--
Gitblit v1.9.3