From 729db9dd93f8884a8f1f0b32a4462708f858ea9b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 13 六月 2023 20:05:53 +0800
Subject: [PATCH] 代码整合

---
 Source/UBCS-WEB/src/components/Tree/classifyTrees.vue |   80 +++++++++++++++++++++++++++++----------
 1 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index f3d1fd1..9048526 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -74,6 +74,7 @@
                           @row-del="CrudRowDel"
                           @row-update="CrudRowUpdata"
                           :before-close="beforeClose"
+                          @select="selectHandle"
                >
             <template slot="menuLeft">
               <el-button plain size="small" type="primary" @click="FindFormVisible = true;">鏌ヨ</el-button>
@@ -168,7 +169,7 @@
           </avue-crud>
 
           </basic-container>
-          <templatePro :ProData="this.ProData"></templatePro>
+          <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudArray="this.crudArray" :Formlist="this.Formlist" :codeClassifyOid="this.codeClassifyOid"></templatePro>
         </span>
       </basic-container>
     </el-main>
@@ -187,7 +188,6 @@
   TreeObjcet,
   TreeEnable,
   TreeDeactivate,
-  importClassify,
   gridCodeClassifyTemplate,
   getObjectByOid,
   gridCodeClassifyTemplateAttr,
@@ -197,16 +197,50 @@
   editSave,
   copy
 } from "@/api/template/templateAttr";
-import done from "@/views/work/done";
 
 export default {
   name: "classifyTrees.vue",
   //浣跨敤inject鎺ユ敹鍙傛暟
   //Treeoption宸︿晶鏍戞柊澧炶〃鍗曢」 Treedata宸︿晶鏍戣妭鐐� 閰嶇疆椤� crudTreeOption鍙充晶琛ㄦ牸閰嶇疆椤� crudTreeData鍙充晶琛ㄦ牸鏄剧ず鍐呭
   //Treeform鍙充晶琛ㄥ崟閰嶇疆椤�
-  inject: ['crudTreeOption', "crudTreeData"],
+  inject: [, "crudTreeData"],
   data() {
     return {
+      //琛ㄦ牸option閰嶇疆椤�
+      crudTreeOption: {
+        index: true,
+        border: true,
+        height:180,
+        selection:true,
+        addBtn:this.addFlag,
+        column: [
+          {
+            label: "妯℃澘缂栧彿",
+            prop: "id"
+          },
+          {
+            label:"妯℃澘鍚嶇О",
+            prop:"name"
+          },
+          {
+            label: "妯℃澘鎻忚堪",
+            prop:"description"
+          },
+          {
+            label:"鐗堟湰鍙�",
+            prop:"revisionSeq"
+          },
+          {
+            label:"鐘舵��",
+            prop:"lcStatusText"
+          }
+        ]
+      },
+      addFlag:false,
+      // 琛ㄦ牸褰撳墠琛宨d
+      crudOid:"",
+      //琛ㄦ牸褰撳墠閫夋嫨鏁扮粍
+      crudArray:[],
       //妯℃澘灞炴�у睍绀哄唴瀹�
       ProData: [],
       //鍥炶溅閿悳绱㈢粦瀹氬��
@@ -401,19 +435,29 @@
     this.getAttr();
   },
   methods: {
+    //琛屽崟閫変簨浠�
+    selectHandle(selection,row){
+      this.crudOid=row.oid;
+      this.crudArray=selection;
+      gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
+        this.ProData = res.data.data;
+        console.log(this.ProData)
+      }).catch(res => {
+        this.$message.error(res)
+      })
+    },
     //鍒嗙被鏍戞暟鎹鐞�
     getAttr() {
       getAtrrList().then(res => {
         this.Treedata = res.data;
         this.CloneTreedata = res.data;
-        this.Treedata.forEach((item) => {
+        this.Treedata.forEach(() => {
           for (let i = 0; i < this.Treedata.length; i++) {
             this.Treedata[i].value = i;
           }
         })
         //璋冪敤淇敼灞炴�у悕鏂规硶
-        this.ModifyProperties(this.Treedata, 'text', 'label');
-        this.ModifyProperties(this.CloneTreedata, 'text', 'label');
+        this.ModifyProperties(this.CloneTreedata, 'name', 'label');
       }).catch(res => {
         this.$message.error(res)
       })
@@ -547,7 +591,7 @@
           cancelButtonText: '鍙栨秷',
           type: 'warning'
         }).then(() => {
-          TreeEnable(this.nodeClickList).then((res) => {
+          TreeEnable(this.nodeClickList).then(() => {
             this.$message({
               type: 'success',
               message: '鍚敤鎴愬姛!'
@@ -575,7 +619,7 @@
           cancelButtonText: '鍙栨秷',
           type: 'warning'
         }).then(() => {
-          TreeDeactivate(this.nodeClickList).then((res) => {
+          TreeDeactivate(this.nodeClickList).then(() => {
             this.$message({
               type: 'success',
               message: '鍋滅敤鎴愬姛!'
@@ -596,6 +640,7 @@
       //瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠$悊琛ㄦ牸閲岄潰鐨刼id
       this.nodeClickList = data
       console.log(data.oid)
+      this.ProData=[]
       try {
         await TreeObjcet(data.oid).then(res => {
           this.FlagObj = res.data.data
@@ -610,19 +655,12 @@
               return item.codeclassifyoid == this.nodeClickList.oid
             }
           })
-          gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
-            this.ProData = res.data.data
-            console.log(this.ProData)
-          }).catch(res => {
-            this.$message.error(res)
-          })
         }).catch(res => {
           console.log(res)
         })
         //  鍩烘湰淇℃伅琛ㄥ崟鏁版嵁
         await getObjectByOid(this.nodeClickList.oid).then(res => {
-          this.TreeList = res.data.data
-          // eslint-disable-next-line no-const-assig
+          this.TreeList = res.data.data;
         }).catch(res => {
           this.$message.error(res)
         })
@@ -723,7 +761,7 @@
       } else {
         let codeClassifyOid = this.codeClassifyOid
         this.$set(row, "codeclassifyoid", codeClassifyOid)
-        addSave(row).then(res => {
+        addSave(row).then(() => {
           this.$message({
             type: "success",
             message: "娣诲姞鎴愬姛!"
@@ -740,7 +778,7 @@
     },
     //妯℃澘绠$悊淇敼
     CrudRowUpdata(row,index,done) {
-      editSave(row).then((res) => {
+      editSave(row).then(() => {
         this.CrudRend()
         this.$message({
           type: "success",
@@ -753,7 +791,7 @@
     },
     //妯℃澘绠$悊鍒犻櫎
     CrudRowDel(row) {
-      deleteData(row).then(res => {
+      deleteData(row).then(()=> {
         this.CrudRend()
       }).catch(res => {
         this.$message({
@@ -831,7 +869,7 @@
       //閲嶆柊璧嬪�糃loneSelect浼犻�掔殑鏁版嵁涓鸿緭鍏ユ鍙互淇敼鐨勬暟鎹紝CloneModel鎻愪氦琛ㄥ崟杈撳叆妗嗗弻鍚戠粦瀹氭暟鎹�
       this.CloneSelect[0].id=this.CloneModel.id;
       this.CloneSelect[0].name=this.CloneModel.name;
-      copy(this.CloneSelect[0]).then(res=>{
+      copy(this.CloneSelect[0]).then(()=>{
         //鍥犱负鏄祵濂楀脊绐楁墍浠ユ墜鍔ㄥ叧闂瑿loneinnerVisible锛孋loneVisible涓や釜寮圭獥銆�
         this.CloneinnerVisible=false
         this.CloneVisible=false

--
Gitblit v1.9.3