From 6bccfd2132c8523b5ebeffa772a8fa0e784d8165 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 01 八月 2023 10:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue |   52 ++++++++++++++++++++++++----------------------------
 1 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 8b4cadb..8e63b85 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -731,11 +731,7 @@
 
   },
   watch:{
-    FormList:{
-      handler(newval,oldval){
-        console.log('FormList',newval)
-      }
-    }
+
   },
   methods: {
     /** 瀵煎叆 */
@@ -746,17 +742,12 @@
     ExportExcel(){
       if(this.nodeClickList){
         exportClassify({oid:this.nodeClickList.oid}).then(res=>{
-          console.log(res)
           func.downloadFileByBlob(res);
         })
       }else {
         this.$message.warning('璇峰厛閫夋嫨瑕佸鍑虹殑涓婚搴撳垎绫�')
       }
     },
-    //妯℃澘绠＄悊宸插彂甯冪紪杈�
-    // checkShowEditBtn() {
-    //   this.showEditBtn = this.Formlist.some(item => item.lcStatus === 'Released');
-    // },
     //缂栫爜瑙勫垯澶辩劍
     CodeFoucus(){
       this.MasterdialogVisible=true;
@@ -1203,7 +1194,6 @@
               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]);
@@ -1314,7 +1304,6 @@
         });
       } else {
         this.$set(row, "codeclassifyoid", this.nodeClickList.oid)
-        console.log(this.nodeClickList)
         addSave(row).then(() => {
           this.$message({
             type: "success",
@@ -1354,20 +1343,6 @@
         });
       })
     },
-    //妯℃澘绠＄悊琛ㄦ牸鏌ヨ,鍙湁涓�鏉℃暟鎹病蹇呰鍋氭悳绱�
-    /*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)
-          })
-        })
-      }
-    },*/
     //鍏嬮殕妯℃澘鏌ヨ
     CloneEnterFind(){
       gridCodeClassifyTemplate().then(res => {
@@ -1448,8 +1423,29 @@
           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]);
+          gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]':  res.data.data[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)
+          })
         })
       } else {
         this.FormLoing = true

--
Gitblit v1.9.3