@dongkboy %!s(int64=2) %!d(string=hai) anos
pai
achega
367727b03f

+ 3 - 2
src/views/PeopleManage/Agent/AgentManage.vue

@@ -178,6 +178,7 @@
                 <el-form-item label="推荐人" prop="referrerId">
                   <el-select
                     style="width: 200px"
+                    clearable
                     v-model="formData.referrerId"
                     placeholder="请选择"
                   >
@@ -456,7 +457,7 @@ import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
 import { validateSfz } from "../../../utils/validate.js";
-import mixa from '../mixin' 
+import mixa from '../mixin'
 const mixin = new mixa({
   treeTypeNum:2 //树分类过滤参数
 })
@@ -467,7 +468,7 @@ export default {
     templateTable,
     peopleImage,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
       activeName: "1",

+ 5 - 5
src/views/PeopleManage/Player/PlayerManage.vue

@@ -193,6 +193,7 @@
                 <el-form-item label="业务员" prop="referrerId">
                   <el-select
                     style="width: 200px"
+                    clearable
                     v-model="formData.referrerId"
                     placeholder="请选择"
                   >
@@ -229,13 +230,13 @@
     </el-dialog>
   </div>
 </template>
-  
+
   <script>
 import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
-import mixa from '../mixin' 
+import mixa from '../mixin'
 const mixin = new mixa({
   treeTypeNum:1
 })
@@ -246,7 +247,7 @@ export default {
     templateTable,
     peopleImage,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
       activeName: "1", //弹框tab索引
@@ -591,7 +592,7 @@ export default {
   },
 };
 </script>
-  
+
   <style scoped>
 .el-divider--horizontal {
   margin: 4px 0;
@@ -625,4 +626,3 @@ export default {
   text-align: center;
 }
 </style>
-  

+ 11 - 10
src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -40,7 +40,7 @@
             :pagination="pageData"
           >
           <template slot="领导人" >
-          <el-select size="small" v-model="queryFrom.leaderName" placeholder="请选择" clearable>
+          <el-select size="small" v-model="queryFrom.leaderName" placeholder="请选择" clearable  filterable>
               <el-option
                 v-for="item in searchLeaderOptions"
                 :key="item.id"
@@ -91,7 +91,7 @@
                       checkStrictly: true,
                     }"
                     @change="handleChange"
-                    
+
                   >
                   </el-cascader> </el-form-item
               ></el-col>
@@ -182,6 +182,8 @@
                 <el-form-item label="领导人" prop="leaderId">
                   <el-select
                     style="width: 200px"
+                    clearable
+                    filterable
                     v-model="formData.leaderId"
                     placeholder="请选择"
                   >
@@ -426,13 +428,13 @@
     </el-dialog>
   </div>
 </template>
-  
+
   <script>
 import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
-import mixa from '../mixin' 
+import mixa from '../mixin'
 const mixin = new mixa({
   treeTypeNum:1 //树分类过滤参数
 })
@@ -443,7 +445,7 @@ export default {
     templateTable,
     peopleImage,
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
       searchLeaderOptions:[],
@@ -556,7 +558,7 @@ export default {
       containsSubDeptChecked: true, //是否包含下级机构
       dialogTitle: "", //弹框title
       dialogVisible: false, // 新增编辑界面是否显示
-     
+
       option: [], //机构列表
       dialogPassword: true, //密码是否显示明文
       // postOption:[],
@@ -568,7 +570,7 @@ export default {
     this.findPage();
     this.searchLeaderFun()
   },
- 
+
   watch: {
     containsSubDeptChecked() {
       this.findPage();
@@ -647,7 +649,7 @@ export default {
         this.searchLeaderFun();
         this.formData.deptId = [];
         this.platform(treeId);
-        
+
       },
     platform(array) {
       if (!array.parent) {
@@ -835,7 +837,7 @@ export default {
   },
 };
 </script>
-  
+
   <style scoped>
 .el-divider--horizontal {
   margin: 4px 0;
@@ -869,4 +871,3 @@ export default {
   text-align: center;
 }
 </style>
-  

+ 178 - 231
src/views/PeopleManage/Staff/StaffManage.vue

@@ -5,32 +5,20 @@
         <!-- 左侧树Start -->
         <SplitArea :size="leftSplitWidth" :minSize="240">
           <div>
-            <div >
+            <div>
               <!-- <el-checkbox v-model="containsSubDeptChecked"
                 >包含下级机构</el-checkbox
               > -->
 
-              <kt-button
-                style="
+              <kt-button style="
                   background-color: #ffc000;
                   border: #ffc000;
-                "
-                icon="fa fa-plus"
-                label="添加人员"
-                type="primary"
-                perms="sys:backline:add"
-                @click="handleAddButton"
-              />
+                " icon="fa fa-plus" label="添加人员" type="primary" perms="sys:backline:add" @click="handleAddButton" />
             </div>
             <el-divider></el-divider>
             <!-- 左侧树形结构 -->
-            <el-tree
-              :data="ztreeNodes"
-              :props="{ children: 'children', label: 'name' }"
-              node-key="id"
-              :default-expanded-keys="['9']"
-              @node-click="onZTreeClick"
-            ></el-tree>
+            <el-tree :data="ztreeNodes" :props="{ children: 'children', label: 'name' }" node-key="id"
+              :default-expanded-keys="['9']" @node-click="onZTreeClick"></el-tree>
           </div>
         </SplitArea>
         <!-- 左侧树End -->
@@ -39,93 +27,52 @@
         <SplitArea :size="rightSplitWidth">
           <!-- 筛选区域Start -->
           <el-row class="queryFrom">
-            <el-form ref="queryFormRef" :model="pageData" label-width="80px">
+            <el-form ref="queryFormRef" :model="pageData" label-width="80px" size="small">
               <el-row>
                 <el-col :span="5">
                   <el-form-item label="工号">
-                    <el-input
-                      clearable
-                      size="small"
-                      placeholder="工号"
-                      v-model="pageData.userId"
-                    ></el-input>
+                    <el-input clearable placeholder="工号" v-model="pageData.userId"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="姓名">
-                    <el-input
-                      clearable
-                      size="small"
-                      placeholder="姓名"
-                      v-model="pageData.name"
-                    ></el-input>
+                    <el-input clearable  placeholder="姓名" v-model="pageData.name"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="手机号">
-                    <el-input
-                      clearable
-                      size="small"
-                      placeholder="手机号"
-                      v-model="pageData.mobile"
-                    ></el-input>
+                    <el-input clearable  placeholder="手机号" v-model="pageData.mobile"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="状态">
-                    <el-select
-                      style="width:200px"
-                      clearable 
-                        v-model="pageData.status"
-                        placeholder="请选择"
-                      >
-                      <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value" :key="val.id"></el-option>
+                    <el-select style="width:200px" clearable v-model="pageData.status" placeholder="请选择">
+                      <el-option v-for="val in user_statusoptions" :label="val.label" :value="val.value"
+                        :key="val.id"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="领导人">
-                    <el-select
-                    size="small" 
-                      style="width:215px"
-                      clearable 
-                        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  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>
                 </el-col>
                 <el-col :span="4">
                   <el-form-item label="">
-                    <el-button
-                      size="small"
-                      type="primary"
-                      @click="queryStaffInfo"
-                      >查询</el-button
-                    >
+                    <el-button  type="primary" @click="queryStaffInfo">查询</el-button>
                   </el-form-item>
                 </el-col>
               </el-row>
             </el-form>
           </el-row>
 
-            <kt-common-table
-              permsEdit="sys:backline:edit"
-              :data="pageResult"
-              :columns="columns"
-              editButtonName="编辑"
-              :showBatchDelete="false"
-              @findPage="findPage"
-              @handleEdit="handleTableEdit"
-            >
-            </kt-common-table>
-         
+          <kt-common-table permsEdit="sys:backline:edit" :data="pageResult" :columns="columns" editButtonName="编辑"
+            :showBatchDelete="false" @findPage="findPage" @handleEdit="handleTableEdit">
+          </kt-common-table>
+
         </SplitArea>
         <!-- 右侧列表页面End -->
       </Split>
@@ -133,18 +80,17 @@
 
 
 
-<!-- 新增修改界面 -->
-<el-dialog :title="dialogTitle" width="60%" :visible.sync="dialogVisible" :close-on-click-modal="false"
+    <!-- 新增修改界面 -->
+    <el-dialog :title="dialogTitle" width="60%" :visible.sync="dialogVisible" :close-on-click-modal="false"
       :before-close="handleDialogBefore" @close="closeDialog" v-dialogDrag>
-      <el-tabs v-model="activeName"  :before-leave="beforeTabLeave" >
+      <el-tabs v-model="activeName" :before-leave="beforeTabLeave">
         <el-tab-pane label="基本信息" name="1">
           <el-form :model="formData" :rules="formDataRules" ref="formData" :inline="true" @keyup.enter.native="nextStep()"
             label-width="110px" size="small">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="机构名称" prop="deptId">
-                  <el-cascader style="width:200px" :options="ztreeNodes" v-model="formData.deptId" clearable
-                    disabled
+                  <el-cascader style="width:200px" :options="ztreeNodes" v-model="formData.deptId" clearable disabled
                     :show-all-levels="false" :props="{
                       value: 'id',
                       label: 'name',
@@ -163,7 +109,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="身份证号" prop="identity">
                   <el-input v-model="formData.identity" :maxlength="18" @change="identityChange"></el-input>
@@ -176,14 +122,14 @@
               </el-col>
               <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>
+                  <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>
                   <!-- <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 @change="statusChange" style="width:200px" v-model="formData.status" placeholder="请选择">
@@ -194,7 +140,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="角色" prop="roleId">
-                  <el-select style="width:200px" v-model="formData.roleId" placeholder="请选择">
+                  <el-select style="width:200px" v-model="formData.roleId" placeholder="请选择" disabled>
                     <el-option v-for="val in roles" :label="val.name" :value="val.id + ''" :key="val.id"></el-option>
                   </el-select>
                 </el-form-item>
@@ -202,23 +148,15 @@
               <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-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"
-                    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 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>
@@ -229,7 +167,8 @@
               </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 value-format="yyyy-MM-dd" style="width:200px" v-model="formData.logoutTime" type="date"
+                    placeholder="选择日期">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -241,7 +180,7 @@
         </el-tab-pane>
         <el-tab-pane label="详细信息" name="2">
           <el-form :model="formDataDetail" :rules="formDataRulesDetail" ref="formDataDetail" :inline="true"
-           label-width="110px" size="small">
+            label-width="110px" size="small">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="开户账号" prop="accountno">
@@ -260,8 +199,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              </el-row>
-              <el-row>
+            </el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="出生日期" prop="birthday">
                   <el-date-picker style="width:200px" v-model="formDataDetail.birthday" type="date" placeholder="选择日期">
@@ -284,7 +223,7 @@
                 </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="请选择民族">
@@ -312,18 +251,18 @@
                 </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-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-form-item>
-               </el-col>
-             
+                <el-form-item label="居住地址" prop="address">
+                  <el-input style="width:200px" v-model="formDataDetail.address"></el-input>
+                </el-form-item>
+              </el-col>
+
               <el-col :span="8">
                 <el-form-item label="血型" prop="bloodType">
                   <el-select style="width:200px" v-model="formDataDetail.bloodType" placeholder="请选择">
@@ -335,7 +274,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-              <el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="学历" prop="education">
                   <el-select style="width:200px" v-model="formDataDetail.education" placeholder="请选择">
@@ -350,36 +289,37 @@
                 </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-form-item>
-                </el-col>
+                <el-form-item label="毕业院校" prop="school">
+                  <el-input style="width:200px" v-model="formDataDetail.school"></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="毕业时间" prop="graduationTime">
-                  <el-date-picker  style="width:200px" v-model="formDataDetail.graduationTime" type="date" placeholder="选择日期">
+                  <el-date-picker style="width:200px" v-model="formDataDetail.graduationTime" type="date"
+                    placeholder="选择日期">
                   </el-date-picker>
                 </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-form-item>
               </el-col>
               <el-col :span="8">
-                  <el-form-item label="入司时间" prop="entryTime">
-                    <el-date-picker style="width:200px" v-model="formDataDetail.entryTime" type="date" placeholder="选择日期">
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
+                <el-form-item label="入司时间" prop="entryTime">
+                  <el-date-picker style="width:200px" v-model="formDataDetail.entryTime" type="date" placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
                 <el-form-item label="代理人资格证号" prop="agentQualificationCode">
                   <el-input 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" v-model="formDataDetail.emergencyContactTel"></el-input>
@@ -387,7 +327,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="紧急联系人姓名" prop="emergencyContactName">
-                  <el-input  style="width:200px" v-model="formDataDetail.emergencyContactName"></el-input>
+                  <el-input style="width:200px" v-model="formDataDetail.emergencyContactName"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -398,9 +338,8 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="影像资料" name="3">
-          <el-form :model="formDataDetail" ref="formDataDetail" :inline="true"
-           label-width="130px" size="small">
-           <peopleImage :dataForm="dataForm" :imagesIdList="imagesIdList" :dialogVisible="dialogVisible"></peopleImage>
+          <el-form :model="formDataDetail" ref="formDataDetail" :inline="true" label-width="130px" size="small">
+            <peopleImage :dataForm="dataForm" :imagesIdList="imagesIdList" :dialogVisible="dialogVisible"></peopleImage>
           </el-form>
           <div style="text-align: right;">
             <el-button size="small" type="primary" style="background-color: #ffc000; border: 1px solid #ffc000"
@@ -422,9 +361,9 @@ import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import { validateSfz } from "../../../utils/validate.js";
 import peopleImage from '@/components/PeopleImage/index.vue' //影像组件
-import mixa from '../mixin' 
+import mixa from '../mixin'
 const mixin = new mixa({
-  treeTypeNum:null
+  treeTypeNum: null
 })
 export default {
   components: {
@@ -433,23 +372,23 @@ export default {
     KtCommonTable,
     peopleImage
   },
-  mixins: [mixin], 
+  mixins: [mixin],
   data() {
     return {
       activeName: '1',
-      isShow:true,
+      isShow: true,
       //56个民族
-      pageData:{
+      pageData: {
         pageNum: 1,
         pageSize: 20,
-        deptId:JSON.parse(localStorage.getItem('user_data')).deptId  ,
-        userId:'',
-        realName:'',
-        mobile:'',
+        deptId: JSON.parse(localStorage.getItem('user_data')).deptId,
+        userId: '',
+        realName: '',
+        mobile: '',
       },
-      formData:{},
-      formDataRules:{
-        deptId:[{ required: true, message: "请选择机构", trigger: "change" }],
+      formData: {},
+      formDataRules: {
+        deptId: [{ required: true, message: "请选择机构", trigger: "change" }],
         mobile: [
           { required: true, message: "请输入手机号", trigger: "blur" },
           { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" },
@@ -465,10 +404,10 @@ export default {
         roleId: [{ required: true, message: "请填写角色", trigger: "blur" }],
         password: [{ required: true, message: "请填写密码", trigger: "blur" }],
         identity:
-        [{ required: true, message: "请填写身份证号" },
-        { validator: validateSfz }], 
-        },
-        formDataDetail: {},
+          [{ required: true, message: "请填写身份证号" },
+          { validator: validateSfz }],
+      },
+      formDataDetail: {},
       formDataRulesDetail: { //详情信息内容校验规则
         // accountno: [{ required: true, message: "请填写开户账号", trigger: "blur" }],
         // address: [{ required: true, message: "请填写居住地址", trigger: "blur" }],
@@ -476,7 +415,7 @@ export default {
         // birthday: [{ required: true, message: "请填写出生日期", trigger: "blur" }],
         // identity:
         // [{ required: true, message: "请填写身份证号" },
-        // { validator: validateSfz }], 
+        // { validator: validateSfz }],
 
         // koseki: [{ required: true, message: "请填写户籍", trigger: "blur" }],
         // maritalStatus: [{ required: true, message: "请选择婚姻状况", trigger: "change" }],
@@ -503,7 +442,7 @@ export default {
         },
 
         { prop: "deptName", label: "部门名称", minWidth: 80, sortable: false },
-      
+
         { prop: "userId", label: "工号", minWidth: 80, sortable: false },
         { prop: "name", label: "姓名", minWidth: 120, sortable: false },
         {
@@ -513,12 +452,17 @@ export default {
           sortable: false,
         },
         { prop: "mobile", label: "联系电话", minWidth: 100, sortable: false },
-          {
+        {
           prop: "roleId",
           label: "角色",
           minWidth: 80,
           sortable: false,
         },
+        {
+          prop: "positionName",
+          label: "岗位",
+          minWidth: 120,
+        },
         {
           prop: "status",
           label: "状态",
@@ -541,10 +485,10 @@ export default {
         DX_00: "",
       },
       //影像上传列表
-      imagesIdList:[],
-      dialogPassword:false, //密码是否显示明文
-      leaderOptions:[],
-      searchLeaderOptions:{}
+      imagesIdList: [],
+      dialogPassword: false, //密码是否显示明文
+      leaderOptions: [],
+      searchLeaderOptions: {}
     };
   },
   created() {
@@ -568,68 +512,68 @@ export default {
     },
   },
   methods: {
-    searchLeaderFun(){
+    searchLeaderFun() {
       this.$api.user
-          .findBackListByDeptId({ deptId: this.deptId })
-          .then((res) => {
-            this.searchLeaderOptions = res.data;
-          });
+        .findBackListByDeptId({ deptId: this.deptId })
+        .then((res) => {
+          this.searchLeaderOptions = res.data;
+        });
     },
     //获取角色数据
-    getFindRoleByUserId(){
-      this.$api.role.findRoleByUserId().then(res=>{
+    getFindRoleByUserId() {
+      this.$api.role.findRoleByUserId().then(res => {
         this.roles = res.data
       })
     },
     //状态改变时
-    statusChange(e){
-      if(e==0){
-        this.$set( this.formDataRules,'logoutTime',[
-        {required: true, message: '请选择日期', trigger: 'change' }
-          ])
-      }else{
+    statusChange(e) {
+      if (e == 0) {
+        this.$set(this.formDataRules, 'logoutTime', [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ])
+      } else {
         this.formDataRules.logoutTime = undefined
       }
     },
-    isShowFun(){
-      this.isShow=!this.isShow
+    isShowFun() {
+      this.isShow = !this.isShow
     },
-    identityChange(iden){
+    identityChange(iden) {
       let sex = null;
       let birth = null;
       let myDate = new Date();
       let month = myDate.getMonth() + 1;
       let day = myDate.getDate();
-        sex = iden.substring(16,17);
-        birth = iden.substring(6,10)+"-"+iden.substring(10,12)+"-"+iden.substring(12,14);
-        let age = 0;
-        if (iden.substring(10, 12) < month || iden.substring(10, 12) == month && iden.substring(12, 14) <= day) age++;
-      if(sex%2 === 0)
+      sex = iden.substring(16, 17);
+      birth = iden.substring(6, 10) + "-" + iden.substring(10, 12) + "-" + iden.substring(12, 14);
+      let age = 0;
+      if (iden.substring(10, 12) < month || iden.substring(10, 12) == month && iden.substring(12, 14) <= day) age++;
+      if (sex % 2 === 0)
         sex = '女';
       else
         sex = '男';
-        this.formDataDetail.birthday=birth
-        this.formDataDetail.sex=this.sexoptions.find(val=>sex==val.label).value
+      this.formDataDetail.birthday = birth
+      this.formDataDetail.sex = this.sexoptions.find(val => sex == val.label).value
     },
     // 查询Start
     queryStaffInfo() {
       this.findPage();
     },
-    sexFormatter(row){
+    sexFormatter(row) {
       // return this.sexoptions[row.sex]
       // return row.sex+'1'
-// console.log(val,1)
+      // console.log(val,1)
     },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;
-       this.deptId  = this.currentTreeNode.id;
-      this.pageData.pageNum =1;
+      this.deptId = this.currentTreeNode.id;
+      this.pageData.pageNum = 1;
       this.findPage();
       this.searchLeaderFun()
       // this.formData.deptId = [];
       // this.platform(treeId);
-      
+
     },
     //联级选择器触发事件
     handleChange(val) {
@@ -643,13 +587,13 @@ export default {
           });
       }
     },
-  
-       // 下一步
-       nextStep() {
+
+    // 下一步
+    nextStep() {
       this.$refs.formData.validate((valid) => {
         if (valid) {
           this.activeName = '2'
-          // this.formData.deptIdCom= this.formData.deptId 
+          // this.formData.deptIdCom= this.formData.deptId
           // this.formData.deptId =  this.formData.deptId.at(-1);
           // if (this.formData.referrerId) {
           //   this.formData.referrerName = this.recommenderOptions.find(val => this.formData.referrerId == val.id).name
@@ -667,7 +611,7 @@ export default {
           // });
         }
       });
-  },
+    },
     // 右侧列表的方法Start
     findPage(data) {
       // 获取分页数据
@@ -675,31 +619,31 @@ export default {
         this.pageData.pageNum = data.pageRequest.pageNum;
         this.pageData.pageSize = data.pageRequest.pageSize;
       }
-       let dto={
-        deptId:this.deptId,
-        mobile:this.pageData.mobile,
-        name:this.pageData.name,
-        userId:this.pageData.userId,
-        status:this.pageData.status,
-        agentFlag:0,
-        leaderName:this.pageData.leaderId,
-        roleId:'22',
+      let dto = {
+        deptId: this.deptId,
+        mobile: this.pageData.mobile,
+        name: this.pageData.name,
+        userId: this.pageData.userId,
+        status: this.pageData.status,
+        agentFlag: 0,
+        leaderName: this.pageData.leaderId,
+        roleId: '22',
       }
       // .findUserList({
       //     ...this.pageData,
       //     dto: { ...data, roleId: "20", deptId: this.deptId,agentFlag: "2", },
       //   })
       this.$api.user
-        .findBackUserList({dto,pageNum:this.pageData.pageNum,pageSize:this.pageData.pageSize})
+        .findBackUserList({ dto, pageNum: this.pageData.pageNum, pageSize: this.pageData.pageSize })
         .then((res) => {
-          res.data.records.forEach(val=>{
-            if(val.sex&& val.sex!==''&& val.sex!==null){
-              val.sex=this.sexoptions.find(ele=>ele.value==val.sex).label
+          res.data.records.forEach(val => {
+            if (val.sex && val.sex !== '' && val.sex !== null) {
+              val.sex = this.sexoptions.find(ele => ele.value == val.sex).label
             }
-            if(val.status&& val.status!==''&& val.status!==null){
-              val.status=this.user_statusoptions.find(ele=>ele.value==val.status).label
+            if (val.status && val.status !== '' && val.status !== null) {
+              val.status = this.user_statusoptions.find(ele => ele.value == val.status).label
             }
-            val.roleId=val.roleName
+            val.roleId = val.roleName
           })
           this.pageResult = {
             content: res.data.records,
@@ -709,16 +653,16 @@ export default {
             totalSize: res.data.total,
           };
         })
-       
+
     },
-    beforeTabLeave(){
+    beforeTabLeave() {
       // let p = new Promise((resolve, reject) => {
       //   this.$refs.formData.validate(async (valid) => {
       //     valid ? resolve() : reject();
       //     if (valid !== resolve()) {
       //       // this.$message.error("请完善基本信息!");
       //     }
-        
+
       //   });
       // });
       // return p;
@@ -738,30 +682,30 @@ export default {
       let res = await this.$api.user.getUserDatail(params.row.userId)
       if (res.code == 200) {
         this.$api.user
-          .findListByDeptId({ deptId: res.data.sysUser.deptId,id:params.row.userId })
+          .findListByDeptId({ deptId: res.data.sysUser.deptId, id: params.row.userId })
           .then((res) => {
             this.leaderOptions = res.data;
           });
         res.data.sysUser.status += ''
         this.formData = res.data.sysUser
-        if(this.formData.status==0){
-          this.$set( this.formDataRules,'logoutTime',[
-            {  required: true, message: '请选择日期', trigger: 'change' }
+        if (this.formData.status == 0) {
+          this.$set(this.formDataRules, 'logoutTime', [
+            { required: true, message: '请选择日期', trigger: 'change' }
           ])
-        }else{
+        } else {
           this.formDataRules.logoutTime = undefined
         }
-        if(res.data.esmUserImageVo.length > 0) {
-          this.imagesIdList = res.data.esmUserImageVo.map(item=>{
+        if (res.data.esmUserImageVo.length > 0) {
+          this.imagesIdList = res.data.esmUserImageVo.map(item => {
             item.path = process.env.BASE_URL + item.path
-            this.dataForm[item.type]=item.path
+            this.dataForm[item.type] = item.path
             return {
-              imageId:item.imageId,
-              type:item.type
+              imageId: item.imageId,
+              type: item.type
             }
           })
         }
-        this.formDataDetail = res.data.sysUserInfo?res.data.sysUserInfo:{}
+        this.formDataDetail = res.data.sysUserInfo ? res.data.sysUserInfo : {}
         // this.formData.password = ''
         this.dialogTitle = "编辑后线人员";
         this.dialogVisible = true;
@@ -785,9 +729,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    
+
     //添加人员
     handleAddButton() {
       // console.log(this.currentTreeNode.managementSource)
@@ -796,15 +740,15 @@ export default {
       //   return;
       // }
       this.$api.user
-      .findListByDeptId({ deptId: this.formData.deptId })
-      .then((res) => {
-        this.leaderOptions = res.data;
-      });
+        .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!=null){ //团队代理人managementSource为2  渠道为1  后线为空
+      if (this.currentTreeNode.comlevel != null || this.currentTreeNode.managementSource != null) { //团队代理人managementSource为2  渠道为1  后线为空
         this.$message.info("请选择第六级机构");
         return;
       }
@@ -838,7 +782,7 @@ export default {
         .then((_) => {
           done();
         })
-        .catch((_) => {});
+        .catch((_) => { });
     },
     closeDialog() {
       // 清空数据
@@ -872,14 +816,14 @@ export default {
               //   });
               //   return false
               // }
-              if(this.formData.positionId){
-                this.formData.positionName=this.postOption.find(val=>val.postId==this.formData.positionId).postName
+              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.id==this.formData.leaderId).name
+              if (this.formData.leaderId) {
+                this.formData.leaderName = this.leaderOptions.find(val => val.id == this.formData.leaderId).name
               }
               if (this.dialogTitle == '新增后线人员') {
-                this.$api.user.saveUserInfo({esmUserImageVo:this.imagesIdList, sysUser: this.formData, sysUserInfo: this.formDataDetail }).then((res) => {
+                this.$api.user.saveUserInfo({ esmUserImageVo: this.imagesIdList, sysUser: this.formData, sysUserInfo: this.formDataDetail }).then((res) => {
                   if (res.code == 200) {
                     this.$message({
                       message: "保存成功",
@@ -897,8 +841,8 @@ export default {
                   }
                 });
               }
-              else{
-                this.$api.user.updateUserInfo(this.formData.id,{ esmUserImageVo:this.imagesIdList,sysUser: this.formData, sysUserInfo: this.formDataDetail }).then((res) => {
+              else {
+                this.$api.user.updateUserInfo(this.formData.id, { esmUserImageVo: this.imagesIdList, sysUser: this.formData, sysUserInfo: this.formDataDetail }).then((res) => {
                   if (res.code == 200) {
                     this.$message({
                       message: "编辑成功",
@@ -942,19 +886,22 @@ export default {
 .queryFrom .queryButton .el-form-item__content {
   margin-left: 0px !important;
 }
-.disc{
-  -webkit-text-security:disc;
+
+.disc {
+  -webkit-text-security: disc;
   position: relative;
 }
-.none{
-  -webkit-text-security:none;
+
+.none {
+  -webkit-text-security: none;
   position: relative;
 }
-.icon{
+
+.icon {
   color: #ccc;
   position: absolute;
   right: 0;
-  top:10px;
+  top: 10px;
   text-align: center
 }
 </style>

+ 1 - 0
src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -72,6 +72,7 @@
                   <el-form-item label="状态">
                     <el-select
                       style="width: 200px"
+                      size="small"
                       clearable
                       v-model="pageData.status"
                       placeholder="请选择"