From b51951257f62c38c9f157830e254b8ef6ae1404a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 17 十一月 2023 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue |   67 ++++++++++++++++++++++++---------
 1 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index a957de2..69351e6 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -3,7 +3,7 @@
   <el-container>
     <!--    宸︿晶鑿滃崟-->
     <el-aside>
-      <basic-container style="overflow:hidden;">
+      <basic-container>
         <div>
           <div>
             <div style="display: flex; flex-direction: column;">
@@ -23,6 +23,18 @@
             <div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
             </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)"
+                       @node-click="nodeClick"
+            >
+            </avue-tree>
+          </div>
+
           <!--        鏍戣妭鐐规坊鍔犲璇濇-->
           <el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
                      :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
@@ -51,6 +63,16 @@
                 <el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" style="width: 585px"
                           @focus="Keyfouce"></el-input>
               </el-form-item>
+              <el-form-item label="鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岋細" label-width="170px">
+                <el-switch
+                  v-model="TreeAddform.codeKeyAttrValue"
+                  active-text="鏄�"
+                  inactive-text="鍚�"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
+                  @change="switchChange">
+                </el-switch>
+              </el-form-item>
               <el-form-item label="鐩镐技鏌ヨ瑙勫垯锛�" label-width="150px">
                 <el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" style="width: 585px"
                           @focus="simFouce"></el-input>
@@ -69,15 +91,6 @@
                               :nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
                               @referTreeForm="referTreeForm"></classifyTreeform>
           </el-dialog>
-<!--          宸︿晶鏍�-->
-          <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
-                     :defaultExpandAll="false"
-                     :option="Treeoption"
-                     class="classifyTree"
-                     style="height: calc(100vh - 230px)"
-                     @node-click="nodeClick"
-          >
-          </avue-tree>
         </div>
       </basic-container>
     </el-aside>
@@ -404,7 +417,6 @@
 import {mapGetters} from "vuex";
 export default {
   name: "classifyTrees.vue",
-  inject: ["crudTreeData"],
   data() {
     return {
       masterRow: null,
@@ -584,7 +596,9 @@
         //缂栫爜瑙勫垯
         codeRuleOidName: "",
         //瀛樺偍鐨勪笟鍔＄被鍨�
-        btmTypeName: ""
+        btmTypeName: "",
+        codeKeyAttrValue:true,
+        isParticipateCheck:1
       },
       rules: {
         id: [
@@ -851,6 +865,11 @@
   created() {
   },
   methods: {
+    // switch
+    switchChange(){
+      this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue === true ? 1 : 0;
+      // console.log(this.TreeAddform.isParticipateCheck)
+    },
     //瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
     BtmEscHandler() {
       this.SelectFInd = '';
@@ -1135,7 +1154,13 @@
     },
     //鏍戣妭鐐瑰彇娑堜簨浠�
     TreeEscHandler() {
-      this.TreeAddform = {};
+      for (let key in this.TreeAddform) {
+        if (key !== 'codeKeyAttrValue' && key !== 'isParticipateCheck') {
+          this.TreeAddform[key] = "";
+        }
+      }
+      this.TreeAddform.codeKeyAttrValue = true;
+      this.TreeAddform.isParticipateCheck = 1;
       this.TreeAddFormVisible = false;
       // 鍏抽棴寮圭獥娓呯┖鏍￠獙
       this.$refs.myForm.clearValidate();
@@ -1155,6 +1180,8 @@
             });
             Object.keys(this.TreeAddform).forEach(key => {
               this.TreeAddform[key] = "";
+              this.TreeAddform.codeKeyAttrValue = true;
+              this.TreeAddform.isParticipateCheck = 1;
             });
             this.getAttr();
             this.TreeAddFormVisible = false;
@@ -1243,7 +1270,10 @@
       this.getAttr()
       setTimeout(() => {
         this.loading = false;
-        this.nodeClickList = ""
+        this.$refs.tree.setCurrentKey(null);
+        this.nodeClickList = {}
+        this.TreeList = []
+        this.TreeFlagCode = true;
       }, 600);
     },
     //鍚敤鍜屽仠鐢ㄩ兘鍏堝垽鏂姸鎬�
@@ -1345,6 +1375,10 @@
           this.crudOid = ''
         }
         this.TreeList = res3.data.data;
+        if(this.TreeList.isParticipateCheck === null || this.TreeList.isParticipateCheck === undefined ||this.TreeList.isParticipateCheck === ""){
+          this.$set(this.TreeList,"isParticipateCheck",1)
+          return
+        }
       } catch (error) {
         this.$message.error(error);
       }
@@ -1630,7 +1664,7 @@
 }
 
 .el-aside {
-  height: calc(100% - 30px);
+  //height: calc(100% - 30px);
 }
 
 .el-main {
@@ -1656,6 +1690,3 @@
 }
 
 </style>
-/sa[pr
-[
-syulep

--
Gitblit v1.9.3