From ede807c3ffdd17982fb6b1dd922993685702993b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 31 七月 2023 18:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue |   77 +++++++++++++++++++++++++-------------
 1 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 48db372..8b4cadb 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -58,7 +58,7 @@
         </el-dialog>
         <!--        淇敼瀵硅瘽妗�-->
         <el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
-          <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="TreeFlagCode" ::nodeClickList="nodeClickList" @referTreeForm="referTreeForm" @flushed="flushed"></classifyTreeform>
+          <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="TreeFlagCode" :nodeClickList="nodeClickList" @referTreeForm="referTreeForm" @flushed="flushed"></classifyTreeform>
         </el-dialog>
         <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false"
                    :option="Treeoption"
@@ -312,6 +312,7 @@
             </div>
           </div>
         </el-dialog>
+<!--        瀵煎嚭-->
           <ThemeImport :visible.sync="ThemeImportVisible" :codeClassifyOid="this.codeClassifyOid"></ThemeImport>
       </basic-container>
     </el-main>
@@ -352,6 +353,7 @@
       //瀵煎叆鐘舵�佹
       ThemeImportVisible:false,
       selectRow:'',
+      selectList:[],
       //鏍戣妭鐐规樉绀洪殣钘�
       TreeFlagCode:false,
       //缂栫爜瑙勫垯
@@ -728,6 +730,13 @@
   created() {
 
   },
+  watch:{
+    FormList:{
+      handler(newval,oldval){
+        console.log('FormList',newval)
+      }
+    }
+  },
   methods: {
     /** 瀵煎叆 */
     ImportExcel(){
@@ -965,30 +974,7 @@
       this.crudOid=row.oid;
       this.crudLCStatus=row.lcStatus;
       this.crudArray.push(row);
-      console.log(row.$index)
-      gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': row.oid}).then(res => {
-        this.ProData = res.data.data;
-        //鍒嗙被娉ㄥ叆鏁版嵁鏍煎紡
-        this.ProData =  res.data.data.map((item) => {
-          //濡傛灉鍒嗙被娉ㄥ叆classifyInvokeAttr涓虹┖璇存槑鏄垵濮嬬姸鎬�
-          if(item.classifyInvokeAttr !== ''){
-            if (!item.hasOwnProperty('classifyInvokeText')) { // 妫�鏌lassifyInvokeText灞炴�ф槸鍚﹀瓨鍦�
-              item = {
-                ...item,
-                classifyInvokeText: {
-                  "娉ㄥ叆绫诲瀷": item.classifyInvokeAttr,
-                  "娉ㄥ叆绫诲瀷鍚嶇О": item.classifyInvokeAttrName,
-                  "灞傜骇璁剧疆": item.classifyInvokeLevel,
-                  "鏄惁鍙慨鏀�": item.classifyInvokeEditFlag
-                }
-              };
-            }
-          }
-          return item;
-        });
-      }).catch(res => {
-        this.$message.error(res)
-      })
+      this.gridCode()
     },
     //鍒嗙被鏍戞暟鎹鐞�
     getAttr() {
@@ -1199,9 +1185,10 @@
       //瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
       if(data.parentId == ""){
         this.TreeFlagCode=true;
+
       }
       this.nodeClickList = data
-      this.ProData=[]
+      this.selectRow=0;
       try {
         await TreeObjcet(data.oid).then(res => {
           this.FlagObj = res.data.data
@@ -1216,6 +1203,15 @@
               return item.codeclassifyoid == this.nodeClickList.oid
             }
           })
+          console.log('form',this.Formlist)
+          if(this.Formlist.length >= 1){
+            this.crudLCStatus=this.Formlist[this.selectRow].lcStatus;
+            this.crudArray.push(this.Formlist[this.selectRow]);
+            this.crudOid=this.Formlist[this.selectRow].oid;
+            this.gridCode()
+          }else {
+              this.ProData = [];
+          }
         }).catch(res => {
           this.$message.error(res)
         })
@@ -1228,6 +1224,31 @@
       } catch (error) {
         this.$message.error(error)
       }
+    },
+    gridCode(){
+      gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[this.selectRow].oid,limit:-1}).then(res => {
+        this.ProData = res.data.data;
+        //鍒嗙被娉ㄥ叆鏁版嵁鏍煎紡
+        this.ProData =  res.data.data.map((item) => {
+          //濡傛灉鍒嗙被娉ㄥ叆classifyInvokeAttr涓虹┖璇存槑鏄垵濮嬬姸鎬�
+          if(item.classifyInvokeAttr !== ''){
+            if (!item.hasOwnProperty('classifyInvokeText')) { // 妫�鏌lassifyInvokeText灞炴�ф槸鍚﹀瓨鍦�
+              item = {
+                ...item,
+                classifyInvokeText: {
+                  "娉ㄥ叆绫诲瀷": item.classifyInvokeAttr,
+                  "娉ㄥ叆绫诲瀷鍚嶇О": item.classifyInvokeAttrName,
+                  "灞傜骇璁剧疆": item.classifyInvokeLevel,
+                  "鏄惁鍙慨鏀�": item.classifyInvokeEditFlag
+                }
+              };
+            }
+          }
+          return item;
+        });
+      }).catch(res => {
+        this.$message.error(res)
+      })
     },
     treeClick(e) {
       console.log(e);
@@ -1421,12 +1442,14 @@
     },
     //鍒锋柊
     TemRefresh() {
-      this.FormLoing = true
+      this.FormLoing = true;
       if (this.nodeClickList.oid != "") {
         gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': this.nodeClickList.oid}).then(res => {
           this.Formlist = res.data.data.filter(item => {
             return item.codeclassifyoid == this.nodeClickList.oid
           })
+          this.crudLCStatus=this.Formlist[this.selectRow].lcStatus;
+          this.crudArray.push(this.Formlist[this.selectRow]);
         })
       } else {
         this.FormLoing = true

--
Gitblit v1.9.3