From abf8822cfc6fe397d1f7216620f8ba5d3b4d0aab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 12 十二月 2023 10:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 5854b1a..549d206 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -31,16 +31,19 @@
                 </el-button>
               </div>
             </div>
-            <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
+            <div style="display: flex;margin-top: 5px;margin-bottom: 5px">
+              <el-button v-if="permissionList.flowingBtnStuatus" plain size="mini" type="primary" @click="testHandler">娴佹按澶勭悊
+              </el-button>
             </div>
           </div>
+        </div>
           <!--          宸︿晶鏍�-->
           <div style="height: calc(100vh - 230px);overflow: auto">
             <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
                        :defaultExpandAll="false"
                        :option="Treeoption"
                        class="classifyTree"
-                       style="height: calc(100vh - 280px)"
+                       style="height: calc(100vh - 290px)"
                        @node-click="nodeClick"
             >
             </avue-tree>
@@ -50,7 +53,7 @@
           <el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
                      :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
                      style="width: 1700px;margin: auto">
-            <el-form ref="myForm" :model="TreeAddform" :rules="rules">
+            <el-form ref="myForm" :model="TreeAddform" :rules=  "rules">
               <el-form-item :label="this.TreeFlag ? '鍒嗙被缂栧彿锛�' :'涓婚搴撶紪鍙凤細'" label-width="150px" prop="id"
                             style="display: inline-block">
                 <el-input v-model="TreeAddform.id" autocomplete="off" style="width: 170px"></el-input>
@@ -102,7 +105,6 @@
                               :nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
                               @referTreeForm="referTreeForm"></classifyTreeform>
           </el-dialog>
-        </div>
       </basic-container>
     </el-aside>
     <el-main>
@@ -423,7 +425,8 @@
   upVersion,
   stopLose,
   startRelease,
-  exportClassify
+  exportClassify,
+  flowingDependencyGen
 } from "@/api/template/templateAttr";
 import {defaultReferDataGrid, referDataGrid} from '@/api/MasterData/master'
 import func from "@/util/func";
@@ -433,6 +436,7 @@
   name: "classifyTrees.vue",
   data() {
     return {
+      activeName: 'first',
       masterRow: null,
       AddLoading: false,
       // 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺
@@ -472,6 +476,8 @@
       masterOption: {
         addBtn: false,
         index: true,
+        refreshBtn:false,
+        columnBtn: false,
         border: true,
         menu: false,
         height: 380,
@@ -500,6 +506,7 @@
         addBtn: false,
         index: true,
         columnBtn: false,
+        refreshBtn:false,
         border: true,
         menu: false,
         height: 380,
@@ -817,6 +824,7 @@
         FindStatus: this.vaildData(this.permission.classifyTree.manage_search, false),
         TemRefreshStatus: this.vaildData(this.permission.classifyTree.manage_break, false),
         CloneBtnStuatus: this.vaildData(this.permission.classifyTree.manage_clone, false),
+        flowingBtnStuatus: this.vaildData(this.permission.classifyTree.tree_flowing, false),
       }
     },
     crudTreeOption() {
@@ -879,10 +887,23 @@
   created() {
   },
   methods: {
+    handleTabClick(){
+
+    },
+    testHandler(){
+      if(this.nodeClickList.length <=0 ){
+        this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒')
+        return;
+      }
+      flowingDependencyGen(this.nodeClickList.oid).then(res => {
+        this.$message.success('鎿嶄綔鎴愬姛')
+      }).catch(res => {
+        this.$message.error(res)
+      })
+    },
     // switch
     switchChange() {
       this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0;
-      // console.log(this.TreeAddform.isParticipateCheck)
     },
     //瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
     BtmEscHandler() {
@@ -1326,7 +1347,7 @@
           });
         }
       } catch (error) {
-        console.error(error);
+        // console.error(error);
       } finally {
         this.loading = false;
       }
@@ -1369,7 +1390,7 @@
           });
         }
       } catch (error) {
-        console.error(error);
+        // console.error(error);
       } finally {
         this.loading = false;
       }
@@ -1439,7 +1460,7 @@
       }
     },
     treeClick(e) {
-      console.log(e);
+      // console.log(e);
     },
     //鍩烘湰淇℃伅琛ㄥ崟鍒锋柊
     referTreeForm() {

--
Gitblit v1.9.3