保存节点负责人，类别编码

src/views/modules/plugins/power/poweraxis-add-or-update.vue

@@ -9,7 +9,7 @@
       <el-form-item prop="categoryCode" label="类别">
           <el-select v-model="dataForm.categoryCode" @change="handelChange" placeholder="请选择类别">
               <el-option
-              v-for="item in tagCategoryArr"
+              v-for="item in structCategoryArr"
               :key="item.categoryCode"
               :label="item.categoryName"
               :value="item.categoryCode">
@@ -128,7 +128,8 @@ export default {
         longitude: 36.0722275, //经度
         latitude: 120.38945519 //纬度
       },      
-      tagCategoryArr: [], // 查询动力主轴标签类别
+      structCategoryArr: [], // 查询动力主轴标签类别
+      leaderCategoryArr: [], // 查询动力主轴负责人标签类别
       agencytree: [], // 绑定组织列表
       GridPartyBranchList:[], // 上级网格党支部列表
       PartyCommList:[], // 党委列表
@@ -178,14 +179,18 @@ export default {
     },
     // 获取动力主轴标签
     async getTagCategoryArr(){
-        const url = '/pli/power/axisTag/listSimple/struct'
+        const url = '/pli/power/axisTag/listSimpleAll'
-
         let params = {}
-
         const { data, code, msg } = await requestPost(url, params)
-
         if (code === 0) {
-            this.tagCategoryArr = data
+            data.forEach((item) => {
+                if (item.tagCategory === 'struct') {
+                    this.structCategoryArr = item.tagList
+                }
+                if (item.tagCategory === 'leader') {
+                    this.leaderCategoryArr = item.tagList
+                } 
+            })
         } else {
             this.$message.error(msg)
         }

src/views/modules/plugins/power/poweraxis.vue

@@ -46,14 +46,14 @@
                 <template slot-scope="scope">
                     <el-button size="mini" type="danger" icon="el-icon-edit" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
                     <el-button size="mini" type="warning" icon="el-icon-edit" @click="deleteHandle_my(scope.row.id)">删除</el-button>
-                    <el-button size="mini" type="primary" icon="el-icon-user" @click="addLeader(scope.row.id, scope.row.leaderId)">负责人</el-button>
+                    <el-button size="mini" type="primary" icon="el-icon-user" @click="addLeader(scope.row.id, scope.row.leaderId, scope.row.structLevel)">负责人</el-button>
                 </template>
             </el-table-column>
         </el-table>
       </div>
      <!-- 弹窗, 新增 / 修改 -->
      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-     <add-leader :axisStructId="axisStructId" :leaderId="leaderId" :leaderVisible="leaderVisible" ref="poweraxisAddLeader" @refreshDataListleader="getDataList"></add-leader>
+     <add-leader :axisStructId="axisStructId" :structLevel="structLevel" :leaderId="leaderId" :leaderVisible="leaderVisible" ref="poweraxisAddLeader" @refreshDataListleader="getDataList"></add-leader>
     </div>
 </template>
 
@@ -86,9 +86,11 @@ export default {
             },
             agencytree: [], // 所属组织
             dataList:[], // 列表
-            tagCategoryArr: [], // 查询动力主轴标签类别
+            structCategoryArr: [], // 查询动力主轴标签类别
+            leaderCategoryArr: [], // 查询动力主轴负责人标签类别
             leaderVisible: false,
             axisStructId: '', // 动力主轴id 添加负责人的时候用
+            structLevel: null, // 动力主轴节点级别 添加负责人的时候用
             leaderId: ''
         }
     },
@@ -167,21 +169,28 @@ export default {
         },
         // 获取动力主轴标签
         async getTagCategoryArr(){
-            const url = '/pli/power/axisTag/listSimple/struct'
+            const url = '/pli/power/axisTag/listSimpleAll'
 
             let params = {}
 
             const { data, code, msg } = await requestPost(url, params)
 
             if (code === 0) {
-                this.tagCategoryArr = data
+                data.forEach((item) => {
+                    if (item.tagCategory === 'struct') {
+                        this.structCategoryArr = item.tagList
+                    }
+                    if (item.tagCategory === 'leader') {
+                        this.leaderCategoryArr = item.tagList
+                    } 
+                })
             } else {
                 this.$message.error(msg)
             }
         },
         categoryCodeFormatter (row) {
             let ca = ''
-            this.tagCategoryArr.forEach((tagCategory) => {
+            this.structCategoryArr.forEach((tagCategory) => {
                 if (tagCategory.categoryCode === row.categoryCode) {
                     ca = tagCategory.categoryName
                 }
@@ -209,9 +218,10 @@ export default {
             }
         },
         // 添加负责人
-        addLeader(axisStructId, leaderId) {
+        addLeader(axisStructId, leaderId, structLevel) {
             this.leaderVisible = true
             this.axisStructId = axisStructId
+            this.structLevel = structLevel
             this.leaderId = leaderId
         },
         getDataListLeader() {

src/views/modules/plugins/power/poweraxis_add_leader.vue

@@ -1,7 +1,10 @@
 <template>
   <el-dialog :visible.sync="visible" title="负责人" :close-on-click-modal="false" :close-on-press-escape="false" @closed="leaderClosed">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="负责任人名称" prop="name" label-width="110px">
+      <el-form-item label="类别" label-width="110px" v-if="structLevel || structLevel === 0">
+          {{ leaderCategoryCodeArr[structLevel].categoryName }}
+      </el-form-item>
+      <el-form-item label="名称" prop="name" label-width="110px">
           <el-input style="width:250px" v-model="dataForm.name" placeholder="负责任人名称"></el-input>
       </el-form-item>
       <el-form-item label="性别" prop="gender" label-width="110px">
@@ -58,11 +61,13 @@ export default {
         gender: '',
         mobile: '',
         interoduction: '',
+        categoryCode: '',
         avatar: '',
         structReferenceId: '', // 动力主轴节点ID
         // customerId: localStorage.getItem('customerId'),
         leaderId: ''
       },
+      leaderCategoryCodeArr: '', // 动力主轴节点级别
       gender: [
         { dictValue: '男', dictName: '男' },
         { dictValue: '女', dictName: '女' }
@@ -83,6 +88,13 @@ export default {
       type: String,
       default: ''
     },
+    structLevel: {
+      type: Number,
+      default: null
+    },
+  },
+  created(){
+      this.getTagCategoryArr()
   },
   watch: {
       leaderVisible(newName){
@@ -183,6 +195,7 @@ export default {
       this.$emit('refreshDataListleader')
     },
     async addLeader() {
+      this.dataForm.categoryCode = this.leaderCategoryCodeArr[this.structLevel].categoryCode
       const url = '/pli/power/axisLeader/save/'
       const { data, code, msg } = await requestPost(url, this.dataForm)
       if (code === 0) {
@@ -200,6 +213,7 @@ export default {
       }
     },
     async updateLeader() {
+      this.dataForm.categoryCode = this.leaderCategoryCodeArr[this.structLevel].categoryCode
       const url = '/pli/power/axisLeader/update'
       const { data, code, msg } = await requestPost(url, this.dataForm)
       if (code === 0) {
@@ -215,7 +229,19 @@ export default {
       } else {
           this.$message.error(msg)
       }
+    },
+    // 获取动力主轴标签
+    async getTagCategoryArr(){
+      const url = '/pli/power/axisTag/listSimple/leader'
+      let params = {}
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.leaderCategoryCodeArr = data
+      } else {
+          this.$message.error(msg)
       }
+    },
   }
 }
 </script>