Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys

shuishen

2021-11-25 3f5c1ae2cfbe8d29eb11e0ac88abceaa7d6906f2

 src/views/securityGuardManagement/register.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: liu
 * @Last Modified time: 2021-09-23 17:29:29
 * @Last Modified time: 2021-11-25 09:42:36
 * menu-name 保安员注册查询
 */
<template>
@@ -587,7 +587,18 @@

            display: false,
          },

          {
            label: "照片",
            prop: "avatar",
            dataType: "string",
            type: "img",
          },
          {
            label: "指纹",
            prop: "fingerprint",
            dataType: "string",
            type: "img",
          },
          {
            label: "籍贯",
            prop: "nativeplace",
@@ -619,6 +630,11 @@
            display: false,
          },
          {
            label: "身高",
            prop: "height",
            width: 55,
          },
          {
            label: "学历",
            prop: "education",
            display: false,
@@ -646,6 +662,12 @@
            display: false,
          },
          {
            label: "地址",
            prop: "nativeplace",
            minWidth: 95,
            overHidden: true,
          },
          {
            label: "健康状态",
            prop: "healstats",
            hide: true,