人员家庭信息判空

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -113,8 +113,8 @@
           <template scope="scope">
             <span>{{
               (queryParams.pageNum - 1) * queryParams.pageSize +
-              scope.$index +
-              1
+                scope.$index +
+                1
             }}</span>
           </template>
         </el-table-column>
@@ -336,7 +336,6 @@
                 <tr align="center">
                   <td width="200" height="40">区分</td>
                   <td colspan="2" width="420">内容</td>
-                  <td width="100">组织人</td>
                   <td width="100">应到人数</td>
                   <td width="100">实到人数</td>
                   <td width="100">到课率</td>
@@ -360,12 +359,6 @@
                       {{ item.contents }}
                     </el-input>
                   </td>
-                  <td>
-                    <el-input
-                      v-model="item.organizer"
-                      placeholder="组织人"
-                    ></el-input>
-                  </td>
                   <td>
                     <el-input
                       v-model="item.shouldArrive"
@@ -659,7 +652,7 @@
                     <el-time-picker
                       v-model="item1.examineDate"
                       :picker-options="{
-                        selectableRange: '00:00:00 - 23:59:59',
+                        selectableRange: '00:00:00 - 23:59:59'
                       }"
                       placeholder="选择日期时间"
                       value-format="hh:mm:ss"
@@ -732,7 +725,7 @@
                     <el-time-picker
                       v-model="item1.comeDate"
                       :picker-options="{
-                        selectableRange: '00:00:00 - 23:59:59',
+                        selectableRange: '00:00:00 - 23:59:59'
                       }"
                       placeholder="来队时间"
                       value-format="hh:mm:ss"
@@ -752,7 +745,7 @@
                     <el-time-picker
                       v-model="item1.leaveDate"
                       :picker-options="{
-                        selectableRange: '00:00:00 - 23:59:59',
+                        selectableRange: '00:00:00 - 23:59:59'
                       }"
                       placeholder="离队时间"
                       value-format="hh:mm:ss"
@@ -842,7 +835,7 @@ import {
   updateBdgldiary,
   exportBdgldiary,
   exportBdgShuju,
-  updateBdglShenPi,
+  updateBdglShenPi
 } from "@/api/grassrootsregistration/bdgldiary";
 
 import {
@@ -851,7 +844,7 @@ import {
   getUser,
   getShiLi,
   getXunLian,
-  getWeiShu,
+  getWeiShu
 } from "@/api/grassrootsregistration/bdglmeeting";
 
 import { getDicts } from "@/api/system/dict/data";
@@ -931,50 +924,50 @@ export default {
         weekwork: null,
         examine: null,
         peopleId1: null,
-        contents: null,
+        contents: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         unitId: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" },
+          { required: true, message: "单位名称不能为空", trigger: "blur" }
         ],
         peopleId: [
           // { required: true, message: "值班人员不能为空", trigger: "blur" },
         ],
         blogDate: [
-          { required: true, message: "值班日期不能为空", trigger: "blur" },
+          { required: true, message: "值班日期不能为空", trigger: "blur" }
         ],
         weather: [{ required: true, message: "天气不能为空", trigger: "blur" }],
         lead: [
-          { required: true, message: "值班首长不能为空", trigger: "change" },
+          { required: true, message: "值班首长不能为空", trigger: "change" }
         ],
         orgcadre: [
-          { required: true, message: "编制干部不能为空", trigger: "blur" },
+          { required: true, message: "编制干部不能为空", trigger: "blur" }
         ],
         orgsoldier: [
-          { required: true, message: "编制战士不能为空", trigger: "blur" },
+          { required: true, message: "编制战士不能为空", trigger: "blur" }
         ],
         orgcivilian: [
-          { required: true, message: "编制文职不能为空", trigger: "blur" },
+          { required: true, message: "编制文职不能为空", trigger: "blur" }
         ],
         nowcadre: [
-          { required: true, message: "现有干部不能为空", trigger: "blur" },
+          { required: true, message: "现有干部不能为空", trigger: "blur" }
         ],
         nowsoldier: [
-          { required: true, message: "现有战士不能为空", trigger: "blur" },
+          { required: true, message: "现有战士不能为空", trigger: "blur" }
         ],
         nowcivilian: [
-          { required: true, message: "现有文职不能为空", trigger: "blur" },
-        ],
+          { required: true, message: "现有文职不能为空", trigger: "blur" }
+        ]
       },
       BdgDay: [],
       // 搜索人员
       Renyuan: [],
       // 字典类型查询
       dictType: {
-        dictType: "yssp",
+        dictType: "yssp"
       },
       // 字典数据
       ziDian: [],
@@ -984,12 +977,12 @@ export default {
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
-        },
+        }
       },
       // 树形配置
       defaultProps: {
         children: "children",
-        label: "label",
+        label: "label"
       },
       // 组织人搜索列表00
       list: [],
@@ -1002,8 +995,8 @@ export default {
           foremanName: null,
           sentryName: null,
           examineDate: null,
-          dialogue: null,
-        },
+          dialogue: null
+        }
       ],
       //添加对话框来访人员表格为空
       relatives: [
@@ -1012,8 +1005,8 @@ export default {
           name: null,
           relation: null,
           comeDate: null,
-          leaveDate: null,
-        },
+          leaveDate: null
+        }
       ],
       // 临时来队亲属
       relatives: [
@@ -1022,8 +1015,8 @@ export default {
           name: null,
           relation: null,
           comeDate: null,
-          leaveDate: null,
-        },
+          leaveDate: null
+        }
       ],
       // 搜索时间保存
       tiem: null,
@@ -1035,8 +1028,8 @@ export default {
           shouldArrive: null,
           realTo: null,
           percentage: null,
-          organizer: null,
-        },
+          organizer: null
+        }
       ],
       // 数据时间
       DataTime: "",
@@ -1056,7 +1049,7 @@ export default {
       weishenpi: "",
       // 数据时间的保存
       tiems: "",
-      centertext: null,
+      centertext: null
     };
   },
   // updated() {
@@ -1084,7 +1077,7 @@ export default {
       this.opens = false;
       this.statusShen = true;
       const id = row.id || this.ids;
-      getBdgldiary(id).then((response) => {
+      getBdgldiary(id).then(response => {
         this.wordInfo = response.data;
         this.title = "审批要事日记";
         this.menuRoleVisible = true;
@@ -1094,7 +1087,7 @@ export default {
     queDing() {
       this.wordInfo.examine = "1";
       if (this.wordInfo.id != null) {
-        updateBdglShenPi(this.wordInfo).then((response) => {
+        updateBdglShenPi(this.wordInfo).then(response => {
           this.menuRoleVisible = false;
           this.getList();
           this.getShuJu(this.timeDate);
@@ -1104,7 +1097,7 @@ export default {
     },
     // 获取部门数据
     getShuJu(data) {
-      exportBdgShuju(data).then((res) => {
+      exportBdgShuju(data).then(res => {
         this.DataTime = data;
         this.registrationData = res;
         this.cg = res.cg;
@@ -1123,7 +1116,7 @@ export default {
     },
     // 应到人数失去焦点触发
     yinDao() {
-      this.xunlian.forEach((item) => {
+      this.xunlian.forEach(item => {
         if (item.shouldArrive != null && item.realTo != null) {
           var str = ((item.realTo / item.shouldArrive) * 100).toFixed(2);
           str += "%";
@@ -1133,7 +1126,7 @@ export default {
     },
     // 实到人数失去焦点触发
     shiDao() {
-      this.xunlian.forEach((item) => {
+      this.xunlian.forEach(item => {
         if (item.shouldArrive != null && item.realTo != null) {
           var str = ((item.realTo / item.shouldArrive) * 100).toFixed(2);
           str += "%";
@@ -1155,19 +1148,32 @@ export default {
       let s = tiem.getSeconds();
       s = s < 10 ? "0" + s : s;
       let dateTime = y + "-" + m + "-" + d + " " + h + ":" + M + ":" + s;
-      getXunLian(id, dateTime).then((res) => {
+      getXunLian(id, dateTime).then(res => {
         console.log(res.data);
         this.xunlian = res.data;
-        for (var i = 0; i < res.data.length; i++) {
-          res.data[i].centertext =
-            res.data[i].startTime +
-            "-" +
-            res.data[i].endTime +
-            "  " +
-            this.xunlian[i].contents +
-            "(" +
-            this.xunlian[i].organizer +
-            ")";
+        // for (var i = 0; i < res.data.length; i++) {
+        //   res.data[i].centertext =
+        //     res.data[i].startTime +
+        //     "-" +
+        //     res.data[i].endTime +
+        //     "  " +
+        //     this.xunlian[i].contents +
+        //     "(" +
+        //     this.xunlian[i].organizer +
+        //     ")";
+        // }
+        if (this.xunlian) {
+          for (var i = 0; i < this.xunlian.length; i++) {
+            this.xunlian[i].centertext =
+              this.xunlian[i].startTime +
+              "-" +
+              this.xunlian[i].endTime +
+              "  " +
+              this.xunlian[i].contents +
+              "(" +
+              this.xunlian[i].organizer +
+              ")";
+          }
         }
       });
     },
@@ -1178,7 +1184,7 @@ export default {
     },
     /** 新增查询部门下拉树结构 */
     getTreeselect() {
-      getDept().then((response) => {
+      getDept().then(response => {
         this.rese = response.data;
       });
     },
@@ -1190,7 +1196,7 @@ export default {
         foremanName: null,
         sentryName: null,
         examineDate: null,
-        dialogue: null,
+        dialogue: null
       });
     },
 
@@ -1206,7 +1212,7 @@ export default {
         name: null,
         relation: null,
         comeDate: null,
-        leaveDate: null,
+        leaveDate: null
       });
     },
     //删除对话框临时来访人员
@@ -1216,7 +1222,7 @@ export default {
 
     // 获取外面部门树形
     treeselect() {
-      getWeiShu().then((res) => {
+      getWeiShu().then(res => {
         this.deptOptions = res.data;
       });
     },
@@ -1242,12 +1248,12 @@ export default {
         dutyD: null,
         dutyE: null,
         dutyF: null,
-        dutylead: null,
+        dutylead: null
       }),
         (this.relatives = [
           {
-            peopleId: null,
-          },
+            peopleId: null
+          }
         ]);
     },
     // 当点击完成值班时间的选择发起请求
@@ -1259,7 +1265,7 @@ export default {
     },
     // 获取实力情况
     getShiLiRen(id) {
-      getShiLi(id).then((res) => {
+      getShiLi(id).then(res => {
         this.form.orgcadre = res.data.ganbu;
         this.form.orgsoldier = res.data.shiBin;
         this.form.orgcivilian = res.data.wenZhi;
@@ -1284,19 +1290,19 @@ export default {
     },
     // 根据部门获取人员
     getRenYuan(id) {
-      getZhuChiRen(id).then((res) => {
+      getZhuChiRen(id).then(res => {
         this.renYuan = res.data;
       });
     },
     // 获取首长
     getShou(id) {
-      getUser(id).then((res) => {
+      getUser(id).then(res => {
         this.shouZhang = res.data;
       });
     },
     // 搜索第一个选中触发
     search() {
-      getZhuChiRen(this.queryParams.deptId).then((res) => {
+      getZhuChiRen(this.queryParams.deptId).then(res => {
         this.Renyuan = res.data;
       });
       this.getList();
@@ -1308,7 +1314,7 @@ export default {
     },
     // 字典查询
     getdict() {
-      getDicts(this.dictType.dictType).then((res) => {
+      getDicts(this.dictType.dictType).then(res => {
         // console.log(res);
         this.ziDian = res.data;
       });
@@ -1316,7 +1322,7 @@ export default {
     /** 查询要事日记列表 */
     getList() {
       this.loading = true;
-      listBdgldiary(this.queryParams).then((response) => {
+      listBdgldiary(this.queryParams).then(response => {
         this.bdgldiaryList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1369,7 +1375,7 @@ export default {
         peopleId1: null,
         contents: null,
         createId: null,
-        createName: null,
+        createName: null
       };
       (this.relatives = [
         {
@@ -1378,8 +1384,8 @@ export default {
           comeDate: null,
           leaveDate: null,
           peopleId: null,
-          peopleName: null,
-        },
+          peopleName: null
+        }
       ]),
         (this.checkShop = [
           {
@@ -1387,8 +1393,8 @@ export default {
             foremanName: null,
             sentryName: null,
             examineDate: null,
-            dialogue: null,
-          },
+            dialogue: null
+          }
         ]),
         (this.xunlian = [
           {
@@ -1397,8 +1403,8 @@ export default {
             shouldArrive: null,
             realTo: null,
             percentage: null,
-            organizer: null,
-          },
+            organizer: null
+          }
         ]),
         this.resetForm("form");
     },
@@ -1419,7 +1425,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -1441,20 +1447,34 @@ export default {
       this.getTreeselect();
       this.reset();
       const id = row.id || this.ids;
-      getBdgldiary(id).then((response) => {
+      getBdgldiary(id).then(response => {
         this.form = response.data;
         this.xunlian = response.data.weekworkRegisters;
-        for (var i = 0; i < this.xunlian.length; i++) {
-          this.xunlian[i].centertext =
-            this.xunlian[i].startTime +
-            "-" +
-            this.xunlian[i].endTime +
-            "  " +
-            this.xunlian[i].contents +
-            "(" +
-            this.xunlian[i].organizer +
-            ")";
+        if (this.xunlian) {
+          for (var i = 0; i < this.xunlian.length; i++) {
+            this.xunlian[i].centertext =
+              this.xunlian[i].startTime +
+              "-" +
+              this.xunlian[i].endTime +
+              "  " +
+              this.xunlian[i].contents +
+              "(" +
+              this.xunlian[i].organizer +
+              ")";
+          }
+        } else {
+          this.xunlian = [
+            {
+              dateline: null,
+              contents: null,
+              shouldArrive: null,
+              realTo: null,
+              percentage: null,
+              organizer: null
+            }
+          ];
         }
+
         // 请求人员
         this.getRenYuan(this.form.unitId);
         //  请求首长
@@ -1483,7 +1503,7 @@ export default {
       this.opens = false;
       this.statusShen = false;
       const id = row.id || this.ids;
-      getBdgldiary(id).then((response) => {
+      getBdgldiary(id).then(response => {
         this.wordInfo = response.data;
         this.title = "查看要事日记";
         this.menuRoleVisible = true;
@@ -1493,7 +1513,7 @@ export default {
     /** 提交按钮 */
     submitForm(style) {
       this.style = style;
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (
             (this.relatives[0].name ||
@@ -1512,7 +1532,7 @@ export default {
             this.form.inspect = this.checkShop;
           }
           if (this.form.id != null) {
-            updateBdgldiary(this.form).then((response) => {
+            updateBdgldiary(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -1534,7 +1554,7 @@ export default {
             }
             // 训练计划
             this.form.weekworkRegisters = this.xunlian;
-            addBdgldiary(this.form).then((response) => {
+            addBdgldiary(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -1560,7 +1580,7 @@ export default {
       this.$modal
         // .confirm('是否确认删除要事日记编号为"' + ids + '"的数据项？')
         .confirm("是否确认删除该数据？")
-        .then(function () {
+        .then(function() {
           return delBdgldiary(ids);
         })
         .then(() => {
@@ -1578,13 +1598,13 @@ export default {
           this.exportLoading = true;
           return exportBdgldiary(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
         .catch(() => {});
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -1661,7 +1681,7 @@ export default {
   font-size: 14px;
   color: #fff;
   /* padding: 0 12px 0 0; */
-  margin-left: -30px;
+  margin-left: -55px;
 }
 ::v-deep .btn {
   width: 76px;

src/views/medicalhealth/recuperate/index.vue

@@ -383,10 +383,16 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
-        width="150"
+        width="190"
         fixed="right"
       >
         <template slot-scope="scope">
+          <el-button
+            size="btk"
+            type="text"
+            @click="handleshenpi1(scope.row)"
+            >审批</el-button
+          >
           <el-button
             size="btu"
             type="text"
@@ -483,16 +489,16 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="一级审批单位" prop="remark">
+        <el-form-item label="一级审批单位" prop="unitId1">
           <treeselect
             v-model="form.unitId1"
             :options="deptOptions"
             placeholder="请选择单位"
-            @select="selectPeo"
+            @select="selectPeo2"
           />
         </el-form-item>
-        <el-form-item label="一级审批人" prop="unitId1">
-          <el-input v-model="form.unitId1" placeholder="请输入备注" />
+        <el-form-item label="一级审批人" prop="peopleId1">
+          <el-input v-model="form.peopleId1" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="二级审批单位" prop="unitId2">
           <!-- <el-input v-model="form.unitId2" placeholder="请输入备注" /> -->
@@ -500,19 +506,19 @@
             v-model="form.unitId2"
             :options="deptOptions"
             placeholder="请选择单位"
-            @select="selectPeo"
+            @select="selectPeo3"
           />
         </el-form-item>
-        <el-form-item label="二级审批人" prop="unitId3">
-          <el-input v-model="form.unitId3" placeholder="请输入备注" />
+        <el-form-item label="二级审批人" prop="peopleId2">
+          <el-input v-model="form.peopleId2" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="三级审批单位" prop="peopleId2">
+        <el-form-item label="三级审批单位" prop="unitId3">
           <!-- <el-input v-model="form.peopleId2" placeholder="请输入备注" /> -->
           <treeselect
             v-model="form.unitId3"
             :options="deptOptions"
             placeholder="请选择单位"
-            @select="selectPeo"
+            @select="selectPeo4"
           />
         </el-form-item>
         <el-form-item label="三级审批人" prop="peopleId3">
@@ -648,13 +654,31 @@ export default {
   methods: {
     // 人员姓名选中
     qingRen(name) {
-      this.form.peopleName = name;
+      this.$set(this.form, this.form.peopleName, name)
     },
     // 获取人员
     getRen(id) {
       getQuanBu(id).then((response) => {
         this.renYuan = response.data;
       });
+    },
+     // 获取人员
+    getRen2(id) {
+      getQuanBu(id).then((response) => {
+        this.renYuan = response.data;
+      });
+    },
+     // 获取人员
+    getRen3(id) {
+      getQuanBu(id).then((response) => {
+        this.renYuan = response.data;
+      });
+    },
+     // 获取人员
+    getRen4(id) {
+      getQuanBu(id).then((response) => {
+        this.renYuan = response.data;
+      });
     },
     // 选择部门单位触发
     selectPeo(data) {
@@ -662,6 +686,21 @@ export default {
       this.form.unitName = data.label;
       this.getRen(this.form.unitId, 0);
     },
+    selectPeo2(data) {
+      this.form.unitId1 = data.id;
+      this.form.unitName1 = data.label;
+      this.getRen(this.form.unitId, 0);
+    },
+    selectPeo3(data) {
+      this.form.unitId2 = data.id;
+      this.form.unitName2 = data.label;
+      this.getRen(this.form.unitId, 0);
+    },
+    selectPeo4(data) {
+      this.form.unitId3 = data.id;
+      this.form.unitName3 = data.label;
+      this.getRen(this.form.unitId, 0);
+    },
     // 获取部门列表
     getBuMeng() {
       getDept().then((res) => {
@@ -807,6 +846,12 @@ export default {
         })
         .catch(() => {});
     },
+    handleshenpi1(row){
+        console.log()
+        listRecuperate({common:row.common}).then(res=>{
+            console.log(res)
+        })
+    },
   },
 };
 </script>
@@ -899,10 +944,10 @@ export default {
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
   background-color: #004d86;
-  color: #fff;
+  color: #000;
 }
 .el-select-dropdown__item {
-  color: #fff;
+  color: #000;
 }
 /* 时间选择 */
 ::v-deep .el-input--small .el-input__inner {

src/views/peopleManage/people/index.vue

@@ -474,7 +474,7 @@
           <el-form-item>
             <!-- <el-button type="primary" size="btn" @click="handleQuery"
               >搜索</el-button
-            > -->
+            >-->
             <el-button size="btr" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
@@ -529,7 +529,7 @@
           <!-- <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"
-          ></right-toolbar> -->
+          ></right-toolbar>-->
         </el-row>
 
         <el-table
@@ -570,8 +570,18 @@
             </template>
           </el-table-column>
           <el-table-column label="命令号" align="center" prop="command" />-->
-          <el-table-column label="部职别" align="center" width="300" prop="duty" />
-          <el-table-column label="职务" align="center" width="120" prop="postId">
+          <el-table-column
+            label="部职别"
+            align="center"
+            width="300"
+            prop="duty"
+          />
+          <el-table-column
+            label="职务"
+            align="center"
+            width="120"
+            prop="postId"
+          >
             <template slot-scope="scope">
               <dict-tag
                 :options="dict.type.post_Level"
@@ -754,19 +764,19 @@
             width="200"
             fixed="right"
           >
-            <template slot-scope="scope"> 
+            <template slot-scope="scope">
               <el-button
                 size="btu"
                 type="text"
                 @click="handleUpdate(scope.row)"
-                v-hasPermi="['peopleManage:people:edit']" 
+                v-hasPermi="['peopleManage:people:edit']"
                 >修改</el-button
               >
               <el-button
                 size="btk"
                 type="text"
                 @click="handlesee(scope.row)"
-                v-hasPermi="['peopleManage:people:query']" 
+                v-hasPermi="['peopleManage:people:query']"
                 >查看</el-button
               >
               <el-button
@@ -1169,7 +1179,7 @@
             v-for="(item, index) in jtlist"
             :key="index"
           >
-            <el-form-item label="姓名">
+            <el-form-item label="姓名" prop="name">
               <el-input v-model="item.name" placeholder />
             </el-form-item>
             <el-form-item label="与本人关系" prop="characterRelationship">
@@ -1206,7 +1216,7 @@
             style="height: 36px; margin-left: 575px"
             v-if="index != 0"
             >删除</el-button
-          >  -->
+            >-->
           </el-row>
           <div class="jiben">培训经历</div>
           <el-form-item label prop="training">
@@ -1227,11 +1237,13 @@
           </el-form-item>
           <!-- <el-form-item label prop="readmeFile">
           <el-input v-model="form.readmeFile" type="textarea" placeholder />
-        </el-form-item>-->
+          </el-form-item>-->
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="btnflg" >确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="btnflg"
+          >确 定</el-button
+        >
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
@@ -1248,7 +1260,7 @@ import {
   exportPeople,
   getDept,
   listDept,
-  treeselect,
+  treeselect
 } from "@/api/peopleManage/people";
 
 export default {
@@ -1267,7 +1279,7 @@ export default {
     "bloodType",
     "sys_yes_no",
     "sys_yes_no",
-    "people_state",
+    "people_state"
   ],
   data() {
     return {
@@ -1358,7 +1370,7 @@ export default {
         userId: null,
         nowMilitaryRank: null,
         treatmentLevel: null,
-        rankUpgradeTime: null,
+        rankUpgradeTime: null
       },
       // 表单参数
       form: {},
@@ -1368,69 +1380,69 @@ export default {
         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]$/,
+            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",
-          },
+            trigger: "blur"
+          }
         ],
         nationId: [
-          { required: true, message: "民族不能为空", trigger: "blur" },
+          { required: true, message: "民族不能为空", trigger: "blur" }
         ],
         sex: [{ required: true, message: "性别不能为空", trigger: "blur" }],
         age: [{ required: true, message: "年龄不能为空", trigger: "blur" }],
         birthDate: [
-          { required: true, message: "出生年月不能为空", trigger: "blur" },
+          { required: true, message: "出生年月不能为空", trigger: "blur" }
         ],
         origin: [{ required: true, message: "籍贯不能为空", trigger: "blur" }],
         live: [
-          { required: true, message: "家庭住址不能为空", trigger: "blur" },
+          { required: true, message: "家庭住址不能为空", trigger: "blur" }
         ],
         partyId: [
-          { required: true, message: "政治面貌不能为空", trigger: "change" },
+          { required: true, message: "政治面貌不能为空", trigger: "change" }
         ],
         healthy: [
-          { required: true, message: "健康情况不能为空", trigger: "change" },
+          { required: true, message: "健康情况不能为空", trigger: "change" }
         ],
         marryList: [
-          { required: true, message: "婚姻情况不能为空", trigger: "change" },
+          { required: true, message: "婚姻情况不能为空", trigger: "change" }
         ],
         educationId: [
-          { required: true, message: "学历不能为空", trigger: "change" },
+          { required: true, message: "学历不能为空", trigger: "change" }
         ],
         admissionTime: [
-          { required: true, message: "入学时间不能为空", trigger: "change" },
+          { required: true, message: "入学时间不能为空", trigger: "change" }
         ],
         graduationDate: [
-          { required: true, message: "毕业时间不能为空", trigger: "change" },
+          { required: true, message: "毕业时间不能为空", trigger: "change" }
         ],
         school: [
-          { required: true, message: "毕业学校不能为空", trigger: "blur" },
+          { 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",
-          },
+            trigger: "blur"
+          }
         ],
         phoneStandby: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         enlistDate: [
-          { required: true, message: "入伍时间不能为空", trigger: "change" },
+          { required: true, message: "入伍时间不能为空", trigger: "change" }
         ],
         authorizedStrength: [
-          { required: true, message: "是否编制不能为空", trigger: "change" },
+          { required: true, message: "是否编制不能为空", trigger: "change" }
         ],
         deptId: [
-          { required: true, message: "单位不能为空", trigger: "change" },
+          { required: true, message: "单位不能为空", trigger: "change" }
         ],
+        name: [{ required: true, message: "亲属姓名不能为空", trigger: "blur" }]
         // jtname:[{ validator: jtnameblur, trigger: "blur" }],
         // characterRelationship: [
         //   { required: true, message: "与本人关系必填一个", trigger: "blur" }
@@ -1479,79 +1491,79 @@ export default {
           name: null,
           characterRelationship: null,
           phoneNumber: null,
-          unitName: null,
-        },
+          unitName: null
+        }
       ],
       defaultProps: {
         children: "children",
-        label: "label",
+        label: "label"
       },
       deptOptions: [],
       value: null,
-      btnflg:false
+      btnflg: false
     };
   },
   created() {
     this.getList();
     //性别
-    this.getDicts("sys_user_sex").then((response) => {
+    this.getDicts("sys_user_sex").then(response => {
       this.sexList = response.data;
     });
     //血型
-    this.getDicts("bloodType").then((response) => {
+    this.getDicts("bloodType").then(response => {
       this.bloodType = response.data;
     });
     //政治面貌
-    this.getDicts("Caucus").then((response) => {
+    this.getDicts("Caucus").then(response => {
       this.partyIds = response.data;
     });
     //健康情况
-    this.getDicts("healthy").then((response) => {
+    this.getDicts("healthy").then(response => {
       this.healthy = response.data;
     });
     //婚姻情况
-    this.getDicts("marryList").then((response) => {
+    this.getDicts("marryList").then(response => {
       this.marryList = response.data;
     });
     //学历
-    this.getDicts("Degree_level").then((response) => {
+    this.getDicts("Degree_level").then(response => {
       this.educationId = response.data;
     });
     //婚姻情况
-    this.getDicts("degree").then((response) => {
+    this.getDicts("degree").then(response => {
       this.degree = response.data;
     });
     //是否编制
-    this.getDicts("sys_yes_no").then((response) => {
+    this.getDicts("sys_yes_no").then(response => {
       this.authorizedStrength = response.data;
     });
     //子女情况
-    this.getDicts("sys_yw").then((response) => {
+    this.getDicts("sys_yw").then(response => {
       this.childrenList = response.data;
     });
     //人员类别
-    this.getDicts("personnel_type").then((response) => {
+    this.getDicts("personnel_type").then(response => {
       this.classId = response.data;
     });
     //职务层级
-    this.getDicts("post_Level").then((response) => {
+    this.getDicts("post_Level").then(response => {
       this.postIds = response.data;
     });
     //军衔
-    this.getDicts("sys_user_rank").then((response) => {
+    this.getDicts("sys_user_rank").then(response => {
       this.rankIds = response.data;
     });
     //民族
-    this.getDicts("sys_familyName").then((response) => {
+    this.getDicts("sys_familyName").then(response => {
       this.nationIds = response.data;
     });
     //部门数据
-    getDept().then((res) => {
+    getDept().then(res => {
       if (res.code == 200) {
         this.unitId = res.data;
       }
     });
-    treeselect().then((res) => {
+    treeselect().then(res => {
       console.log(res);
       if (res.code == 200) {
         this.deptOptions = res.data;
@@ -1562,7 +1574,7 @@ export default {
     //单位翻译
     deptIdformatter(row, column) {
       var deptName = "";
-      this.unitId.map((item) => {
+      this.unitId.map(item => {
         if (item.deptId == row.deptId) {
           deptName = item.deptName;
         }
@@ -1572,7 +1584,7 @@ export default {
     /** 查询人员管理列表 */
     getList() {
       this.loading = true;
-      listPeople(this.queryParams).then((response) => {
+      listPeople(this.queryParams).then(response => {
         this.peopleList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1650,7 +1662,7 @@ export default {
         rankUpgradeTime: null,
         phoneStandby: null,
         deptName: null,
-        isBianzhi: null,
+        isBianzhi: null
       };
       this.bdglPeopleList = [];
       this.resetForm("form");
@@ -1667,7 +1679,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -1676,13 +1688,13 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加人员管理";
-      this.btnflg=true;
-      this.jtlist= [
+      this.btnflg = true;
+      this.jtlist = [
         {
           name: null,
           characterRelationship: null,
           phoneNumber: null,
-          unitName: null,
+          unitName: null
         }
       ];
     },
@@ -1690,41 +1702,67 @@ export default {
     handlesee(row) {
       this.reset();
       const id = row.id || this.ids;
-      getPeople(id).then((response) => {
+      getPeople(id).then(response => {
         this.form = response.data;
         this.jtlist = response.data.familyInformation;
+        //家庭人员判空处理
+        if (this.form.familyInformation.length > 0) {
+          this.jtlist = response.data.familyInformation;
+        } else {
+          this.jtlist = [
+            {
+              name: null,
+              characterRelationship: null,
+              phoneNumber: null,
+              unitName: null
+            }
+          ];
+        }
         this.bdglPeopleList = response.data.bdglPeopleList;
         this.open = true;
         this.title = "查看人员管理";
-        this.btnflg=false;
+        this.btnflg = false;
       });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getPeople(id).then((response) => {
+      getPeople(id).then(response => {
         this.form = response.data;
-        this.jtlist = response.data.familyInformation;
+        //家庭人员判空处理
+        if (this.form.familyInformation.length > 0) {
+          this.jtlist = response.data.familyInformation;
+        } else {
+          this.jtlist = [
+            {
+              name: null,
+              characterRelationship: null,
+              phoneNumber: null,
+              unitName: null
+            }
+          ];
+        }
+
         this.bdglPeopleList = response.data.bdglPeopleList;
         this.open = true;
         this.title = "修改人员管理";
-        this.btnflg=true;
+        this.btnflg = true;
       });
     },
     /** 提交按钮 */
     submitForm() {
       // console.log(this.form.laborContractUploading)
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
-           if (this.form.readmeFile) {
+          if (this.form.readmeFile) {
             this.form.readmeFile = this.form.readmeFile[0].name;
           }
           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) => {
+            updatePeople(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -1732,7 +1770,7 @@ export default {
           } else {
             this.form.familyInformation = this.jtlist;
             this.form.deptName = this.$refs["deptId"].selectedLabel;
-            addPeople(this.form).then((response) => {
+            addPeople(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -1746,7 +1784,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除人员管理的数据项？")
-        .then(function () {
+        .then(function() {
           return delPeople(ids);
         })
         .then(() => {
@@ -1830,14 +1868,14 @@ export default {
       } else {
         const bdglPeopleList = this.bdglPeopleList;
         const checkedBdglPeople = this.checkedBdglPeople;
-        this.bdglPeopleList = bdglPeopleList.filter(function (item) {
+        this.bdglPeopleList = bdglPeopleList.filter(function(item) {
           return checkedBdglPeople.indexOf(item.index) == -1;
         });
       }
     },
     /** 复选框选中数据 */
     handleBdglPeopleSelectionChange(selection) {
-      this.checkedBdglPeople = selection.map((item) => item.index);
+      this.checkedBdglPeople = selection.map(item => item.index);
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1848,7 +1886,7 @@ export default {
           this.exportLoading = true;
           return exportPeople(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -1860,7 +1898,7 @@ export default {
         name: null,
         characterRelationship: null,
         phoneNumber: null,
-        unitName: null,
+        unitName: null
       });
     },
     //删除家庭成员
@@ -1881,16 +1919,16 @@ export default {
         this.form.idcard.substr(12, 2);
       var myDate = new Date();
       this.form.age = myDate.getFullYear() - this.form.idcard.substr(6, 4);
-      listPeople({idcard:this.form.idcard}).then((response)=>{
-            console.log()
-            if(response.rows.length>0){
-                this.form.idcard=null;
-                this.form.age=null;
-                this.form.birthDate=null;
-                this.form.sex=null;
-                this.$modal.msgError("该人员已存在，无需重复添加");
-            }
-      })
+      listPeople({ idcard: this.form.idcard }).then(response => {
+        console.log();
+        if (response.rows.length > 0) {
+          this.form.idcard = null;
+          this.form.age = null;
+          this.form.birthDate = null;
+          this.form.sex = null;
+          this.$modal.msgError("该人员已存在，无需重复添加");
+        }
+      });
     },
     // 筛选节点
     filterNode(value, data) {
@@ -1901,8 +1939,8 @@ export default {
     handleNodeClick(data) {
       this.queryParams.deptId = data.id;
       this.getList();
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped>