fix:人员管理添加人员领导人选择bug修复

src/views/PeopleManage/Agent/AgentManage.vue

@@ -218,8 +218,8 @@
                     <el-option
                       v-for="val in leaderOptions"
                       :label="val.name"
-                      :value="val.userId"
-                      :key="val.userId"
+                      :value="val.id"
+                      :key="val.id"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -917,11 +917,10 @@ export default {
         .then((res) => {
           this.recommenderOptions = res.data;
         });
-      this.$api.user
-        .findListByDeptId({ deptId: this.formData.deptId })
-        .then((res) => {
-          this.leaderOptions = res.data;
-        });
+      // formData
+      this.$api.user.findListByDeptId({ deptId: this.deptId }).then((res) => {
+        this.leaderOptions = res.data;
+      });
       if (this.currentTreeNode == null) {
         this.$message.info("请选择所属公司或部门");
         return;

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -204,8 +204,8 @@
                     <el-option
                       v-for="val in leaderOptions"
                       :label="val.name"
-                      :value="val.userId"
-                      :key="val.userId"
+                      :value="val.id"
+                      :key="val.id"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -747,11 +747,15 @@ export default {
     findPage(data) {
       this.tableConfig.loading = true;
       let leaderName = "";
-      this.searchLeaderOptions.forEach((val) => {
-        if (val.id == data.leaderName) {
-          leaderName = val.name;
-        }
-      });
+
+      if (data != undefined) {
+        this.searchLeaderOptions.forEach((val) => {
+          if (val.id == data.leaderName) {
+            leaderName = val.name;
+          }
+        });
+      }
+
       this.$api.user
         .findUserList({
           ...this.pageData,
@@ -821,9 +825,9 @@ export default {
     },
     //添加人员
     handleAddButton() {
-      //级联渲染部门列表
+      //级联渲染部门列表  formData
       this.$api.user
-        .findBackListByDeptId({ deptId: this.formData.deptId })
+        .findBackListByDeptId({ deptId: this.deptId })
         .then((res) => {
           this.leaderOptions = res.data;
         });

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -88,8 +88,20 @@
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="领导人">
-                    <el-select  size="small" style="width:215px" clearable filterable  v-model="pageData.leaderId" placeholder="请选择">
-                      <el-option v-for="item in searchLeaderOptions" :key="item.id" :label="item.name" :value="item.name">
+                    <el-select
+                      size="small"
+                      style="width: 215px"
+                      clearable
+                      filterable
+                      v-model="pageData.leaderId"
+                      placeholder="请选择"
+                    >
+                      <el-option
+                        v-for="item in searchLeaderOptions"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.name"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -175,7 +187,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="身份证号" prop="identity">
                   <el-input
@@ -190,19 +202,23 @@
                   <el-input v-model="formData.name"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col  :span="8">
+              <el-col :span="8">
                 <el-form-item label="密码" prop="password">
                   <el-input
                     v-model="formData.password"
                     :class="isShow == true ? 'disc' : 'none'"
                   ></el-input>
-                  <i class="el-icon-view icon" @click="isShowFun()" v-if="dialogPassword"></i>
+                  <i
+                    class="el-icon-view icon"
+                    @click="isShowFun()"
+                    v-if="dialogPassword"
+                  ></i>
                   <!-- <el-input style="width:200px" v-model="formData.password" autocomplete="new-password" -->
                   <!-- show-password></el-input> -->
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="状态" prop="status">
                   <el-select
@@ -239,15 +255,35 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="岗位" prop="positionId">
-                  <el-select style="width:200px" v-model="formData.positionId" placeholder="请选择">
-                    <el-option v-for="val in postOption" :label="val.postName" :value="val.postId" :key="val.postId"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formData.positionId"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in postOption"
+                      :label="val.postName"
+                      :value="val.postId"
+                      :key="val.postId"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="领导人" prop="leaderId">
-                  <el-select style="width: 200px" clearable filterable  v-model="formData.leaderId" placeholder="请选择">
-                    <el-option v-for="val in leaderOptions" :label="val.name" :value="val.userId" :key="val.userId"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    clearable
+                    filterable
+                    v-model="formData.leaderId"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in leaderOptions"
+                      :label="val.name"
+                      :value="val.id"
+                      :key="val.id"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -288,12 +324,18 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="开户账号" prop="accountno">
-                  <el-input style="width:200px" v-model="formDataDetail.accountno"></el-input>
+                  <el-input
+                    style="width: 200px"
+                    v-model="formDataDetail.accountno"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="开户行" prop="bankName">
-                  <el-input style="width:200px" v-model="formDataDetail.bankName"></el-input>
+                  <el-input
+                    style="width: 200px"
+                    v-model="formDataDetail.bankName"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -313,7 +355,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="出生日期" prop="birthday">
                   <el-date-picker
@@ -327,50 +369,94 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="户籍" prop="koseki">
-                  <el-input style="width:200px" v-model="formDataDetail.koseki"></el-input>
+                  <el-input
+                    style="width: 200px"
+                    v-model="formDataDetail.koseki"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="婚姻状况" prop="maritalStatus">
-                  <el-select  v-model="formDataDetail.maritalStatus" placeholder="请选择婚姻状况" style="width:200px">
-                    <el-option v-for="val in maritalStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
+                  <el-select
+                    v-model="formDataDetail.maritalStatus"
+                    placeholder="请选择婚姻状况"
+                    style="width: 200px"
+                  >
+                    <el-option
+                      v-for="val in maritalStatusOption"
+                      :key="val.value"
+                      :label="val.label"
+                      :value="val.value"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="民族" prop="nations">
-                  <el-select  style="width:200px" v-model="formDataDetail.nations" placeholder="请选择民族">
-                    <el-option :label="national" :value="national" v-for="national in nationalList"
-                      :key="national"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formDataDetail.nations"
+                    placeholder="请选择民族"
+                  >
+                    <el-option
+                      :label="national"
+                      :value="national"
+                      v-for="national in nationalList"
+                      :key="national"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="政治面貌" prop="politicsStatus">
-                  <el-select  style="width:200px" v-model="formDataDetail.politicsStatus" placeholder="请选择">
-                    <el-option v-for="val in politicsStatusOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formDataDetail.politicsStatus"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in politicsStatusOption"
+                      :key="val.value"
+                      :label="val.label"
+                      :value="val.value"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="健康状况" prop="health">
-                  <el-select  style="width:200px" v-model="formDataDetail.health" placeholder="请选择">
-                    <el-option v-for="val in healthOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
+                  <el-select
+                    style="width: 200px"
+                    v-model="formDataDetail.health"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="val in healthOption"
+                      :key="val.value"
+                      :label="val.label"
+                      :value="val.value"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="邮政编码" prop="postalCode">
-                  <el-input style="width:200px" v-model="formDataDetail.postalCode"></el-input>
+                  <el-input
+                    style="width: 200px"
+                    v-model="formDataDetail.postalCode"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="居住地址" prop="address">
-                  <el-input style="width:200px" v-model="formDataDetail.address"></el-input>
+                  <el-input
+                    style="width: 200px"
+                    v-model="formDataDetail.address"
+                  ></el-input>
                 </el-form-item>
               </el-col>
 
@@ -381,12 +467,17 @@
                     v-model="formDataDetail.bloodType"
                     placeholder="请选择"
                   >
-                  <el-option v-for="val in bloodOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
+                    <el-option
+                      v-for="val in bloodOption"
+                      :key="val.value"
+                      :label="val.label"
+                      :value="val.value"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="学历" prop="education">
                   <el-select
@@ -394,13 +485,21 @@
                     v-model="formDataDetail.education"
                     placeholder="请选择"
                   >
-                  <el-option v-for="val in educationOption" :key="val.value" :label="val.label" :value="val.value"></el-option>
+                    <el-option
+                      v-for="val in educationOption"
+                      :key="val.value"
+                      :label="val.label"
+                      :value="val.value"
+                    ></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="毕业院校" prop="school">
-                  <el-input style="width:200px" v-model="formDataDetail.school"></el-input>
+                  <el-input
+                    style="width: 200px"
+                    v-model="formDataDetail.school"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -415,10 +514,13 @@
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="原工作单位" prop="formerEmployer">
-                  <el-input style="width:200px" v-model="formDataDetail.formerEmployer"></el-input>
+                  <el-input
+                    style="width: 200px"
+                    v-model="formDataDetail.formerEmployer"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -438,17 +540,17 @@
                   prop="agentQualificationCode"
                 >
                   <el-input
-                  style="width:200px"
+                    style="width: 200px"
                     v-model="formDataDetail.agentQualificationCode"
                   ></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="紧急联系人电话" prop="emergencyContactTel">
                   <el-input
-                  style="width:200px"
+                    style="width: 200px"
                     v-model="formDataDetail.emergencyContactTel"
                   ></el-input>
                 </el-form-item>
@@ -459,7 +561,7 @@
                   prop="emergencyContactName"
                 >
                   <el-input
-                  style="width:200px"
+                    style="width: 200px"
                     v-model="formDataDetail.emergencyContactName"
                   ></el-input>
                 </el-form-item>
@@ -492,10 +594,10 @@ import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import { validateSfz } from "../../../utils/validate.js";
-import mixa from '../mixin'
+import mixa from "../mixin";
 const mixin = new mixa({
-  treeTypeNum:2 //树分类过滤参数
-})
+  treeTypeNum: 2, //树分类过滤参数
+});
 export default {
   components: {
     KtButton,
@@ -542,8 +644,7 @@ export default {
         ],
       },
       formDataDetail: {},
-      formDataRulesDetail: {
-      },
+      formDataRulesDetail: {},
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
@@ -584,7 +685,7 @@ export default {
           prop: "managementSource",
           label: "来源",
           minWidth: 80,
-          formatter: this.managementSourceFormatter
+          formatter: this.managementSourceFormatter,
         },
         {
           prop: "status",
@@ -597,15 +698,14 @@ export default {
       dialogVisible: false, // 新增编辑界面是否显示
       departmentList: [], // 选中公司的所有部门的集合
       deptInfo: {}, //选中机构的基本信息
-       option: [], //机构列表
+      option: [], //机构列表
       dialogPassword: false, //密码是否明文
     };
   },
   created() {
-    this.searchLeaderFun()
+    this.searchLeaderFun();
   },
   methods: {
-   
     searchLeaderFun() {
       this.$api.user
         .findBackListByDeptId({ deptId: this.deptId })
@@ -613,8 +713,8 @@ export default {
           this.searchLeaderOptions = res.data;
         });
     },
-    managementSourceFormatter(row){
-      const managementSource=row.managementSource=='2'?"个代":"渠道"
+    managementSourceFormatter(row) {
+      const managementSource = row.managementSource == "2" ? "个代" : "渠道";
       return managementSource;
     },
     //状态改变时
@@ -642,7 +742,7 @@ export default {
       this.deptId = this.currentTreeNode.id;
       this.pageData.pageNum = 1;
       this.findPage();
-      this.searchLeaderFun()
+      this.searchLeaderFun();
       // this.formData.deptId = [];
       // this.platform(treeId);
     },
@@ -651,9 +751,9 @@ export default {
       if (val && val.length !== 0) {
         this.formData.leaderId = "";
         this.formData.deptId = val.at(-1);
-        console.log( this.formData.deptId,val,222222222);
+        // console.log( this.formData.deptId,val,222222222);
         this.$api.user
-          .findListByDeptId({ deptId: this.formData.deptId, })
+          .findListByDeptId({ deptId: this.formData.deptId })
           .then((res) => {
             this.leaderOptions = res.data;
           });
@@ -777,7 +877,7 @@ export default {
       if (res.code == 200) {
         this.$api.user
           // .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.row.userId })
-        .findBackUserList1({agentFlag: 0})
+          .findBackUserList1({ agentFlag: 0 })
           .then((res) => {
             this.leaderOptions = res.data;
           });
@@ -818,16 +918,15 @@ export default {
     },
     //添加人员
     handleAddButton() {
-      this.$api.user
-        .findListByDeptId({ deptId: this.formData.deptId })
-        .then((res) => {
-          this.leaderOptions = res.data;
-        });
       if (this.currentTreeNode == null) {
         this.$message.info("请选择所属公司或部门");
         return;
       }
-      if(this.currentTreeNode.comlevel!=null||this.currentTreeNode.managementSource!=2){ //团队代理人managementSource为2  渠道为1  后线为空
+      if (
+        this.currentTreeNode.comlevel != null ||
+        this.currentTreeNode.managementSource != 2
+      ) {
+        //团队代理人managementSource为2  渠道为1  后线为空
         this.$message.info("请选择第六级机构");
         return;
       }
@@ -846,6 +945,9 @@ export default {
       this.dialogTitle = "新增团队长";
       this.dialogVisible = true;
       this.dialogPassword = true;
+      this.$api.user.findListByDeptId({ deptId: this.deptId }).then((res) => {
+        this.leaderOptions = res.data;
+      });
     },
     // 新增或修改的弹出框Start
     getDictItems(typeName) {
@@ -899,12 +1001,16 @@ export default {
             //   });
             //   return false
             // }
-            if(this.formData.positionId){
-                this.formData.positionName=this.postOption.find(val=>val.postId==this.formData.positionId).postName
-              }
-              if (this.formData.leaderId) {
-                this.formData.leaderName = this.leaderOptions.find(val => val.userId == this.formData.leaderId).name
-              }
+            if (this.formData.positionId) {
+              this.formData.positionName = this.postOption.find(
+                (val) => val.postId == this.formData.positionId
+              ).postName;
+            }
+            if (this.formData.leaderId) {
+              this.formData.leaderName = this.leaderOptions.find(
+                (val) => val.userId == this.formData.leaderId
+              ).name;
+            }
             if (this.dialogTitle == "新增团队长") {
               this.$api.user
                 .saveUserInfo({