From 42c17fe468ceea7e5eed7fec520b9858bed02e85 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 17:52:30 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 3e6f995..9738222 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -121,12 +121,12 @@
         </div>
            </el-dialog>
               <!--            妯℃澘鍏嬮殕  -->
-                <el-dialog :visible.sync="CloneVisible" append-to-body title="鍏嬮殕妯℃澘">
+                <el-dialog :visible.sync="CloneVisible" append-to-body title="鍏嬮殕妯℃澘" :before-close="cloneClose">
                   <el-container>
                     <el-aside width="300px">
                       <div style="margin-bottom: 5px"><el-tag>涓婚搴撳垎绫�</el-tag></div>
                       <!--                      鍏嬮殕妯℃澘鐨勬爲 娌跨敤棣栭〉鏍戠殑loading鍜宱ption锛屼絾鏄痙ata鍜寁-model缁戝畾鐨勬暟鎹垱寤轰竴涓柊鐨勫彉閲忥紝鍙﹀鐐瑰嚮鏂规硶涔熸槸閲嶆柊鑾峰彇鏉ユ搷浣滃厠闅嗘ā鏉跨殑鏁版嵁-->
-                        <avue-tree  v-model="TreeAvueform" v-loading="loading" :data="Treedata"
+                        <avue-tree ref="cloneTree" v-model="TreeAvueform" v-loading="loading" :data="Treedata"
                                     :defaultExpandAll="false"
                                     :option="Treeoption"
                                     style="height: 50.5vh;margin-right: 10px"
@@ -160,7 +160,7 @@
                     </el-container >
                    <div style="display: flex; justify-content: flex-end; align-items: center;margin-top: 10px" >
                      <el-button size="small " type="primary" @click="Clonehandler">纭畾</el-button>
-                     <el-button size="small" @click="CloneVisible=false" >鍙栨秷</el-button>
+                     <el-button size="small" @click="cloneClose" >鍙栨秷</el-button>
                    </div>
                       <el-dialog
                         width="30%"
@@ -1361,6 +1361,13 @@
         });
       })
     },
+    //鍏嬮殕鍙栨秷
+    cloneClose(){
+      this.$refs.cloneTree.setCurrentKey(null)
+      this.ClonenodeClickList = {}
+      this.CloneFormlist=[]
+      this.CloneVisible=false;
+    },
     //鍏嬮殕妯℃澘鏌ヨ
     CloneEnterFind(){
       gridCodeClassifyTemplate().then(res => {
@@ -1410,14 +1417,19 @@
     },
     //鍏嬮殕妯℃澘鍗曢�夋鏀瑰彉
     selectionChange(row) {
-      Object.assign(this.CloneModel, row[0]);
-      this.CloneSelect = [row[0]];
+      this.CloneSelect = row;
+      const { id, name } = row[0];
+      this.CloneModel = { id, name };
       this.CloneSelect[0].codeclassifyoid = this.nodeClickList.oid;
+      console.log('row',row)
+      console.log('CloneSelect',this.CloneSelect)
+      console.log('CloneModel',this.CloneModel)
     },
     //鍏嬮殕琛ㄥ崟鎻愪氦
     Clonesubmit(row, done) {
       // 閲嶆柊璧嬪�糃loneSelect浼犻�掔殑鏁版嵁涓鸿緭鍏ユ鍙互淇敼鐨勬暟鎹紝CloneModel鎻愪氦琛ㄥ崟杈撳叆妗嗗弻鍚戠粦瀹氭暟鎹�
       Object.assign(this.CloneSelect[0], this.CloneModel);
+      // CloneSelect鏁扮粍绗竴椤� 鍖归厤CloneModel瀵硅薄
       copy(this.CloneSelect[0])
         .then(() => {
           // 鍥犱负鏄祵濂楀脊绐楁墍浠ユ墜鍔ㄥ叧闂瑿loneinnerVisible锛孋loneVisible涓や釜寮圭獥銆�

--
Gitblit v1.9.3