+      
+        
             
                 
+                        clearable/>
             
             
-                
+                
             
             
-                搜索
-                重置
+                搜索
+                重置
             
         
-
-        
-            
-                新增
-            
-        
-
+      
+      
+        
+            {{ $t('add') }}
+        
         
         
+            :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}">
             
             
             
             
             
-            
-                
-                    修改
-                    删除
-                    负责人
+            
+                
+                    修改
+                    删除
+                    负责人
                 
             
         
-
-
-        
-        
-               
-                
-                    
-                        
-                        
-                    
-                
-                
-                    
-                
-                
-                
-                    
-                
-                
-                
-                    
-                        
-                        
-                    
-                
-
-                
-                
-                    
-                        
-                        
-                    
-                
-
-                
-                    
-                
-
-            
-            
-                取 消
-                确 定
-            
-        
-
-
-        
-        
-               
-                
-                    
-                        
-                        
-                    
-                
-                
-                    
-                
-                
-                
-                    
-                
-                
-                
-                    
-                        
-                        
-                    
-                
-
-                
-                
-                    
-                        
-                        
-                    
-                
-
-                
-                    
-                
-
-            
-            
-                取 消
-                确 定
-            
-        
-
-
-        
-        
-            确认删除吗?
-            
-                取 消
-                确 定
-            
-        
+      
+     
+     
+     
      
 
 
@@ -207,144 +61,47 @@
 import { requestPost } from "@/js/dai/request";
 import { handleTree } from "@/utils/treeSelect";
 import Treeselect from "@riophae/vue-treeselect";
+import AddOrUpdate from './poweraxis-add-or-update'
+import mixinViewModule from '@/mixins/view-module'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import AddLeader from './poweraxis_add_leader.vue';
 export default {
-    components: { Treeselect },
+    mixins: [mixinViewModule],
+    components: { 
+      Treeselect,
+      AddOrUpdate,
+      AddLeader
+    },
     data(){
         return{
-            // 删除标签
-            delId:'',
-            // 客户Id
-            customerId:'',
-            agencyId:'',
-            // 查询参数
-            queryParams:{
-                // 组织ID
-                agencyId: '',
-                // 动力主轴节点名称
-                axisName: '',
-                // 动力主轴节点负责人
-                leaderName: ''
+            mixinViewModuleOptions: {
+                createdIsNeed: false,
+                activatedIsNeed: false, // 此⻚⾯是否在激活(进⼊)时,调⽤查询数据列表接⼝?
+                getDataListIsPage: false, // 数据列表接⼝,是否需要分⻚?
             },
-            // 新增表单
-            addOrgForm:{
-                id:'',
-                name:'',
-                customerId:'',
-                agencyId:'',
-                agencyName:'',
-                agencyType:'',
-                pid:'',
-                categoryCode:'',
-                sort:''
+            dataForm:{ // 查询参数
+             agencyId: '', // 组织ID
+             axisName: '', // 动力主轴节点名称
+             leaderName: '' // 动力主轴节点负责人
             },
-            // 树状结构列表
-            powerAxisTreeList: [],
-            // 查询动力主轴标签类别
-            tagCategoryArr: [],
-            // 绑定组织列表
-            agencytree: [],
-            // 上级网格党支部列表
-            GridPartyBranchList:[],
-            // 党委列表
-            PartyCommList:[],
-            // 重新渲染表格状态
-            refreshTable: true,
-            // 是否展开,默认全部展开
-            isExpandAll: true,
-            // 新增对话框
-            addDialogBox:false,
-            // 组织列表开关
-            orgListSwitch:false,
-            // 上级网格党支部列表
-            GridPartyBranchSwitch:false,
-            // 党委下拉框列表开关
-            partyCommSwitch:false,
-            // 确认删除弹窗
-            delWindow:false,
-            // 修改弹窗
-            modifyPopSwitch:false,
-
-            rules:{
-                categoryCode:[
-                    { required: true, message: "上级部门不能为空", trigger: "blur" }
-                ],
-                name:[
-                    { required: true, message: "上级部门不能为空", trigger: "blur" }
-                ],
-                agencyId:[
-                    { required: true, message: "上级部门不能为空", trigger: "blur" }
-                ],
-                pid:[
-                    { required: true, message: "上级部门不能为空", trigger: "blur" }
-                ]
-            }
-            
+            agencytree: [], // 所属组织
+            dataList:[], // 列表
+            tagCategoryArr: [], // 查询动力主轴标签类别
+            leaderVisible: false,
+            axisStructId: '', // 动力主轴id 添加负责人的时候用
+            leaderId: ''
         }
     },
     created(){
-        // this.getTreeList()
-        this.initTreeData()
-        this.getTagCategoryArr()
+        this.getDataList()
         this.getAgencyTree()
+        this.getTagCategoryArr()
     },
     mounted(){
         this.customerId = localStorage.getItem('customerId')
         this.agencyId = localStorage.getItem('agencyId')
     },
     methods:{
-
-        handelAdd(){
-            this.$refs['addOrgForm'].validate((valid) => {
-                if (valid) {
-                    this.submitAddNewOrg()
-                } 
-            })
-        },
-        
-        // 确定新增按钮
-        async submitAddNewOrg(){
-            
-            const url = '/pli/power/axisStruct/addOrg'
-
-            let params = {
-                name:this.addOrgForm.name,
-                sort:this.addOrgForm.sort,
-                customerId:this.customerId,
-                agencyId:this.addOrgForm.agencyId,
-                agencyName:this.addOrgForm.agencyName,
-                agencyType:this.addOrgForm.agencyType,
-                categoryCode:this.addOrgForm.categoryCode,
-                pid:this.addOrgForm.pid
-            }
-
-            const { data, code, msg } = await requestPost(url,params)
-
-            if (code === 0) {
-                this.$message.success("新增成功")
-                this.addDialogBox = false
-                this.orgListSwitch = false
-                this.GridPartyBranchSwitch = false
-                this.initTreeData()
-                this.addOrgFormRest()
-            } else {
-                this.$message.error(msg)
-            }
-        },
-        // 获取动力主轴标签
-        async getTagCategoryArr(){
-            const url = '/pli/power/axisTag/listSimple/struct'
-
-            let params = {}
-
-            const { data, code, msg } = await requestPost(url, params)
-
-            if (code === 0) {
-                this.tagCategoryArr = data
-            } else {
-                this.$message.error(msg)
-            }
-        },
         // 获取组织列表
         async getAgencyTree(){
             const url = '/data/aggregator/org/agencytree'
@@ -368,244 +125,61 @@ export default {
                 this.$message.error(msg)
             }
         },
-        // 获取上级网格党支部
-        async getGridPartyBranchList(){
-            const url = '/pli/power/axisStruct/GridPartyBranchList'
-
-            let params = {}
-
+        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
+        },
+        removeEmptySubOrgList (orgArray) {
+            orgArray.forEach((orgInfo) => {
+                if (orgInfo && orgInfo.subOrgList) {
+                    if (orgInfo.subOrgList.length === 0) {
+                        orgInfo.subOrgList = undefined
+                    } else {
+                        this.removeEmptySubOrgList(orgInfo.subOrgList)
+                    }
+                }
+            })
+            return orgArray;
         },
         // 初始化动力主轴组织树
-        async initTreeData () {
+        async getDataList () {
             const url = '/pli/power/axisStruct/list4Tree'
 
             const { data, code, msg } = await requestPost(url, this.queryParams)
 
             if (code === 0) {
-                this.powerAxisTreeList = handleTree(data, 'id', 'pid');
+                this.dataList = handleTree(data, 'id', 'pid');
             } else {
                 this.$message.error(msg)
                 
             }
         },
-        // 获取上级网格党支部
-        async getGridPartyBranchList(){
-            const url = '/pli/power/axisStruct/GridPartyBranchList'
-
-            let params = {}
-
-            const { data, code, msg } = await requestPost(url,params)
-
-            if (code === 0) {
-                this.GridPartyBranchList = data
-            } else {
-                this.$message.error(msg)
-            }
-        },
-        // 获取上级组织党委
-        async getPartyCommList(){
-            const url = '/pli/power/axisStruct/getPartyCommList'
-
-            let params = {}
-
-            const { data, code, msg } = await requestPost(url,params)
-
-            if (code === 0) {
-                this.PartyCommList = data
-            } else {
-                this.$message.error(msg)
-            }
-        },
-        // 根据id查询修改表单数据
-        async queryModifyById(id){
-            const url = '/pli/power/axisStruct/queryModifyById/'+id
-
-            let params = {}
-
-            const { data, code, msg } = await requestPost(url,params)
-
-            if (code === 0) {
-                console.log(data)
-                this.addOrgForm.name = data.name
-                this.addOrgForm.customerId = data.customerId
-                this.addOrgForm.agencyId = data.agencyId
-                this.addOrgForm.agencyName = data.agencyName
-                this.addOrgForm.agencyType = data.agencyType
-                this.addOrgForm.pid = data.pid
-                this.addOrgForm.categoryCode = data.categoryCode
-                if(this.addOrgForm.categoryCode === 'community_party') {
-                    this.orgListSwitch = true
-                    this.GridPartyBranchSwitch = false
-                    this.partyCommSwitch = false
-                }
-                if(this.addOrgForm.categoryCode === 'grid_party') {
-                    this.orgListSwitch = false
-                    this.GridPartyBranchSwitch = false
-                    this.partyCommSwitch = true
-                    this.getPartyCommList()
-                }
-                if(this.addOrgForm.categoryCode === 'group_party') {
-                    this.GridPartyBranchSwitch = true
-                    this.partyCommSwitch = false
-                    this.getGridPartyBranchList()
-                }
-                this.addOrgForm.sort = data.sort
-            } else {
-                this.$message.error(msg)
-            }
-        },
-        // 确定修改按钮
-        async submitModifyOrg(){
-            const url = '/pli/power/axisStruct/modifyOrg'
-
-            let params = {
-                name:this.addOrgForm.name,
-                sort:this.addOrgForm.sort,
-                customerId:this.customerId,
-                agencyId:this.addOrgForm.agencyId,
-                agencyName:this.addOrgForm.agencyName,
-                agencyType:this.addOrgForm.agencyType,
-                categoryCode:this.addOrgForm.categoryCode,
-                pid:this.addOrgForm.pid,
-                id:this.addOrgForm.id
-            }
-
-            const { data, code, msg } = await requestPost(url,params)
-
-            if (code === 0) {
-                this.$message.success("修改成功")
-                this.modifyPopSwitch = false
-                this.addOrgFormRest()
-                this.initTreeData()
-                this.getTagCategoryArr()
-                this.getAgencyTree()
-            } else {
-                this.$message.error(msg)
-            }
-        },
-        // 查父id
-        // async getPid(){
-        //     const url = '/pli/power/axisStruct/getPid'
-
-        //     let params = {}
-
-        //     const { data, code, msg } = await requestPost(url,params)
-
-        //     if (code === 0) {
-        //         this.addOrgForm.pid = data
-        //     } else {
-        //         this.$message.error(msg)
-        //     }
-        // },
-
-        // 新增按钮
-        addNewOrg(){
-            this.addDialogBox = true
-            this.addOrgForm.pid = ''
-            this.getTagCategoryArr()
-        },
-
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.queryParams.name = ''
-            this.initTreeData()
-        },
-        /** 展开/折叠操作 */
-        // toggleExpandAll() {
-        // this.refreshTable = false;
-        // this.isExpandAll = !this.isExpandAll;
-        //     this.$nextTick(() => {
-        //         this.refreshTable = true;
-        //     });
-        // },
-        // 关闭对话框
-        handleClose(done) {
-        this.$confirm('确认关闭?')
-            .then(_ => {
-                this.addOrgFormRest()
-                this.orgListSwitch = false
-                this.GridPartyBranchSwitch = false
-                done();
-            })
-            .catch(_ => {});
-        },
-        // 取消新增按钮
-        cancelAdd(){
-            this.addDialogBox = false
-            this.orgListSwitch = false
-            this.GridPartyBranchSwitch = false
-            this.addOrgFormRest()
-        },
-        // 取消修改按钮
-        cancelModify(){
-            this.modifyPopSwitch = false
-            this.orgListSwitch = false
-            this.GridPartyBranchSwitch = false
-            this.addOrgFormRest()
-        },
-        // 清空新增表单
-        addOrgFormRest(){
-            this.addOrgForm.name = ''
-            this.addOrgForm.customerId = ''
-            this.addOrgForm.sort = ''
-            this.addOrgForm.agencyId = '',
-            this.addOrgForm.agencyName = '',
-            this.addOrgForm.agencyType = '',
-            this.addOrgForm.pid = ''
-            this.addOrgForm.categoryCode = ''
-        },
-        // 动力主轴选中后的操作
-        handelChange(val){
-            this.addOrgForm.categoryCode = val
-            if (val === 'community_party') {
-                this.orgListSwitch = true
-                this.GridPartyBranchSwitch = false
-                this.partyCommSwitch = false
-                this.addOrgForm.pid = 0
-            } 
-            if(val === 'grid_party') {
-                this.orgListSwitch = false
-                this.GridPartyBranchSwitch = false
-                this.partyCommSwitch = true
-                this.getPartyCommList()
-                this.addOrgForm.pid = ''
-            }
-            if(val === 'group_party') {
-                this.GridPartyBranchSwitch = true
-                this.partyCommSwitch = false
-                this.addOrgForm.pid = ''
-                this.getGridPartyBranchList()
-            }
-        },
+        // 获取动力主轴标签
+        async getTagCategoryArr(){
+            const url = '/pli/power/axisTag/listSimple/struct'
 
-        // 删除按钮
-        del(row){
-            this.delWindow = true
-            this.delId = row.row.id
-        },
-        async submitDelete(){
-            const url = '/pli/power/axisStruct/deleteById/'+this.delId
-            
             let params = {}
 
-            const { data, code, msg } = await requestPost(url,params)
+            const { data, code, msg } = await requestPost(url, params)
 
             if (code === 0) {
-                this.$message.success("删除成功")
-                this.initTreeData()
-                this.delWindow = false
+                this.tagCategoryArr = data
             } else {
                 this.$message.error(msg)
             }
         },
-        // 取消删除按钮
-        canceldelWindow(){
-            this.delWindow = false
-        },
-        handelGridParty(val){
-            console.log(val)
-        },
-        categoryCodeFormatter (row, column) {
+        categoryCodeFormatter (row) {
             let ca = ''
             this.tagCategoryArr.forEach((tagCategory) => {
                 if (tagCategory.categoryCode === row.categoryCode) {
@@ -614,57 +188,80 @@ export default {
             })
             return ca
         },
-        removeEmptySubOrgList (orgArray) {
-            orgArray.forEach((orgInfo) => {
-                if (orgInfo && orgInfo.subOrgList) {
-                    if (orgInfo.subOrgList.length === 0) {
-                        orgInfo.subOrgList = undefined
-                    } else {
-                        this.removeEmptySubOrgList(orgInfo.subOrgList)
-                    }
-                }
-            })
-            return orgArray;
+        // 删除方法
+        deleteHandle_my(id) {
+            this.$confirm(this.$t('prompt.info', { 'handle': this.$t('delete') }), this.$t('prompt.title'), {
+                confirmButtonText: this.$t('confirm'),
+                cancelButtonText: this.$t('cancel'),
+                type: 'warning'
+            }).then(() => {
+                this.submitDelete(id)
+            }).catch(() => {})
         },
-        // 修改表单按钮
-        modify(row){
-            this.modifyPopSwitch = true
-            this.queryModifyById(row.row.id)
-            this.addOrgForm.id = row.row.id
-        },
-        handelAddAgency(val){
-            
-            if (val.length === 3) {
-                this.addOrgForm.agencyId = val[2]
-                
-
+        async submitDelete(id){
+            const url = '/pli/power/axisStruct/deleteById/'+ id
+            const { code, msg } = await requestPost(url)
+            if (code === 0) {
+                this.$message.success("删除成功")
+                this.getDataList()
             } else {
-                this.addOrgForm.agencyId = val[1]
+                this.$message.error(msg)
             }
-            this.addOrgForm.agencyType = 'agency'
         },
-        
-        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
+        // 添加负责人
+        addLeader(axisStructId, leaderId) {
+            this.leaderVisible = true
+            this.axisStructId = axisStructId
+            this.leaderId = leaderId
         },
-        changeQueryParams (item) {
-            console.log(item)
+        getDataListLeader() {
+             this.leaderVisible = false
+             this.axisStructId = ''
+             this.getDataList()
         }
     }
 }
 
 
-
\ No newline at end of file
diff --git a/src/views/modules/plugins/power/poweraxis_add_leader.vue b/src/views/modules/plugins/power/poweraxis_add_leader.vue
new file mode 100644
index 000000000..0f69433c4
--- /dev/null
+++ b/src/views/modules/plugins/power/poweraxis_add_leader.vue
@@ -0,0 +1,249 @@
+