Explorar o código

人员管理模块的页面及数据梳理

lihongxiao %!s(int64=2) %!d(string=hai) anos
pai
achega
4bec917004

+ 12 - 200
src/views/PeopleManage/Agent/AgentExamine.vue

@@ -275,61 +275,30 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="婚姻状况" prop="maritalStatus">
-                  <el-select
-                    disabled
-                    v-model="formDataDetail.maritalStatus"
-                    placeholder="请选择婚姻状况"
-                    style="width: 200px"
-                  >
-                    <el-option label="未婚" value="未婚"></el-option>
-                    <el-option label="已婚" value="已婚"></el-option>
-                    <el-option label="离异" value="离异"></el-option>
-                    <el-option label="再婚" value="再婚"></el-option>
+                  <el-select disabled 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-col :span="8">
                 <el-form-item label="民族" prop="nations">
-                  <el-select
-                    disabled
-                    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 disabled 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
-                    disabled
-                    style="width: 200px"
-                    v-model="formDataDetail.politicsStatus"
-                    placeholder="请选择"
-                  >
-                    <el-option label="群众" value="群众"></el-option>
-                    <el-option label="共青团员" value="共青团员"></el-option>
-                    <el-option label="中共党员" value="中共党员"></el-option>
+                  <el-select disabled 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
-                    disabled
-                    style="width: 200px"
-                    v-model="formDataDetail.health"
-                    placeholder="请选择"
-                  >
-                    <el-option label="健康" value="健康"></el-option>
-                    <el-option label="亚健康" value="亚健康"></el-option>
-                    <el-option label="疾病" value="疾病"></el-option>
+                  <el-select disabled 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>
@@ -358,10 +327,7 @@
                     v-model="formDataDetail.bloodType"
                     placeholder="请选择"
                   >
-                    <el-option label="A型" value="A型"></el-option>
-                    <el-option label="B型" value="B型"></el-option>
-                    <el-option label="O型" value="O型"></el-option>
-                    <el-option label="AB型" value="AB型"></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>
@@ -517,6 +483,7 @@
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
+import mixin from '../mixin' 
 
 export default {
   components: {
@@ -524,68 +491,10 @@ export default {
     KtCommonTable,
     peopleImage,
   },
+  mixins: [mixin], 
   data() {
     return {
       activeName: "1",
-      //56个民族
-      nationalList: [
-        "汉族",
-        "壮族",
-        "满族",
-        "回族",
-        "苗族",
-        "维吾尔族",
-        "土家族",
-        "彝族",
-        "蒙古族",
-        "藏族",
-        "布依族",
-        "侗族",
-        "瑶族",
-        "朝鲜族",
-        "白族",
-        "哈尼族",
-        "哈萨克族",
-        "黎族",
-        "傣族",
-        "畲族",
-        "傈僳族",
-        "仡佬族",
-        "东乡族",
-        "高山族",
-        "拉祜族",
-        "水族",
-        "佤族",
-        "纳西族",
-        "羌族",
-        "土族",
-        "仫佬族",
-        "锡伯族",
-        "柯尔克孜族",
-        "达斡尔族",
-        "景颇族",
-        "毛南族",
-        "撒拉族",
-        "布朗族",
-        "塔吉克族",
-        "阿昌族",
-        "普米族",
-        "鄂温克族",
-        "怒族",
-        "京族",
-        "基诺族",
-        "德昂族",
-        "保安族",
-        "俄罗斯族",
-        "裕固族",
-        "乌兹别克族",
-        "门巴族",
-        "鄂伦春族",
-        "独龙族",
-        "塔塔尔族",
-        "赫哲族",
-        "珞巴族",
-      ],
       pageData: {
         pageNum: 1,
         pageSize: 20,
@@ -595,7 +504,6 @@ export default {
         mobile: "",
       },
       formData: {},
-      roles: [],
       formDataRules: {
         remark: [
           { required: true, message: "请填写驳回原因", trigger: "blur" },
@@ -605,27 +513,6 @@ export default {
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      ztreeNodes: [],
-      currentTreeNode: null,
-      //----ztreeLeft end---------
       recommenderList: [],
       teamleadername: "",
       teamleaderid: "",
@@ -670,10 +557,6 @@ export default {
       dialogVisible: false, // 新增编辑界面是否显示
       departmentList: [], // 选中公司的所有部门的集合
       deptInfo: {}, //选中机构的基本信息
-      sexoptions: JSON.parse(localStorage.getItem("sexOptions")),
-      user_statusoptions: JSON.parse(
-        localStorage.getItem("user_statusoptions")
-      ),
       option: [], //机构列表
       //影像资料
       dataForm: {
@@ -686,25 +569,9 @@ export default {
       },
       //影像上传列表
       imagesIdList:[],
-      postOption:[]
-
     };
   },
   created() {
-    this.$api.role.findAll().then((res) => {
-      this.roles = res.data;
-    });
-    this.$api.role.postViewAll().then((res) => {
-      res.data.forEach(ele=>{
-        ele.postId=ele.postId+''
-      })
-      this.postOption = res.data
-    })
-    this.findLeftTreeData(); // 获取机构树的数据
-  },
-  mounted() {
-    //用像素初始化左边的split的宽度
-    this.changeTreeWidth(240); // 初始化树的宽度
   },
   methods: {
     handleDialogBefore(done) {
@@ -723,33 +590,6 @@ export default {
       this.pageData.userId = this.queryFrom.userId;
       this.findPage();
     },
-    changeTreeWidth(widthVal) {
-      // 初始化树的宽度
-      this.leftSplitWidth = Math.ceil(
-        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
-      );
-      this.rightSplitWidth = 100 - this.leftSplitWidth;
-    },
-    findLeftTreeData: function () {
-      this.$api.dept.findDeptTree().then((res) => {
-        this.treeDataRecursion(res.data, 2);
-        this.ztreeNodes = res.data;
-      });
-    },
-     //树过滤五级机构递归
-     treeDataRecursion(data, num, one) {
-      data = data || this.ztreeNodes;
-      one = one || 0;
-      one++;
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].comlevel == 5 && data[i].managementSource != num) {
-          data.splice(i, 1);
-          i = i - 1;
-        } else {
-          this.treeDataRecursion(data[i].children, num, one);
-        }
-      }
-    },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;
@@ -812,39 +652,11 @@ export default {
       }
       this.dialogVisible = false;
     },
-    // 新增或修改的弹出框Start
-    getDictItems(typeName) {
-      //--数据字典--
-      this.$api.dict
-        .findByLableName(typeName)
-        .then((response) => {
-          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
-        })
-        .catch((error) => {
-          this[typeName + "options"] = [];
-        });
-    },
     // 下一步
     nextStep(num) {
       this.$refs.formData.validate((valid) => {
         if (valid) {
           this.activeName = num;
-          // 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
-          // }
-          // this.$api.user.saveOrUpdate(this.formData).then((res) => {
-          //   if (res.code == 200) {
-          //   this.activeName='2'
-          //   this.basicInformation=res.data
-          //   } else {
-          //     this.$message({
-          //       message: `操作失败,请重新添加,(${res.msg})`,
-          //       type: "error",
-          //     });
-          //   }
-          // });
         }
       });
     },

+ 14 - 209
src/views/PeopleManage/Agent/AgentManage.vue

@@ -60,7 +60,7 @@
       @close="closeDialog"
       v-dialogDrag
     >
-      <el-tabs v-model="activeName" :before-leave="beforeTabLeave">
+      <el-tabs v-model="activeName" >
         <el-tab-pane label="基本信息" name="1">
           <el-form
             :model="formData"
@@ -262,57 +262,30 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="婚姻状况" prop="maritalStatus">
-                  <el-select
-                    v-model="formDataDetail.maritalStatus"
-                    placeholder="请选择婚姻状况"
-                    style="width: 200px"
-                  >
-                    <el-option label="未婚" value="未婚"></el-option>
-                    <el-option label="已婚" value="已婚"></el-option>
-                    <el-option label="离异" value="离异"></el-option>
-                    <el-option label="再婚" 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-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 label="群众" value="群众"></el-option>
-                    <el-option label="共青团员" value="共青团员"></el-option>
-                    <el-option label="中共党员" 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 label="健康" value="健康"></el-option>
-                    <el-option label="亚健康" value="亚健康"></el-option>
-                    <el-option label="疾病" 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>
@@ -334,10 +307,7 @@
                     v-model="formDataDetail.bloodType"
                     placeholder="请选择"
                   >
-                    <el-option label="A型" value="A型"></el-option>
-                    <el-option label="B型" value="B型"></el-option>
-                    <el-option label="O型" value="O型"></el-option>
-                    <el-option label="AB型" value="AB型"></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>
@@ -469,6 +439,8 @@ 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 mixin from '../mixin' 
+
 export default {
   components: {
     KtButton,
@@ -476,69 +448,11 @@ export default {
     templateTable,
     peopleImage,
   },
+  mixins: [mixin], 
   data() {
     return {
       activeName: "1",
       isShow: true,
-      //56个民族
-      nationalList: [
-        "汉族",
-        "壮族",
-        "满族",
-        "回族",
-        "苗族",
-        "维吾尔族",
-        "土家族",
-        "彝族",
-        "蒙古族",
-        "藏族",
-        "布依族",
-        "侗族",
-        "瑶族",
-        "朝鲜族",
-        "白族",
-        "哈尼族",
-        "哈萨克族",
-        "黎族",
-        "傣族",
-        "畲族",
-        "傈僳族",
-        "仡佬族",
-        "东乡族",
-        "高山族",
-        "拉祜族",
-        "水族",
-        "佤族",
-        "纳西族",
-        "羌族",
-        "土族",
-        "仫佬族",
-        "锡伯族",
-        "柯尔克孜族",
-        "达斡尔族",
-        "景颇族",
-        "毛南族",
-        "撒拉族",
-        "布朗族",
-        "塔吉克族",
-        "阿昌族",
-        "普米族",
-        "鄂温克族",
-        "怒族",
-        "京族",
-        "基诺族",
-        "德昂族",
-        "保安族",
-        "俄罗斯族",
-        "裕固族",
-        "乌兹别克族",
-        "门巴族",
-        "鄂伦春族",
-        "独龙族",
-        "塔塔尔族",
-        "赫哲族",
-        "珞巴族",
-      ],
       //影像资料
       dataForm: {
         SFZ_01: "",
@@ -635,16 +549,6 @@ export default {
       },
       formDataDetail: {},
       formDataRulesDetail: {
-        // accountno: [{ required: true, message: "请填写开户账号", trigger: "blur" }],
-        // address: [{ required: true, message: "请填写居住地址", trigger: "blur" }],
-        // bankName: [{ required: true, message: "请填写开户行", trigger: "blur" }],
-        // birthday: [{ required: true, message: "请填写出生日期", trigger: "blur" }],
-        // identity:
-        // [{ required: true, message: "请填写身份证号" },
-        // { validator: validateSfz }],
-        // koseki: [{ required: true, message: "请填写户籍", trigger: "blur" }],
-        // maritalStatus: [{ required: true, message: "请选择婚姻状况", trigger: "change" }],
-        // nations: [{ required: true, message: "请选择民族", trigger: "change" }],
       },
       formDataRules: {
         deptId: [{ required: true, message: "请选择机构", trigger: "change" }],
@@ -673,74 +577,25 @@ export default {
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      ztreeNodes: [],
-      currentTreeNode: null,
-      // 右侧列表查询数据Start
       queryFrom: {},
       pageResult: [],
-      containsSubDeptChecked: true, //是否包含下级机构
       dialogTitle: "",
       dialogVisible: false, // 新增编辑界面是否显示
       departmentList: [], // 选中公司的所有部门的集合
       deptInfo: {}, //选中机构的基本信息
-      sexoptions: JSON.parse(localStorage.getItem("sexOptions")),
-      user_statusoptions: JSON.parse(
-        localStorage.getItem("user_statusoptions")
-      ),
-      roles: JSON.parse(localStorage.getItem("find_all")),
       option: [], //机构列表
       dialogPassword: true, //密码是否显示明文
-      postOption:[]
     };
   },
   created() {
-    this.$api.role.postViewAll().then((res) => {
-      res.data.forEach(ele=>{
-        ele.postId=ele.postId+''
-      })
-      this.postOption = res.data
-    })
     // this.$api.role.findAll().then((res) => {
     //   this.roles = res.data
     // })
     //获取所有下拉框数据(字典)
     // this.getDictItems("sex");
     // this.getDictItems("user_status");
-    this.findLeftTreeData(); // 获取机构树的数据
     this.findPage();
   },
-  mounted() {
-    //用像素初始化左边的split的宽度
-    this.changeTreeWidth(240); // 初始化树的宽度
-  },
-  watch: {
-    containsSubDeptChecked() {
-      // 监听是否包含下级
-      // this.pageData.containsSubDept.value = this
-      //   .containsSubDeptChecked
-      //   ? "1"
-      //   : "0";
-      this.findPage();
-    },
-  },
   methods: {
     //状态改变时
     statusChange(e) {
@@ -788,33 +643,6 @@ export default {
       // console.log(val,1)
       // console.log(val,1)
     },
-    changeTreeWidth(widthVal) {
-      // 初始化树的宽度
-      this.leftSplitWidth = Math.ceil(
-        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
-      );
-      this.rightSplitWidth = 100 - this.leftSplitWidth;
-    },
-    findLeftTreeData() {
-      this.$api.dept.findDeptTree().then((res) => {
-        this.treeDataRecursion(res.data, 2);
-        this.ztreeNodes = res.data;
-      });
-    },
-    //树过滤五级机构递归
-    treeDataRecursion(data, num, one) {
-      data = data || this.ztreeNodes;
-      one = one || 0;
-      one++;
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].comlevel == 5 && data[i].managementSource != num) {
-          data.splice(i, 1);
-          i = i - 1;
-        } else {
-          this.treeDataRecursion(data[i].children, num, one);
-        }
-      }
-    },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;
@@ -971,18 +799,6 @@ export default {
       this.dialogTitle = "新增代理人";
       this.dialogVisible = true;
     },
-    // 新增或修改的弹出框Start
-    getDictItems(typeName) {
-      //--数据字典--
-      this.$api.dict
-        .findByLableName(typeName)
-        .then((response) => {
-          this[typeName + "options"] = response.data; // 把获取到的数据赋给this.data
-        })
-        .catch((error) => {
-          this[typeName + "options"] = [];
-        });
-    },
     handleDialogBefore(done) {
       // 退出对话框之前确认提示
       this.$confirm("确认关闭?")
@@ -1070,17 +886,6 @@ export default {
         }
       });
     },
-    beforeTabLeave() {
-      // let p = new Promise((resolve, reject) => {
-      //   this.$refs.formData.validate(async (valid) => {
-      //     valid ? resolve() : reject();
-      //     if (valid !== resolve()) {
-      //       // this.$message.error("请完善基本信息!");
-      //     }
-      //   });
-      // });
-      // return p;
-    },
     // 下一步
     nextStep() {
       this.$refs.formData.validate((valid) => {

+ 0 - 57
src/views/PeopleManage/Player/PlayerManage.vue

@@ -315,81 +315,24 @@ export default {
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      ztreeNodes: [],
-      currentTreeNode: null,
       queryFrom: {}, // 右侧列表查询数据Start
       pageResult: [],
       containsSubDeptChecked: true, //是否包含下级机构
       dialogTitle: "", //弹框title
       dialogVisible: false, // 新增编辑界面是否显示
-      user_statusoptions: JSON.parse(
-        localStorage.getItem("user_statusoptions")
-      ),
-      roles: JSON.parse(localStorage.getItem("find_all")),
       option: [], //机构列表
       dialogPassword: true, //密码是否显示明文
     };
   },
   created() {
-    this.findLeftTreeData(); // 获取机构树的数据
     this.findPage();
   },
-  mounted() {
-    //用像素初始化左边的split的宽度
-    this.changeTreeWidth(240); // 初始化树的宽度
-  },
   watch: {
     containsSubDeptChecked() {
       this.findPage();
     },
   },
   methods: {
-    // 初始化树的宽度
-    changeTreeWidth(widthVal) {
-      this.leftSplitWidth = Math.ceil(
-        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
-      );
-      this.rightSplitWidth = 100 - this.leftSplitWidth;
-    },
-    // 获取机构树的数据
-    findLeftTreeData() {
-      this.$api.dept.findDeptTree().then((res) => {
-        this.treeDataRecursion(res.data, 1);
-        this.ztreeNodes = res.data;
-      });
-    },
-    //树过滤五级机构递归
-    treeDataRecursion(data, num, one) {
-      data = data || this.ztreeNodes;
-      one = one || 0;
-      one++;
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].comlevel == 5 && data[i].managementSource != num) {
-          data.splice(i, 1);
-          i = i - 1;
-        }  else {
-          this.treeDataRecursion(data[i].children, num, one);
-        }
-      }
-    },
     // 点击事件
     onZTreeClick(evt, treeId, treeNode) {
       this.currentTreeNode = evt;

+ 9 - 55
src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -245,57 +245,30 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="婚姻状况" prop="maritalStatus">
-                  <el-select
-                    v-model="formDataDetail.maritalStatus"
-                    placeholder="请选择婚姻状况"
-                    style="width: 200px"
-                  >
-                    <el-option label="未婚" value="未婚"></el-option>
-                    <el-option label="已婚" value="已婚"></el-option>
-                    <el-option label="离异" value="离异"></el-option>
-                    <el-option label="再婚" 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-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 label="群众" value="群众"></el-option>
-                    <el-option label="共青团员" value="共青团员"></el-option>
-                    <el-option label="中共党员" 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 label="健康" value="健康"></el-option>
-                    <el-option label="亚健康" value="亚健康"></el-option>
-                    <el-option label="疾病" 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>
@@ -542,25 +515,6 @@ export default {
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      currentTreeNode: null,
       queryFrom: {}, // 右侧列表查询数据Start
       pageResult: [],
       containsSubDeptChecked: true, //是否包含下级机构

+ 5 - 77
src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -202,10 +202,7 @@
               <el-col :span="8">
                 <el-form-item label="婚姻状况" prop="maritalStatus">
                   <el-select disabled v-model="formDataDetail.maritalStatus" placeholder="请选择婚姻状况" style="width:200px">
-                    <el-option label="未婚" value="未婚"></el-option>
-                    <el-option label="已婚" value="已婚"></el-option>
-                    <el-option label="离异" value="离异"></el-option>
-                    <el-option label="再婚" value="再婚"></el-option>
+                    <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>
@@ -220,18 +217,14 @@
               <el-col :span="8">
                 <el-form-item label="政治面貌" prop="politicsStatus">
                   <el-select disabled style="width:200px" v-model="formDataDetail.politicsStatus" placeholder="请选择">
-                    <el-option label="群众" value="群众"></el-option>
-                    <el-option label="共青团员" value="共青团员"></el-option>
-                    <el-option label="中共党员" value="中共党员"></el-option>
+                    <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 disabled style="width:200px" v-model="formDataDetail.health" placeholder="请选择">
-                    <el-option label="健康" value="健康"></el-option>
-                    <el-option label="亚健康" value="亚健康"></el-option>
-                    <el-option label="疾病" value="疾病"></el-option>
+                    <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>
@@ -249,23 +242,14 @@
               <el-col :span="8">
                 <el-form-item label="血型" prop="bloodType">
                   <el-select disabled style="width:200px" v-model="formDataDetail.bloodType" placeholder="请选择">
-                    <el-option label="A型" value="A型"></el-option>
-                    <el-option label="B型" value="B型"></el-option>
-                    <el-option label="O型" value="O型"></el-option>
-                    <el-option label="AB型" value="AB型"></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-col :span="8">
                 <el-form-item label="学历" prop="education">
                   <el-select disabled style="width:200px" v-model="formDataDetail.education" placeholder="请选择">
-                    <el-option label="小学" value="小学"></el-option>
-                    <el-option label="初中" value="初中"></el-option>
-                    <el-option label="高中" value="高中"></el-option>
-                    <el-option label="专科" value="专科"></el-option>
-                    <el-option label="本科" value="本科"></el-option>
-                    <el-option label="硕士" value="硕士"></el-option>
-                    <el-option label="博士" 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>
@@ -386,27 +370,6 @@ export default {
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      ztreeNodes: [],
-      currentTreeNode: null,
-      //----ztreeLeft end---------
       recommenderList: [],
       teamleadername: "",
       teamleaderid: "",
@@ -451,7 +414,6 @@ export default {
       dialogVisible: false, // 新增编辑界面是否显示
       departmentList: [], // 选中公司的所有部门的集合
       deptInfo: {}, //选中机构的基本信息
-      user_statusoptions: JSON.parse(localStorage.getItem('user_statusoptions')) ,
       option: [], //机构列表
     };
   },
@@ -459,13 +421,6 @@ export default {
     this.$api.role.findAll().then((res) => {
       this.roles = res.data
     })
-  
-    this.findLeftTreeData(); // 获取机构树的数据
-
-  },
-  mounted() {
-    //用像素初始化左边的split的宽度
-    this.changeTreeWidth(240); // 初始化树的宽度
   },
   methods: {
     handleDialogBefore(done) {
@@ -484,33 +439,6 @@ export default {
         this.pageData.userId = this.queryFrom.userId;
       this.findPage();
     },
-    changeTreeWidth(widthVal) {
-      // 初始化树的宽度
-      this.leftSplitWidth = Math.ceil(
-        (widthVal / this.$refs.elMain.$el.clientWidth) * 100
-      );
-      this.rightSplitWidth = 100 - this.leftSplitWidth;
-    },
-    findLeftTreeData: function () {
-      this.$api.dept.findDeptTree().then((res) => {
-        this.treeDataRecursion(res.data, 2);
-        this.ztreeNodes = res.data;
-      });
-    },
-     //树过滤五级机构递归
-     treeDataRecursion(data, num, one) {
-      data = data || this.ztreeNodes;
-      one = one || 0;
-      one++;
-      for (let i = 0; i < data.length; i++) {
-        if (data[i].comlevel == 5 && data[i].managementSource != num) {
-          data.splice(i, 1);
-          i = i - 1;
-        } else {
-          this.treeDataRecursion(data[i].children, num, one);
-        }
-      }
-    },
     onZTreeClick: function (evt, treeId, treeNode) {
       // 点击事件
       this.currentTreeNode = evt;

+ 11 - 96
src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -306,57 +306,30 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="婚姻状况" prop="maritalStatus">
-                  <el-select
-                    v-model="formDataDetail.maritalStatus"
-                    placeholder="请选择婚姻状况"
-                    style="width: 200px"
-                  >
-                    <el-option label="未婚" value="未婚"></el-option>
-                    <el-option label="已婚" value="已婚"></el-option>
-                    <el-option label="离异" value="离异"></el-option>
-                    <el-option label="再婚" 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-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 label="群众" value="群众"></el-option>
-                    <el-option label="共青团员" value="共青团员"></el-option>
-                    <el-option label="中共党员" 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 label="健康" value="健康"></el-option>
-                    <el-option label="亚健康" value="亚健康"></el-option>
-                    <el-option label="疾病" 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>
@@ -378,10 +351,7 @@
                     v-model="formDataDetail.bloodType"
                     placeholder="请选择"
                   >
-                    <el-option label="A型" value="A型"></el-option>
-                    <el-option label="B型" value="B型"></el-option>
-                    <el-option label="O型" value="O型"></el-option>
-                    <el-option label="AB型" value="AB型"></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>
@@ -392,13 +362,7 @@
                     v-model="formDataDetail.education"
                     placeholder="请选择"
                   >
-                    <el-option label="小学" value="小学"></el-option>
-                    <el-option label="初中" value="初中"></el-option>
-                    <el-option label="高中" value="高中"></el-option>
-                    <el-option label="专科" value="专科"></el-option>
-                    <el-option label="本科" value="本科"></el-option>
-                    <el-option label="硕士" value="硕士"></el-option>
-                    <el-option label="博士" 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>
@@ -536,48 +500,16 @@ export default {
       },
       formDataDetail: {},
       formDataRulesDetail: {
-        // accountno: [{ required: true, message: "请填写开户账号", trigger: "blur" }],
-        // address: [{ required: true, message: "请填写居住地址", trigger: "blur" }],
-        // bankName: [{ required: true, message: "请填写开户行", trigger: "blur" }],
-        // birthday: [{ required: true, message: "请填写出生日期", trigger: "blur" }],
-        // identity:
-        // [{ required: true, message: "请填写身份证号" },
-        // { validator: validateSfz }],
-        // koseki: [{ required: true, message: "请填写户籍", trigger: "blur" }],
-        // maritalStatus: [{ required: true, message: "请选择婚姻状况", trigger: "change" }],
-        // nations: [{ required: true, message: "请选择民族", trigger: "change" }],
       },
       filterObject: {},
       peopleid: "",
       peopledeptid: "",
-      /**Split 开始 */
-      leftSplitWidth: 20,
-      rightSplitWidth: 80,
-      ztreeObj: null,
-      ztreeSetting: {
-        check: {
-          enable: false,
-        },
-        data: {
-          simpleData: {
-            enable: true,
-            pIdKey: "parentId",
-          },
-        },
-        view: {
-          showIcon: false,
-        },
-      },
-      ztreeNodes: [],
-      currentTreeNode: null,
-      //----ztreeLeft end---------
       recommenderList: [],
       teamleadername: "",
       teamleaderid: "",
       // 右侧列表查询数据Start
       queryFrom: {},
       pageResult: {},
-      containsSubDeptChecked: true, //是否包含下级机构
       columns: [
         // 数据列
         { prop: "deptId", label: "部门编码", minWidth: 80, sortable: false },
@@ -618,26 +550,9 @@ export default {
       deptInfo: {}, //选中机构的基本信息
        option: [], //机构列表
       dialogPassword: false, //密码是否明文
-      postOption:[]
     };
   },
   created() {
-    // this.$api.role.findAll().then((res) => {
-    //   this.roles = res.data
-    // })
-    //获取所有下拉框数据(字典)
-    // this.getDictItems("sex");
-    // this.getDictItems("user_status");
-  },
-  watch: {
-    containsSubDeptChecked() {
-      // 监听是否包含下级
-      // this.pageData.containsSubDept.value = this
-      //   .containsSubDeptChecked
-      //   ? "1"
-      //   : "0";
-      this.findPage();
-    },
   },
   methods: {
     //状态改变时

+ 83 - 0
src/views/PeopleManage/mixin.js

@@ -76,11 +76,94 @@ export default { // 导出混入对象
                 value:'AB型'
             }, 
         ],
+        educationOption:[
+          {
+              label:'小学',
+              value:'小学'
+          }, {
+              label:'初中',
+              value:'初中'
+          }, {
+              label:'高中',
+              value:'高中'
+          }, {
+              label:'专科',
+              value:'专科'
+          },  {
+            label:'本科',
+            value:'本科'
+          }, {
+              label:'硕士',
+              value:'硕士'
+          }, {
+            label:'博士',
+            value:'博士'
+        }, 
+      ],
+      healthOption:[
+        {
+            label:'健康',
+            value:'健康'
+        }, {
+            label:'亚健康',
+            value:'亚健康'
+        }, {
+            label:'疾病',
+            value:'疾病'
+        }, 
+      ],
+      politicsStatusOption:[
+        {
+            label:'群众',
+            value:'群众'
+        }, {
+            label:'共青团员',
+            value:'共青团员'
+        }, {
+            label:'中共党员',
+            value:'中共党员'
+        }, 
+      ],
+      maritalStatusOption:[
+        {
+            label:'未婚',
+            value:'未婚'
+        }, {
+            label:'已婚',
+            value:'已婚'
+        }, {
+            label:'离异',
+            value:'离异'
+        }, {
+          label:'再婚',
+          value:'再婚'
+        }, 
+      ],
         user_statusoptions: JSON.parse(
             localStorage.getItem("user_statusoptions")
           ),
         roles: JSON.parse(localStorage.getItem("find_all")),
+        /**Split 开始 */
         ztreeNodes: [],
+        leftSplitWidth: 20,
+        rightSplitWidth: 80,
+        ztreeObj: null,
+        ztreeSetting: {
+          check: {
+            enable: false,
+          },
+          data: {
+            simpleData: {
+              enable: true,
+              pIdKey: "parentId",
+            },
+          },
+          view: {
+            showIcon: false,
+          },
+        },
+        currentTreeNode: null,
+        //----ztreeLeft end---------
         }
       },
       created() {