From f0a336726433796f861874c94759557195bc7128 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Wed, 20 Apr 2022 10:22:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E6=8B=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/power/poweraxis.vue | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue
index f1815311..1fbfe7c9 100644
--- a/src/views/modules/plugins/power/poweraxis.vue
+++ b/src/views/modules/plugins/power/poweraxis.vue
@@ -1,6 +1,13 @@
 <template>
     <div>
         <el-form :model="queryParams" ref="queryForm" :inline="true">
+            <el-form-item label="所属组织" prop="deptName">
+                <el-cascader
+                        :options="agencytree"
+                        placeholder="请选择所属组织"
+                        :props="{ expandTrigger: 'hover', label: 'orgName', value: 'orgId', children: 'subOrgList' }"
+                        @change="changeQueryParams" />
+            </el-form-item>
             <el-form-item label="部门名称" prop="deptName">
                 <el-input v-model="queryParams.axisName" placeholder="请输入部门名称" clearable size="small" />
             </el-form-item>
@@ -34,10 +41,10 @@
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
             >
             <el-table-column prop="name" label="动力主轴"></el-table-column>
-            <el-table-column prop="sort" label="排序" ></el-table-column>
             <el-table-column prop="categoryCode" :formatter="categoryCodeFormatter" label="类别" ></el-table-column>
             <el-table-column prop="leaderName" label="负责人"></el-table-column>
             <el-table-column prop="leaderMobile" label="联系方式" ></el-table-column>
+            <el-table-column prop="createdTime" label="创建时间" ></el-table-column>
             <el-table-column label="操作" align="center">
                 <template slot-scope="row">
                     <el-button size="mini" type="text" icon="el-icon-edit">修改</el-button>
@@ -256,7 +263,13 @@ export default {
             const { data, code, msg } = await requestPost(url,params)
 
             if (code === 0) {
-                this.agencytree = this.removeEmptySubOrgList(data)
+                let _data
+                if (data) {
+                    _data = this.removeByOrgType(data, 'agency')
+                    if (_data) {
+                        this.agencytree = this.removeEmptySubOrgList(_data)
+                    }
+                }
             } else {
                 this.$message.error(msg)
             }
@@ -290,7 +303,6 @@ export default {
             const { data, code, msg } = await requestPost(url,params)
 
             if (code === 0) {
-                console.log(data)
                 this.GridPartyBranchList = data
             } else {
                 this.$message.error(msg)
@@ -330,7 +342,6 @@ export default {
             this.addDialogBox = true
             this.addOrgForm.pid = ''
             this.getTagCategoryArr()
-            this.getAgencyTree()
         },
 
         /** 重置按钮操作 */
@@ -445,9 +456,26 @@ export default {
                     }
                 }
             })
-            return orgArray;
+            return orgArray
+        },
+        removeByOrgType (orgArray, orgType) {
+            if (orgArray && orgArray.length > 0) {
+                for (let p = orgArray.length - 1; p >= 0; p--) {
+                    let orgInfo = orgArray[p]
+                    if (orgInfo) {
+                        if (orgInfo.orgType !== orgType) {
+                            orgArray.splice(p, 1)
+                        } else {
+                            this.removeByOrgType(orgInfo.subOrgList, orgType)
+                        }
+                    }
+                }
+            }
+            return orgArray
+        },
+        changeQueryParams (item) {
+            console.log(item)
         }
-        
     }
 }
 </script>