瀏覽代碼

完成了基层统计

sunyanqiang 3 年之前
父節點
當前提交
0c021ea783

File diff suppressed because it is too large
+ 260 - 128
src/views/grassrootsregistration/bdglcookbook/index.vue


+ 21 - 63
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -379,11 +379,10 @@
               v-model="form.dutylead"
               placeholder="请输入单位"
               clearable
-              @change="dutylead"
             >
               <el-option
                 :label="item.name"
-                :value="item"
+                :value="item.name"
                 v-for="(item, i) in renYuan"
                 :key="i"
               ></el-option>
@@ -392,14 +391,13 @@
           <el-form-item label="值班交班人" prop="dutya">
             <!-- <el-input v-model="form.dutya" placeholder="请输入值班交班人" /> -->
             <el-select
-              v-model="form.dutyA"
+              v-model="form.dutya"
               placeholder="请输入单位"
               clearable
-              @change="dutya"
             >
               <el-option
                 :label="item.name"
-                :value="item"
+                :value="item.name"
                 v-for="(item, i) in renYuan"
                 :key="i"
               ></el-option>
@@ -408,14 +406,13 @@
           <el-form-item label="值班接班人" prop="dutyb">
             <!-- <el-input v-model="form.dutyb" placeholder="请输入值班接班人" /> -->
             <el-select
-              v-model="form.dutyB"
+              v-model="form.dutyb"
               placeholder="请输入单位"
               clearable
-              @change="dutyb"
             >
               <el-option
                 :label="item.name"
-                :value="item"
+                :value="item.name"
                 v-for="(item, i) in renYuan"
                 :key="i"
               ></el-option>
@@ -424,14 +421,13 @@
           <el-form-item label="值日交班人" prop="dutyc">
             <!-- <el-input v-model="form.dutyc" placeholder="请输入值日交班人" /> -->
             <el-select
-              v-model="form.dutyC"
+              v-model="form.dutyc"
               placeholder="请输入单位"
               clearable
-              @change="dutyc"
             >
               <el-option
                 :label="item.name"
-                :value="item"
+                :value="item.name"
                 v-for="(item, i) in renYuan"
                 :key="i"
               ></el-option>
@@ -440,14 +436,13 @@
           <el-form-item label="值日接班人" prop="dutyd">
             <!-- <el-input v-model="form.dutyd" placeholder="请输入值日接班人" /> -->
             <el-select
-              v-model="form.dutyD"
+              v-model="form.dutyd"
               placeholder="请输入单位"
               clearable
-              @change="dutyd"
             >
               <el-option
                 :label="item.name"
-                :value="item"
+                :value="item.name"
                 v-for="(item, i) in renYuan"
                 :key="i"
               ></el-option>
@@ -456,14 +451,13 @@
           <el-form-item label="厨房交班人" prop="dutye">
             <!-- <el-input v-model="form.dutye" placeholder="请输入厨房交班人" /> -->
             <el-select
-              v-model="form.dutyE"
+              v-model="form.dutye"
               placeholder="请输入单位"
               clearable
-              @change="dutye"
             >
               <el-option
                 :label="item.name"
-                :value="item"
+                :value="item.name"
                 v-for="(item, i) in renYuan"
                 :key="i"
               ></el-option>
@@ -471,14 +465,13 @@
           </el-form-item>
           <el-form-item label="厨房接班人" prop="dutyf">
             <el-select
-              v-model="form.dutyF"
+              v-model="form.dutyf"
               placeholder="请输入单位"
               clearable
-              @change="dutyf"
             >
               <el-option
                 :label="item.name"
-                :value="item"
+                :value="item.name"
                 v-for="(item, i) in renYuan"
                 :key="i"
               ></el-option>
@@ -746,12 +739,12 @@ export default {
         equip: null,
         internal: null,
         dutylead: null,
-        dutyA: null,
-        dutyB: null,
-        dutyC: null,
-        dutyD: null,
-        dutyE: null,
-        dutyF: null,
+        dutya: null,
+        dutyb: null,
+        dutyc: null,
+        dutyd: null,
+        dutye: null,
+        dutyf: null,
         dutyinfoa: null,
         dutyinfoc: null,
         dutyinfoe: null,
@@ -888,10 +881,8 @@ export default {
     this.getDept();
     // 获取字典通过未通过
     this.getdict();
-    // 获取部门树形
+    // 获取外部部门树形
     this.treeselect();
-    // 外部树形
-    this.getTreeselect();
   },
   methods: {
     // 应到人数失去焦点触发
@@ -923,19 +914,12 @@ export default {
         console.log(this.xunlian);
       });
     },
-    // // 获取小红小绿状态
-    // getGreeg() {
-    //   getRed().then((res) => {
-    //     console.log(res);
-    //     this.red = res.data;
-    //   });
-    // },
     // 选中军人触发
     junRen(val) {
       this.relatives[0].peopleId = val.id;
       this.relatives[0].peopleName = val.name;
     },
-    /** 查询部门下拉树结构 */
+    /** 新增查询部门下拉树结构 */
     getTreeselect() {
       getDept().then((response) => {
         this.rese = response.data;
@@ -977,7 +961,6 @@ export default {
     treeselect() {
       getWeiShu().then((res) => {
         this.deptOptions = res.data;
-        console.log(res.data, "waim");
       });
     },
     //外面树形选择搜索
@@ -992,29 +975,6 @@ export default {
       this.form.peopleId1 = val.id;
       this.form.peopleName = val.name;
     },
-    // 选择值班组织人触发
-    dutylead(val) {
-      this.form.dutylead = val.name;
-    },
-    // 配班情况
-    dutya(val) {
-      this.form.dutya = val.name;
-    },
-    dutyb(val) {
-      this.form.dutyb = val.name;
-    },
-    dutyc(val) {
-      this.form.dutyc = val.name;
-    },
-    dutyd(val) {
-      this.form.dutyd = val.name;
-    },
-    dutye(val) {
-      this.form.dutye = val.name;
-    },
-    dutyf(val) {
-      this.form.dutyf = val.name;
-    },
     // 当选择单位时候重置人员
     chongZhi() {
       (this.form = {
@@ -1206,7 +1166,6 @@ export default {
       (this.shouZhang = []),
         // 人员组织
         (this.renYuan = []),
-        this.treeselect();
       this.getTreeselect();
       this.reset();
       this.open = true;
@@ -1217,7 +1176,6 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.getTreeselect();
-      this.treeselect();
       this.reset();
       const id = row.id || this.ids;
       getBdgldiary(id).then((response) => {

+ 1908 - 0
src/views/grassrootsregistration/personnelRoster/index.vue

@@ -0,0 +1,1908 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24">
+        <div class="dadui">
+          <img src="../../../images/星星.png" alt />
+          单位
+        </div>
+        <div class="tree">
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            @node-click="handleNodeClick"
+            default-expand-all
+            highlight-current
+            :expand-on-click-node="false"
+          ></el-tree>
+        </div>
+      </el-col>
+      <el-col :span="20" :xs="24">
+        <!-- <el-form
+          :model="queryParams"
+          ref="queryForm"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入姓名"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item> -->
+          <!-- <el-form-item label="年龄" prop="age">
+        <el-input
+          v-model="queryParams.age"
+          placeholder="请输入年龄"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出生年月" prop="birthDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.birthDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择出生年月">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="命令号" prop="command">
+        <el-input
+          v-model="queryParams.command"
+          placeholder="请输入命令号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部职别" prop="duty">
+        <el-input
+          v-model="queryParams.duty"
+          placeholder="请输入部职别"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="职务" prop="postId">
+        <el-input
+          v-model="queryParams.postId"
+          placeholder="请输入职务"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="等级" prop="gradeId">
+        <el-input
+          v-model="queryParams.gradeId"
+          placeholder="请输入等级"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="职务等级时间" prop="postDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.postDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择职务等级时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="工作岗位" prop="job">
+        <el-input
+          v-model="queryParams.job"
+          placeholder="请输入工作岗位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="技术职务" prop="skillId">
+        <el-input
+          v-model="queryParams.skillId"
+          placeholder="请输入技术职务"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="技术职务时间" prop="skillDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.skillDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择技术职务时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="技术等级" prop="levelId">
+        <el-input
+          v-model="queryParams.levelId"
+          placeholder="请输入技术等级"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="技术等级时间" prop="levelDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.levelDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择技术等级时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="军人证号" prop="military">
+        <el-input
+          v-model="queryParams.military"
+          placeholder="请输入军人证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="身份证号" prop="idcard">
+        <el-input
+          v-model="queryParams.idcard"
+          placeholder="请输入身份证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="入伍年月" prop="enlistDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.enlistDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择入伍年月">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="入伍地点" prop="enlistaddress">
+        <el-input
+          v-model="queryParams.enlistaddress"
+          placeholder="请输入入伍地点"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="军衔" prop="rankId">
+        <el-input
+          v-model="queryParams.rankId"
+          placeholder="请输入军衔"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="军衔时间" prop="rankDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.rankDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择军衔时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="民族" prop="nationId">
+        <el-input
+          v-model="queryParams.nationId"
+          placeholder="请输入民族"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="籍贯" prop="origin">
+        <el-input
+          v-model="queryParams.origin"
+          placeholder="请输入籍贯"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="人员类别" prop="classId">
+        <el-input
+          v-model="queryParams.classId"
+          placeholder="请输入人员类别"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="学历" prop="educationId">
+        <el-input
+          v-model="queryParams.educationId"
+          placeholder="请输入学历"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="学位" prop="degreeId">
+        <el-input
+          v-model="queryParams.degreeId"
+          placeholder="请输入学位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="毕业时间" prop="graduationDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.graduationDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择毕业时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="毕业院校" prop="school">
+        <el-input
+          v-model="queryParams.school"
+          placeholder="请输入毕业院校"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="党团情况" prop="partyId">
+        <el-input
+          v-model="queryParams.partyId"
+          placeholder="请输入党团情况"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="党团时间" prop="partyDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.partyDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择党团时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="简历名称" prop="readmeFileName">
+        <el-input
+          v-model="queryParams.readmeFileName"
+          placeholder="请输入简历名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部别" prop="unitId">
+        <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入部别"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="照片" prop="avatar">
+        <el-input
+          v-model="queryParams.avatar"
+          placeholder="请输入照片"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出生地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入出生地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入手机号码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="0在位,1调出" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择0在位,1调出" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="0在位,1调出" prop="createtimes">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.createtimes"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择0在位,1调出">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="0在位,1调出" prop="updatetimes">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.updatetimes"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择0在位,1调出">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="0在位,1休假,2出差,3借调,4学习,5执行任务,6外诊,7其他" prop="reign">
+        <el-input
+          v-model="queryParams.reign"
+          placeholder="请输入0在位,1休假,2出差,3借调,4学习,5执行任务,6外诊,7其他"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工作时间" prop="jobTime">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.jobTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择工作时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="健康情况" prop="healthy">
+        <el-input
+          v-model="queryParams.healthy"
+          placeholder="请输入健康情况"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="血型" prop="bloodType">
+        <el-select v-model="queryParams.bloodType" placeholder="请选择血型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="职务时间" prop="postTime">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.postTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择职务时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="专业" prop="major">
+        <el-input
+          v-model="queryParams.major"
+          placeholder="请输入专业"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="入学时间" prop="admissionTime">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.admissionTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择入学时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="手机型号" prop="mobilePhoneModel">
+        <el-input
+          v-model="queryParams.mobilePhoneModel"
+          placeholder="请输入手机型号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="保障卡号" prop="guaranteeCardNo">
+        <el-input
+          v-model="queryParams.guaranteeCardNo"
+          placeholder="请输入保障卡号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工资卡号" prop="payrollCardNo">
+        <el-input
+          v-model="queryParams.payrollCardNo"
+          placeholder="请输入工资卡号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="家庭住址" prop="live">
+        <el-input
+          v-model="queryParams.live"
+          placeholder="请输入家庭住址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门ID" prop="deptId">
+        <el-input
+          v-model="queryParams.deptId"
+          placeholder="请输入部门ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="现军衔" prop="nowMilitaryRank">
+        <el-input
+          v-model="queryParams.nowMilitaryRank"
+          placeholder="请输入现军衔"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="待遇级别" prop="treatmentLevel">
+        <el-input
+          v-model="queryParams.treatmentLevel"
+          placeholder="请输入待遇级别"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="现待遇级别时间" prop="rankUpgradeTime">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.rankUpgradeTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择现待遇级别时间">
+        </el-date-picker>
+          </el-form-item>-->
+          <!-- <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form> -->
+
+        <!-- <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['peopleManage:people:add']"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['peopleManage:people:edit']"
+            >修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['peopleManage:people:remove']"
+            >删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              :loading="exportLoading"
+              @click="handleExport"
+              v-hasPermi="['peopleManage:people:export']"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row> -->
+
+        <el-table
+          v-loading="loading"
+          :data="peopleList"
+          :header-cell-style="{ background: '#003C69', color: 'white' }"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" align="center" type="index" />
+          <!-- <el-table-column label="备用手机号" align="center" prop="id" /> -->
+          <el-table-column label="姓名" align="center" prop="name" />
+          <el-table-column label="性别" align="center" prop="sex">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
+            </template>
+          </el-table-column>
+          <el-table-column label="年龄" align="center" prop="age" />
+          <el-table-column label="身份证号" align="center" prop="idcard" width="170" />
+          <!-- <el-table-column label="出生年月" align="center" prop="birthDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.birthDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="命令号" align="center" prop="command" />-->
+          <el-table-column label="部职别" align="center" prop="duty" />
+          <el-table-column label="职务" align="center" prop="postId">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.post_Level" :value="scope.row.postId" />
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="等级" align="center" prop="gradeId" /> -->
+          <el-table-column label="职务等级时间" align="center" prop="postDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.postDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="工作岗位" align="center" prop="job" /> -->
+          <!-- <el-table-column label="技术职务" align="center" prop="skillId" />
+          <el-table-column label="技术职务时间" align="center" prop="skillDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.skillDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="技术等级" align="center" prop="levelId" />
+          <el-table-column label="技术等级时间" align="center" prop="levelDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.levelDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>-->
+          <!-- <el-table-column label="军人证号" align="center" prop="military" /> -->
+          <!-- <el-table-column label="入伍年月" align="center" prop="enlistDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.enlistDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="入伍地点" align="center" prop="enlistaddress" />-->
+          <el-table-column label="军衔" align="center" prop="rankId">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_user_rank" :value="scope.row.rankId" />
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="军衔时间" align="center" prop="rankDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.rankDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="民族" align="center" prop="nationId" />-->
+          <el-table-column label="籍贯" align="center" prop="origin" width="150" />
+          <!-- <el-table-column label="人员类别" align="center" prop="classId">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.personnel_type" :value="scope.row.classId" />
+            </template>
+          </el-table-column>-->
+          <el-table-column label="学历" align="center" prop="educationId" width="100">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.Degree_level" :value="scope.row.educationId" />
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="学位" align="center" prop="degreeId">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.degree" :value="scope.row.degreeId" />
+            </template>
+          </el-table-column>-->
+          <!-- <el-table-column label="毕业时间" align="center" prop="graduationDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.graduationDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>-->
+          <el-table-column label="毕业院校" align="center" prop="school" width="120" />
+          <!-- <el-table-column label="党团情况" align="center" prop="partyId">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.Caucus" :value="scope.row.partyId" />
+            </template>
+          </el-table-column>
+          <el-table-column label="党团时间" align="center" prop="partyDate" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.partyDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="培训经历" align="center" prop="training" />
+          <el-table-column label="简历" align="center" prop="readmeFile" />
+          <el-table-column label="简历名称" align="center" prop="readmeFileName" />
+          <el-table-column label="奖惩情况" align="center" prop="prize" />
+          <el-table-column label="婚姻情况" align="center" prop="marryList">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.marryList" :value="scope.row.marryList" />
+            </template>
+          </el-table-column>
+          <el-table-column label="子女情况" align="center" prop="childrenList">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_yw" :value="scope.row.childrenList" />
+            </template>
+          </el-table-column>
+          <el-table-column label="部别" align="center" prop="unitId" />
+          <el-table-column label="照片" align="center" prop="avatar" />
+          <el-table-column label="出生地址" align="center" prop="address" />
+          <el-table-column label="手机号码" align="center" prop="phone" />
+          <el-table-column label="0在位,1调出" align="center" prop="status" />
+          <el-table-column label="0在位,1调出" align="center" prop="createtimes" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createtimes, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="0在位,1调出" align="center" prop="updatetimes" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.updatetimes, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="0在位,1休假,2出差,3借调,4学习,5执行任务,6外诊,7其他" align="center" prop="reign" />
+          <el-table-column label="工作时间" align="center" prop="jobTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.jobTime, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="健康情况" align="center" prop="healthy">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.healthy" :value="scope.row.healthy" />
+            </template>
+          </el-table-column>
+          <el-table-column label="血型" align="center" prop="bloodType">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.bloodType" :value="scope.row.bloodType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="职务时间" align="center" prop="postTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.postTime, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="专业" align="center" prop="major" />
+          <el-table-column label="入学时间" align="center" prop="admissionTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.admissionTime, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="手机型号" align="center" prop="mobilePhoneModel" />
+          <el-table-column label="保障卡号" align="center" prop="guaranteeCardNo" />
+          <el-table-column label="工资卡号" align="center" prop="payrollCardNo" />
+          <el-table-column label="是否纳编" align="center" prop="authorizedStrength">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.authorizedStrength" />
+            </template>
+          </el-table-column>
+          <el-table-column label="专业是否对口" align="center" prop="aboral" />
+          <el-table-column label="家庭住址" align="center" prop="live" />
+          <el-table-column label="部门ID" align="center" prop="deptId" />
+          <el-table-column label="用户ID" align="center" prop="userId" />
+          <el-table-column label="现军衔" align="center" prop="nowMilitaryRank">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.nowMilitaryRank" />
+            </template>
+          </el-table-column>
+          <el-table-column label="待遇级别" align="center" prop="treatmentLevel" />
+          <el-table-column label="现待遇级别时间" align="center" prop="rankUpgradeTime" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.rankUpgradeTime, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="部门名称" align="center" prop="deptName" />
+          <el-table-column label="备用手机号" align="center" prop="phoneStandby" />-->
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['peopleManage:people:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['peopleManage:people:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改人员管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1400px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="120px">
+        <div class="jiben">基本信息</div>
+        <div class="div-box-title1"><span>个人信息</span><img src="@/assets/images/虚线.png" alt=""></div>
+        <div style="width:100%;display:flex;flex-direction: row;">
+          <div>
+            <el-row>
+              <el-form-item label="姓名" prop="name">
+                <el-input v-model="form.name" placeholder />
+              </el-form-item>
+              <el-form-item label="身份证号" prop="idcard">
+                <el-input v-model="form.idcard" placeholder @blur="idcardfun()" />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="民族" prop="nationId">
+                <el-select v-model="form.nationId" clearable placeholder>
+                  <el-option
+                    v-for="dict in nationIds"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="parseInt(dict.dictValue)"
+                    style="width:200px;height:36px;"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="性别" prop="sex">
+                <el-select v-model="form.sex" clearable placeholder>
+                  <el-option
+                    v-for="dict in sexList"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                    style="width:200px;height:36px;"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="年龄" prop="age">
+                <el-input v-model="form.age" placeholder />
+              </el-form-item>
+              <el-form-item label="出生年月" prop="birthDate">
+                <el-date-picker
+                  clearable
+                  size="small"
+                  v-model="form.birthDate"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder
+                  style="width:200px;height:36px;"
+                ></el-date-picker>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="籍贯" prop="origin">
+                <el-input v-model="form.origin" placeholder />
+              </el-form-item>
+              <el-form-item label="家庭住址" prop="live">
+                <el-input v-model="form.live" placeholder />
+              </el-form-item>
+            </el-row>
+          </div>
+          <div style="margin-left:50px;display:flex;">
+            <div class="pictureUploading-img">
+                <img src="@/assets/images/提示.png" alt="">
+            </div>
+            <el-form-item prop="pictureUploading" class="personphoto">
+              <imageUpload :limit="1" v-model="form.avatar" style="height:200px;" />
+            </el-form-item>
+          </div>
+        </div>
+        <el-row>
+          <el-form-item label="血型" prop="bloodType">
+            <el-select v-model="form.bloodType" clearable placeholder>
+              <el-option
+                v-for="dict in bloodType"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="政治面貌" prop="partyId">
+            <el-select v-model="form.partyId" clearable placeholder>
+              <el-option
+                v-for="dict in partyIds"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="党团时间" prop="partyDate">
+            <el-date-picker
+              clearable
+              size="small"
+              v-model="form.partyDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder
+            ></el-date-picker>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="健康情况" prop="healthy">
+            <el-select v-model="form.healthy" clearable placeholder>
+              <el-option
+                v-for="dict in healthy"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="保障卡号" prop="guaranteeCardNo">
+            <el-input v-model="form.guaranteeCardNo" placeholder />
+          </el-form-item>
+          <el-form-item label="工资卡号" prop="payrollCardNo">
+            <el-input v-model="form.payrollCardNo" placeholder />
+          </el-form-item>
+        </el-row>
+        <div class="div-box-title1"><span>婚姻信息</span><img src="@/assets/images/虚线.png" alt=""></div>
+        <el-row>
+          <el-form-item label="婚姻情况" prop="marryList">
+            <el-select v-model="form.marryList" clearable placeholder>
+              <el-option
+                v-for="dict in marryList"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="子女情况" prop="childrenList">
+            <el-select v-model="form.childrenList" clearable placeholder>
+              <el-option
+                v-for="dict in childrenList"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <div class="div-box-title1"><span>学历教育</span><img src="@/assets/images/虚线.png" alt=""></div>
+        <el-form-item label="学历" prop="educationId">
+          <el-select v-model="form.educationId" clearable placeholder>
+            <el-option
+              v-for="dict in educationId"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="学位" prop="degreeId">
+          <el-select v-model="form.degreeId" clearable placeholder>
+            <el-option
+              v-for="dict in degree"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="入学时间" prop="admissionTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.admissionTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label=" 专业" prop="major">
+          <el-input v-model="form.major" placeholder />
+        </el-form-item>
+        <el-form-item label="毕业时间" prop="graduationDate">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.graduationDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="毕业学校" prop="school">
+          <el-input v-model="form.school" placeholder />
+        </el-form-item>
+        <div class="div-box-title1"><span>联系方式</span><img src="@/assets/images/虚线.png" alt=""></div>
+        <el-form-item label="手机型号" prop="mobilePhoneModel">
+          <el-input v-model="form.mobilePhoneModel" placeholder />
+        </el-form-item>
+        <el-form-item label="手机号码" prop="phone">
+          <el-input v-model="form.phone" placeholder />
+        </el-form-item>
+        <el-form-item label="手机号码2" prop="phoneStandby">
+          <el-input v-model="form.phoneStandby" placeholder />
+        </el-form-item>
+        <div class="jiben">职务信息</div>
+        <el-form-item label="军人证号" prop="military">
+          <el-input v-model="form.military" placeholder />
+        </el-form-item>
+        <el-form-item label="人员类别" prop="classId">
+          <el-select v-model="form.classId" clearable placeholder>
+            <el-option
+              v-for="dict in classId"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单位" prop="deptId">
+          <el-select v-model="form.deptId" ref="deptId" clearable placeholder>
+            <el-option
+              v-for="dict in unitId"
+              :key="dict.deptId"
+              :label="dict.deptName"
+              :value="dict.deptId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="部职别" prop="duty">
+          <el-input v-model="form.duty" placeholder />
+        </el-form-item>
+        <el-form-item label="入伍时间" prop="enlistDate">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.enlistDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入伍地点" prop="enlistaddress">
+          <el-input v-model="form.enlistaddress" placeholder />
+        </el-form-item>
+        <el-form-item label="职务层级" prop="postId">
+          <el-select v-model="form.postId" clearable placeholder>
+            <el-option
+              v-for="dict in postIds"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="现职务层级时间" prop="postDate">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.postDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="军衔" prop="rankId">
+          <el-select v-model="form.rankId" clearable placeholder>
+            <el-option
+              v-for="dict in rankIds"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="现军衔" prop="nowMilitaryRank">
+          <el-select v-model="form.nowMilitaryRank" clearable placeholder>
+            <el-option
+              v-for="dict in rankIds"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="现军衔时间" prop="rankDate">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.rankDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="是否编制" prop="authorizedStrength">
+          <el-select v-model="form.authorizedStrength" clearable placeholder>
+            <el-option
+              v-for="dict in authorizedStrength"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="命令号" prop="command">
+          <el-input v-model="form.command" placeholder />
+        </el-form-item>
+        <el-form-item label="待遇级别" prop="treatmentLevel">
+          <el-input v-model="form.treatmentLevel" placeholder />
+        </el-form-item>
+        <el-form-item label="现待遇级别时间" prop="rankUpgradeTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.rankUpgradeTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="专业是否对口" prop="isBianzhi">
+          <el-select v-model="form.isBianzhi" clearable placeholder>
+            <el-option
+              v-for="dict in authorizedStrength"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工作时间" prop="jobTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.jobTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder
+          ></el-date-picker>
+        </el-form-item>
+        <div class="jiben">家庭信息<span @click="tiaddfun">+</span></div>
+        <el-row
+          style="background-color: rgba(255, 255, 255, 0.10980392156862745);padding-top:20px;margin-top:10px;margin-bottom:20px;"
+          v-for="(item, index) in jtlist"
+          :key="index"
+        >
+          <el-form-item label="姓名">
+            <el-input v-model="item.name" placeholder />
+          </el-form-item>
+          <el-form-item label="与本人关系" prop="characterRelationship">
+            <el-input v-model="item.characterRelationship" placeholder />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="phoneNumber">
+            <el-input v-model="item.phoneNumber" placeholder />
+          </el-form-item>
+          <el-form-item label="单位" prop="unitName">
+            <el-input v-model="item.unitName" placeholder />
+          </el-form-item>
+          <el-button
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            @click="jtDelete(index)"
+            style="height:36px;margin-left:575px;"
+            v-if="index != 0"
+          >删除</el-button>
+        </el-row>
+        <div class="jiben">培训经历</div>
+        <el-form-item label prop="training">
+          <el-input v-model="form.training" type="textarea" placeholder />
+        </el-form-item>
+        <div class="jiben">奖惩情况</div>
+        <el-form-item label prop="prize">
+          <el-input v-model="form.prize" type="textarea" placeholder />
+        </el-form-item>
+        <div class="jiben">简历</div>
+        <el-form-item
+          label
+          label-width="0px"
+          class="laborcontractuploading"
+          prop="laborContractUploading"
+        >
+          <fileUpload v-model="form.laborContractUploading" class="m-l-20" />
+        </el-form-item>
+        <!-- <el-form-item label prop="readmeFile">
+          <el-input v-model="form.readmeFile" type="textarea" placeholder />
+        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listPeople,
+  getPeople,
+  delPeople,
+  addPeople,
+  updatePeople,
+  exportPeople,
+  getDept,
+  listDept,
+  treeselect
+} from "@/api/peopleManage/people";
+
+
+
+export default {
+  name: "People",
+  dicts: [
+    "sys_user_sex",
+    "post_Level",
+    "sys_user_rank",
+    "personnel_type",
+    "Degree_level",
+    "degree",
+    "Caucus",
+    "marryList",
+    "sys_yw",
+    "healthy",
+    "bloodType",
+    "sys_yes_no",
+    "sys_yes_no"
+  ],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 子表选中数据
+      checkedBdglPeople: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 人员管理表格数据
+      peopleList: [],
+      // 人员管理表格数据
+      bdglPeopleList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        sex: null,
+        age: null,
+        birthDate: null,
+        command: null,
+        duty: null,
+        postId: null,
+        gradeId: null,
+        postDate: null,
+        job: null,
+        skillId: null,
+        skillDate: null,
+        levelId: null,
+        levelDate: null,
+        military: null,
+        idcard: null,
+        enlistDate: null,
+        enlistaddress: null,
+        rankId: null,
+        rankDate: null,
+        nationId: null,
+        origin: null,
+        classId: null,
+        educationId: null,
+        degreeId: null,
+        graduationDate: null,
+        school: null,
+        partyId: null,
+        partyDate: null,
+        training: null,
+        readmeFile: null,
+        readmeFileName: null,
+        prize: null,
+        marryList: null,
+        childrenList: null,
+        unitId: null,
+        avatar: null,
+        address: null,
+        phone: null,
+        status: null,
+        createtimes: null,
+        updatetimes: null,
+        reign: null,
+        jobTime: null,
+        healthy: null,
+        bloodType: null,
+        postTime: null,
+        major: null,
+        admissionTime: null,
+        mobilePhoneModel: null,
+        guaranteeCardNo: null,
+        payrollCardNo: null,
+        authorizedStrength: null,
+        aboral: null,
+        live: null,
+        deptId: null,
+        userId: null,
+        nowMilitaryRank: null,
+        treatmentLevel: null,
+        rankUpgradeTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
+        idcard: [
+          { required: true, message: "身份证号不能为空", trigger: "blur" },
+          {
+            pattern: /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+            message: "请输入正确的身份证号",
+            trigger: "blur"
+          }
+        ],
+        nationId: [
+          { required: true, message: "民族不能为空", trigger: "blur" }
+        ],
+        sex: [{ required: true, message: "性别不能为空", trigger: "blur" }],
+        age: [{ required: true, message: "年龄不能为空", trigger: "blur" }],
+        birthDate: [
+          { required: true, message: "出生年月不能为空", trigger: "blur" }
+        ],
+        origin: [{ required: true, message: "籍贯不能为空", trigger: "blur" }],
+        live: [
+          { required: true, message: "家庭住址不能为空", trigger: "blur" }
+        ],
+        partyId: [
+          { required: true, message: "政治面貌不能为空", trigger: "change" }
+        ],
+        healthy: [
+          { required: true, message: "健康情况不能为空", trigger: "change" }
+        ],
+        marryList: [
+          { required: true, message: "婚姻情况不能为空", trigger: "change" }
+        ],
+        educationId: [
+          { required: true, message: "学历不能为空", trigger: "change" }
+        ],
+        admissionTime: [
+          { required: true, message: "入学时间不能为空", trigger: "change" }
+        ],
+        graduationDate: [
+          { required: true, message: "毕业时间不能为空", trigger: "change" }
+        ],
+        school: [
+          { required: true, message: "毕业学校不能为空", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ],
+        phoneStandby: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ],
+        enlistDate: [
+          { required: true, message: "入伍时间不能为空", trigger: "change" }
+        ],
+        authorizedStrength: [
+          { required: true, message: "是否编制不能为空", trigger: "change" }
+        ],
+        deptId: [{ required: true, message: "单位不能为空", trigger: "change" }]
+        // jtname:[{ validator: jtnameblur, trigger: "blur" }],
+        // characterRelationship: [
+        //   { required: true, message: "与本人关系必填一个", trigger: "blur" }
+        // ],
+        // phoneNumber: [
+        //   { required: true, message: "联系电话不能为空", trigger: "blur" },
+        //   {
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: "请输入正确的手机号码",
+        //     trigger: "blur"
+        //   }
+        // ],
+        // unitName: [{ required: true, message: "单位不能为空", trigger: "blur" }]
+      },
+      //性别数组
+      sexList: [],
+      //血型数组
+      bloodType: [],
+      //政治面貌
+      partyIds: [],
+      //健康状况
+      healthy: [],
+      //婚姻情况
+      marryList: [],
+      //学历
+      educationId: [],
+      //学位
+      degree: [],
+      //是否编制
+      authorizedStrength: [],
+      //子女情况
+      childrenList: [],
+      //人员类别
+      classId: [],
+      //职务层级
+      postIds: [],
+      //军衔
+      rankIds: [],
+      //单位
+      deptId: [],
+      //民族
+      nationIds: [],
+      unitId: [],
+      jtlist: [
+        {
+          name: null,
+          characterRelationship: null,
+          phoneNumber: null,
+          unitName: null
+        }
+      ],
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      deptOptions: [],
+      value:null,
+    };
+  },
+  created() {
+    this.getList();
+    //性别
+    this.getDicts("sys_user_sex").then(response => {
+      this.sexList = response.data;
+    });
+    //血型
+    this.getDicts("bloodType").then(response => {
+      this.bloodType = response.data;
+    });
+    //政治面貌
+    this.getDicts("Caucus").then(response => {
+      this.partyIds = response.data;
+    });
+    //健康情况
+    this.getDicts("healthy").then(response => {
+      this.healthy = response.data;
+    });
+    //婚姻情况
+    this.getDicts("marryList").then(response => {
+      this.marryList = response.data;
+    });
+    //学历
+    this.getDicts("Degree_level").then(response => {
+      this.educationId = response.data;
+    });
+    //婚姻情况
+    this.getDicts("degree").then(response => {
+      this.degree = response.data;
+    });
+    //是否编制
+    this.getDicts("sys_yes_no").then(response => {
+      this.authorizedStrength = response.data;
+    });
+    //子女情况
+    this.getDicts("sys_yw").then(response => {
+      this.childrenList = response.data;
+    });
+    //人员类别
+    this.getDicts("personnel_type").then(response => {
+      this.classId = response.data;
+    });
+    //职务层级
+    this.getDicts("post_Level").then(response => {
+      this.postIds = response.data;
+    });
+    //军衔
+    this.getDicts("sys_user_rank").then(response => {
+      this.rankIds = response.data;
+    });
+    //民族
+    this.getDicts("sys_familyName").then(response => {
+      this.nationIds = response.data;
+    });
+    //部门数据
+    getDept().then(res => {
+      if (res.code == 200) {
+        this.unitId = res.data;
+      }
+    });
+    treeselect().then(res => {
+      console.log(res);
+      if (res.code == 200) {
+        this.deptOptions = res.data;
+      }
+    });
+  },
+  methods: {
+    /** 查询人员管理列表 */
+    getList() {
+      this.loading = true;
+      listPeople(this.queryParams).then(response => {
+        this.peopleList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        sex: null,
+        age: null,
+        birthDate: null,
+        command: null,
+        duty: null,
+        postId: null,
+        gradeId: null,
+        postDate: null,
+        job: null,
+        skillId: null,
+        skillDate: null,
+        levelId: null,
+        levelDate: null,
+        military: null,
+        idcard: null,
+        enlistDate: null,
+        enlistaddress: null,
+        rankId: null,
+        rankDate: null,
+        nationId: null,
+        origin: null,
+        classId: null,
+        educationId: null,
+        degreeId: null,
+        graduationDate: null,
+        school: null,
+        partyId: null,
+        partyDate: null,
+        training: null,
+        readmeFile: null,
+        readmeFileName: null,
+        prize: null,
+        marryList: null,
+        childrenList: null,
+        unitId: null,
+        avatar: null,
+        address: null,
+        phone: null,
+        status: 0,
+        createtimes: null,
+        updatetimes: null,
+        reign: null,
+        jobTime: null,
+        healthy: null,
+        bloodType: null,
+        postTime: null,
+        major: null,
+        admissionTime: null,
+        mobilePhoneModel: null,
+        guaranteeCardNo: null,
+        payrollCardNo: null,
+        authorizedStrength: null,
+        aboral: null,
+        live: null,
+        deptId: null,
+        userId: null,
+        nowMilitaryRank: null,
+        treatmentLevel: null,
+        rankUpgradeTime: null,
+        phoneStandby: null,
+        deptName: null,
+        isBianzhi:null,
+      };
+      this.bdglPeopleList = [];
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加人员管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getPeople(id).then(response => {
+        this.form = response.data;
+        this.jtlist = response.data.familyInformation;
+        this.bdglPeopleList = response.data.bdglPeopleList;
+        this.open = true;
+        this.title = "修改人员管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.deptName = this.$refs["deptId"].selectedLabel;
+          this.form.bdglPeopleList = this.bdglPeopleList;
+          this.form.familyInformation = this.jtlist;
+          if (this.form.id != null) {
+            updatePeople(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.familyInformation = this.jtlist;
+            this.form.deptName = this.$refs["deptId"].selectedLabel;
+            addPeople(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除人员管理编号为"' + ids + '"的数据项?')
+        .then(function() {
+          return delPeople(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 人员管理序号 */
+    rowBdglPeopleIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** 人员管理添加按钮操作 */
+    handleAddBdglPeople() {
+      let obj = {};
+      obj.name = "";
+      obj.sex = "";
+      obj.age = "";
+      obj.birthDate = "";
+      obj.command = "";
+      obj.duty = "";
+      obj.postId = "";
+      obj.gradeId = "";
+      obj.postDate = "";
+      obj.job = "";
+      obj.skillId = "";
+      obj.skillDate = "";
+      obj.levelId = "";
+      obj.levelDate = "";
+      obj.military = "";
+      obj.idcard = "";
+      obj.enlistDate = "";
+      obj.enlistaddress = "";
+      obj.rankId = "";
+      obj.rankDate = "";
+      obj.nationId = "";
+      obj.origin = "";
+      obj.classId = "";
+      obj.educationId = "";
+      obj.degreeId = "";
+      obj.graduationDate = "";
+      obj.school = "";
+      obj.partyId = "";
+      obj.partyDate = "";
+      obj.training = "";
+      obj.readmeFile = "";
+      obj.readmeFileName = "";
+      obj.prize = "";
+      obj.marryList = "";
+      obj.childrenList = "";
+      obj.unitId = "";
+      obj.avatar = "";
+      obj.address = "";
+      obj.phone = "";
+      obj.status = "";
+      obj.createtimes = "";
+      obj.updatetimes = "";
+      obj.reign = "";
+      obj.jobTime = "";
+      obj.healthy = "";
+      obj.bloodType = "";
+      obj.postTime = "";
+      obj.major = "";
+      obj.admissionTime = "";
+      obj.mobilePhoneModel = "";
+      obj.guaranteeCardNo = "";
+      obj.payrollCardNo = "";
+      obj.authorizedStrength = "";
+      obj.aboral = "";
+      obj.live = "";
+      obj.userId = "";
+      obj.nowMilitaryRank = "";
+      obj.treatmentLevel = "";
+      obj.rankUpgradeTime = "";
+      this.bdglPeopleList.push(obj);
+    },
+    /** 人员管理删除按钮操作 */
+    handleDeleteBdglPeople() {
+      if (this.checkedBdglPeople.length == 0) {
+        this.$modal.msgError("请先选择要删除的人员管理数据");
+      } else {
+        const bdglPeopleList = this.bdglPeopleList;
+        const checkedBdglPeople = this.checkedBdglPeople;
+        this.bdglPeopleList = bdglPeopleList.filter(function(item) {
+          return checkedBdglPeople.indexOf(item.index) == -1;
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handleBdglPeopleSelectionChange(selection) {
+      this.checkedBdglPeople = selection.map(item => item.index);
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal
+        .confirm("是否确认导出所有人员管理数据项?")
+        .then(() => {
+          this.exportLoading = true;
+          return exportPeople(queryParams);
+        })
+        .then(response => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+    //新增家庭成员
+    tiaddfun() {
+      this.jtlist.push({
+        name: null,
+        characterRelationship: null,
+        phoneNumber: null,
+        unitName: null
+      });
+    },
+    //删除家庭成员
+    jtDelete(i) {
+      this.jtlist.splice(i, 1);
+    },
+    //身份证号
+    idcardfun() {
+      this.form.sex =
+        this.form.idcard.substr(this.form.idcard.length - 2, 1) % 2 == 1
+          ? "0"
+          : "1";
+      this.form.birthDate =
+        this.form.idcard.substr(6, 4) +
+        "-" +
+        this.form.idcard.substr(10, 2) +
+        "-" +
+        this.form.idcard.substr(10, 2);
+      var myDate = new Date();
+      this.form.age = myDate.getFullYear() - this.form.idcard.substr(6, 4);
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.getList();
+    }
+  }
+};
+</script>
+<style scoped>
+::v-deep .el-dialog {
+  width: 1030px !important;
+  background-color: #004d86;
+}
+
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+.el-form-item ::v-deep .el-input__inner {
+  width: 200px;
+  height: 36px;
+  background: #004d86;
+  color: #fff;
+}
+::v-deep .el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+}
+
+.pictureUploading-img img{
+  width:60px;
+  height: 210px;
+  margin-right: 10px;
+}
+
+::v-deep .el-upload--picture-card {
+  height: 210px;
+  width: 170px;
+  line-height: 210px;
+  background-image: url('../../../assets/images/头像.png');
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+}
+::v-deep .el-upload--picture-card .el-icon-plus{
+  display: none;
+}
+.el-upload--picture-card /deep/ .el-upload--picture-card i {
+  font-size: 48px;
+}
+::v-deep .el-upload__tip {
+  display: none;
+}
+::v-deep .el-textarea__inner {
+  width: 980px;
+  height: 104px;
+}
+.jiben span {
+  width: 25px;
+  height: 25px;
+  display: inline-block;
+  background-color: #1c86e1;
+  line-height: 25px;
+  text-align: center;
+  font-size: 16px;
+  cursor: pointer;
+  /* margin-left: 851px; */
+  position: absolute;
+  right:20px;
+}
+.el-select-dropdown__item:hover {
+  color: #1c86e1;
+}
+.el-select-dropdown__item {
+  color: #fff;
+}
+.el-tree {
+  background-color: #00365f;
+  color: #fff;
+}
+::v-deep .el-tree-node__content:hover {
+  color: #1c86e1;
+}
+::v-deep .el-upload-list--picture-card .el-upload-list__item {
+  height: 210px;
+  width: 170px;
+}
+.dadui {
+  height: 40px;
+  background: #003156;
+  /* border-bottom: 1px solid #718A9D ; */
+  background-image: url(../../../images/矩形底部边框.png);
+  background-repeat: no-repeat;
+  background-position: 0px 39px;
+  font-size: 16px;
+  color: #1d96ff;
+}
+.dadui img {
+  margin: 10px 10px 0px 10px;
+}
+
+.data {
+  height: 40px;
+  background: #003156;
+  margin-bottom: 12px;
+  color: #fff;
+  display: flex;
+  font-size: 13px;
+  line-height: 25px;
+  position: relative;
+}
+.el-tree {
+  padding: 10px;
+  background: #003156;
+  color: #fff;
+}
+
+.data p {
+  position: absolute;
+  top: -5px;
+  left: 15px;
+}
+.data .a1{
+  width: 128px;
+  height: 26px;
+  background: rgba(23, 74, 112, 0.4);
+  border-radius: 13px;
+  position: absolute;
+  top:7px;
+  left: 60px;
+}
+::v-deep .data .el-date-editor.el-input{
+  width: 100%;
+  border: none;
+}
+::v-deep .data .el-input__inner{
+   width: 100% !important;
+   border: none;
+}
+::v-deep .data .el-input--medium .el-input__icon {
+    line-height: 36px;
+    position: absolute;
+    right: -223px;
+    top: 2px;
+}
+::v-deep .data .el-input__inner {
+    background-color: transparent;
+    color: #fff;
+    text-align: center;
+    margin-top: 2px;
+}
+::v-deep .data .el-input__suffix {
+    position: absolute;
+    right: 281px;
+}
+::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content{
+    color: #00365f !important; 
+    /* background-color: #003156 !important; */
+  }
+</style>

Some files were not shown because too many files changed in this diff