From ae9cb41ec9ddee08d65ecfcc9fab351fe00d860d Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Mon, 25 Apr 2022 18:16:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/plugins/power/poweraxis.vue |  4 +-
 .../plugins/power/poweraxis_add_leader.vue    | 41 ++++++++++++++-----
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue
index 8e3eb5c2..649f2bb7 100644
--- a/src/views/modules/plugins/power/poweraxis.vue
+++ b/src/views/modules/plugins/power/poweraxis.vue
@@ -7,7 +7,7 @@
                         placeholder="请选择所属组织"
                         :options="agencytree"
                         v-model="dataForm.agencyId"
-                        :props="{ expandTrigger: 'hover', label: 'orgName', value: 'orgId', children: 'subOrgList' }"
+                        :props="{ expandTrigger: 'hover', emitPath: false, label: 'orgName', value: 'orgId', children: 'subOrgList' }"
                         clearable/>
             </el-form-item>
             <el-form-item label="部门名称" prop="deptName">
@@ -213,7 +213,7 @@ export default {
         async getDataList () {
             const url = '/pli/power/axisStruct/list4Tree'
 
-            const { data, code, msg } = await requestPost(url, this.queryParams)
+            const { data, code, msg } = await requestPost(url, this.dataForm)
 
             if (code === 0) {
                 this.dataList = handleTree(data, 'id', 'pid');
diff --git a/src/views/modules/plugins/power/poweraxis_add_leader.vue b/src/views/modules/plugins/power/poweraxis_add_leader.vue
index b7fda82e..22ad049f 100644
--- a/src/views/modules/plugins/power/poweraxis_add_leader.vue
+++ b/src/views/modules/plugins/power/poweraxis_add_leader.vue
@@ -31,13 +31,13 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="联系方式" prop="mobile" label-width="150px">
+              <el-form-item label="联系方式" label-width="150px">
                   <el-input class="item_width_1" v-model="dataForm.mobile" placeholder="联系方式"></el-input>
               </el-form-item>
               <el-form-item label="简介" prop="interoduction" label-width="150px">
-                  <el-input class="item_width_1" v-model="dataForm.interoduction" placeholder="简介"></el-input>
+                  <el-input type="textarea" class="item_width_1" v-model="dataForm.interoduction" placeholder="简介"></el-input>
               </el-form-item>
-              <el-form-item label="头像" prop="avatar" label-width="150px">
+              <el-form-item label="头像" label-width="150px">
                 <el-upload class="avatar-uploader"
                   :data="{customerId:customerId}"
                   :action="uploadUlr"
@@ -52,8 +52,8 @@
                 </el-upload>
               </el-form-item>
             </div>
-            <div v-else>
-              <el-form-item label="负责人" label-width="150px">
+            <div v-if="tagTab === 'choose'">
+              <el-form-item label="负责人" label-width="150px" prop="selectleaderId">
                 <el-select class="item_width_1" v-model="dataForm.selectleaderId" clearable placeholder="请选择负责人">
                   <el-option
                     v-for="item in listbriefArr"
@@ -124,13 +124,16 @@ export default {
         gender: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
+        // mobile: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
         interoduction: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        avatar: [
+        // avatar: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        selectleaderId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
@@ -138,7 +141,18 @@ export default {
   },
   methods: {
     initForm(agencyObj) {
-      this.$refs.ref_leader.resetFields();
+      // this.$refs.ref_leader.resetFields();
+      this.dataForm = {
+        name: '',
+        gender: '',
+        mobile: '',
+        interoduction: '',
+        categoryCode: '',
+        avatar: '',
+        structReferenceId: '', // 动力主轴节点ID
+        leaderId: '',
+        selectleaderId: ''
+      },
       this.dataForm.structReferenceId = agencyObj.axisStructId
       this.dataForm.leaderId = agencyObj.leaderId
       this.structLevel = agencyObj.structLevel
@@ -204,8 +218,9 @@ export default {
             app.util.validateRule(messageObj)
             this.btnDisable = false
           } else {
+            this.btnDisable = false
             if (this.dataForm.leaderId) {
-              if (this.dataForm.selectleaderId) {
+              if (this.tagTab === 'choose') {
                 this.bindLeader()
               } else {
                 this.updateLeader()
@@ -218,6 +233,7 @@ export default {
     },
     async addLeader() {
       this.dataForm.categoryCode = this.leaderCategoryCodeArr[this.structLevel].categoryCode
+      this.dataForm.id = ''
       const url = '/pli/power/axisLeader/save/'
       const { data, code, msg } = await requestPost(url, this.dataForm)
       if (code === 0) {
@@ -251,6 +267,9 @@ export default {
       }
     },
     async bindLeader() {
+      if (!this.dataForm.selectleaderId) {
+        return this.$message.error('请选择负责人')
+      }
       let params = {
           categoryCode:  this.leaderCategoryCodeArr[this.structLevel].categoryCode,
           axisStructId: this.dataForm.structReferenceId,