1.团队长管理机构查询问题修复

2.后线人员、团队长、代理人增加离职时间
3.代理人新增修改时推荐人获取

src/views/PeopleManage/Agent/AgentManage.vue

@@ -79,7 +79,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="密码" prop="word">
+                <el-form-item  v-if="dialogPassword" label="密码" prop="word">
                   <el-input  v-model="formData.password" :class="isShow==true?'disc':'none'" ></el-input>
                   <i class="el-icon-view icon" @click="isShowFun()"></i>
                   <!-- <el-input style="width:200px"  v-model="formData.password" autocomplete="new-password"
@@ -90,7 +90,7 @@
              
               <el-col :span="8">
                 <el-form-item label="状态" prop="status">
-                  <el-select style="width:200px" v-model="formData.status" placeholder="请选择">
+                  <el-select style="width:200px" @change="statusChange" v-model="formData.status" placeholder="请选择">
                     <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value"
                       :key="val.id"></el-option>
                   </el-select>
@@ -116,6 +116,12 @@
                   <el-input  v-model="formData.referrerId" disabled></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="离职时间" prop="logoutTime">
+                  <el-date-picker style="width:200px" value-format="yyyy-MM-dd" v-model="formData.logoutTime" type="date" placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
           <div style="text-align: right;">
@@ -481,7 +487,7 @@ export default {
         identity:
         [{ required: true, message: "请填写身份证号" },
         { validator: validateSfz }], 
-        referrerId:[{ required: true, message: "请选择推荐人", trigger: "change" }]
+        referrerId:[{ required: true, message: "请选择推荐人", trigger: "change" }],
       },
       filterObject: {},
       peopleid: "",
@@ -518,6 +524,7 @@ export default {
       user_statusoptions: JSON.parse(localStorage.getItem('user_statusoptions')),
       roles: JSON.parse(localStorage.getItem('find_all')),
       option: [], //机构列表
+      dialogPassword:true, //密码是否显示
     };
   },
   created() {
@@ -545,6 +552,18 @@ export default {
     },
   },
   methods: {
+    //状态改变时
+    statusChange(e){
+      console.log(this.user_statusoptions)
+      console.log(e)
+      if(e==0){
+        this.$set( this.formDataRules,'logoutTime',[
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ])
+      }else{
+        this.formDataRules.logoutTime = undefined
+      }
+    },
     // excel导入
     carfrontChange(file) {
       const params = new FormData(); // 声明formData数据类型
@@ -620,6 +639,7 @@ export default {
     //联级选择器触发事件
     handleChange(val) {
       if (val && val.length !== 0) {
+        this.formData.referrerId = ''
         this.formData.deptId = val.at(-1);
         this.$api.user.selectfindByreferrerId({ deptId: this.formData.deptId }).then((res) => {
           this.recommenderOptions = res.data
@@ -661,6 +681,7 @@ export default {
     },
     //编辑
     async handleTableEdit(params) {
+      this.dialogPassword = false
       this.dataForm = {
         SFZ_01: "",
         SFZ_02: "",
@@ -673,7 +694,7 @@ export default {
       this.activeName = '1'
       let res = await this.$api.user.getUserDatail(params.userId)
       if (res.code == 200) {
-        this.$api.user.selectfindByreferrerId({ deptId: res.data.deptId }).then((res) => {
+        this.$api.user.selectfindByreferrerId({ deptId: res.data.sysUser.deptId }).then((res) => {
           this.recommenderOptions = res.data
         });
         if(res.data.esmUserImageVo.length > 0) {
@@ -688,6 +709,13 @@ export default {
         }
         res.data.sysUser.status += ''
         this.formData = res.data.sysUser
+        if(this.formData.status==0){
+          this.$set( this.formDataRules,'logoutTime',[
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ])
+        }else{
+          this.formDataRules.logoutTime = undefined
+        }
         this.formDataDetail = res.data.sysUserInfo?res.data.sysUserInfo:{}
         this.formData.password = ''
         this.dialogTitle = "编辑代理人";
@@ -726,6 +754,7 @@ export default {
         this.$message.info("请选择所属公司或部门");
         return;
       }
+      this.dialogPassword = true
       this.formData = {
         roleId: '20',
         status: '',

src/views/PeopleManage/Staff/StaffManage.vue

@@ -155,7 +155,7 @@
                   <el-input v-model="formData.name"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col v-if="dialogPassword" :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()"></i>
@@ -178,6 +178,12 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="离职时间" prop="logoutTime">
+                  <el-date-picker value-format="yyyy-MM-dd" style="width:200px" v-model="formData.logoutTime" type="date" placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
           <div style="text-align: right;">
@@ -553,6 +559,7 @@ export default {
       },
       //影像上传列表
       imagesIdList:[],
+      dialogPassword:false, //密码是否显示
     };
   },
   created() {
@@ -580,6 +587,16 @@ export default {
     },
   },
   methods: {
+    //状态改变时
+    statusChange(e){
+      if(e==0){
+        this.$set( this.formDataRules,'logoutTime',[
+        { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ])
+      }else{
+        this.formDataRules.logoutTime = undefined
+      }
+    },
     isShowFun(){
       this.isShow=!this.isShow
     },
@@ -669,7 +686,7 @@ export default {
         this.pageData.pageSize = data.pageRequest.pageSize;
       }
        let dto={
-        deptId:this.pageData.deptId,
+        deptId:this.deptId,
         mobile:this.pageData.mobile,
         name:this.pageData.name,
         userId:this.pageData.userId,
@@ -723,6 +740,13 @@ export default {
       if (res.code == 200) {
         res.data.sysUser.status += ''
         this.formData = res.data.sysUser
+        if(this.formData.status==0){
+          this.$set( this.formDataRules,'logoutTime',[
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ])
+        }else{
+          this.formDataRules.logoutTime = undefined
+        }
         if(res.data.esmUserImageVo.length > 0) {
           this.imagesIdList = res.data.esmUserImageVo.map(item=>{
             item.path = process.env.BASE_URL + item.path
@@ -737,6 +761,7 @@ export default {
         this.formData.password = ''
         this.dialogTitle = "编辑后线人员";
         this.dialogVisible = true;
+        this.dialogPassword = false;
       }
       else {
         this.$message.error(res.msg);
@@ -785,6 +810,7 @@ export default {
       this.activeName = '1'
       this.dialogTitle = "新增后线人员";
       this.dialogVisible = true;
+      this.dialogPassword = true;
     },
     getDictItems(typeName) {
       //--数据字典--

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -155,7 +155,7 @@
                   <el-input v-model="formData.name"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col v-if="dialogPassword" :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()"></i>
@@ -165,7 +165,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="状态" prop="status">
-                  <el-select style="width:200px" v-model="formData.status" placeholder="请选择">
+                  <el-select style="width:200px"  @change="statusChange" v-model="formData.status" placeholder="请选择">
                     <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value"
                       :key="val.id"></el-option>
                   </el-select>
@@ -178,6 +178,12 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="离职时间" prop="logoutTime">
+                  <el-date-picker value-format="yyyy-MM-dd" style="width:200px" v-model="formData.logoutTime" type="date" placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
           <div style="text-align: right;">
@@ -424,7 +430,7 @@ export default {
         mobile:'',
       },
       formData:{
-        roleId:'21'
+        roleId:'21',
       },
       formDataRules:{
         deptId:[{ required: true, message: "请选择机构", trigger: "change" }],
@@ -533,6 +539,7 @@ export default {
       user_statusoptions: JSON.parse(localStorage.getItem('user_statusoptions')) ,
       roles: JSON.parse(localStorage.getItem('find_all')) ,
       option: [], //机构列表
+      dialogPassword:false, //密码是否显示
     };
   },
   created() {
@@ -560,6 +567,16 @@ export default {
     },
   },
   methods: {
+    //状态改变时
+    statusChange(e){
+      if(e==0){
+        this.$set( this.formDataRules,'logoutTime',[
+        { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ])
+      }else{
+        this.formDataRules.logoutTime = undefined
+      }
+    },
     // 查询Start
     queryStaffInfo() {
       this.findPage();
@@ -624,7 +641,7 @@ export default {
         this.pageData.pageSize = data.pageRequest.pageSize;
       }
        let dto={
-        deptId:this.pageData.deptId,
+        deptId:this.deptId,
         mobile:this.pageData.mobile,
         name:this.pageData.name,
         userId:this.pageData.userId,
@@ -692,10 +709,21 @@ export default {
       if (res.code == 200) {
         res.data.sysUser.status += ''
         this.formData = res.data.sysUser
+        if(this.formData.status==0){
+          this.$set( this.formDataRules,'logoutTime',[
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ])
+        }else{
+          this.formDataRules.logoutTime = undefined
+        }
         this.formDataDetail = res.data.sysUserInfo?res.data.sysUserInfo:{}
         this.formData.password = ''
         this.dialogTitle = "编辑团队长";
         this.dialogVisible = true;
+        this.dialogPassword = false;
+        this.formData.referrerId = ''
+        this.formData.referrerName = ''
+
       }
       else {
         this.$message.error(res.msg);
@@ -736,6 +764,7 @@ export default {
       this.activeName = '1'
       this.dialogTitle = "新增团队长";
       this.dialogVisible = true;
+      this.dialogPassword = true;
       
     },
     // 新增或修改的弹出框Start
@@ -811,6 +840,7 @@ export default {
                 });
               }
               else{
+                console.log(this.formData)
                 this.$api.user.updateUserInfo(this.formData.id,{ sysUser: this.formData, sysUserInfo: this.formDataDetail }).then((res) => {
                   if (res.code == 200) {
                     this.$message({