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

liuyg

2021-08-30 478947a847fb71c054ddb4cf1e2cf3ee83aeee77

 src/views/statisticalQueryManagement/securityGuardDetail.vue

@@ -95,8 +95,7 @@
            prop: "realName",
            search: true,
            searchSpan: 4,
            display: false,
            width: 78
            display: false
          },
          {
            label: "性别",
@@ -116,13 +115,12 @@
              }
            ],
            slot: true,
            display: false,
            width: 48
            display: false
          },
          {
            label: "保安公司",
            prop: "deptName",
            // width: 120,
            width: 300,
            // search: true,
            // searchSpan: 4,
            overHidden: true,
@@ -134,7 +132,8 @@
            prop: "securitynumber",
            display: false,
            searchSpan: 5,
            searchLabelWidth: 110
            searchLabelWidth: 110,
            width: 180
            // search: true,
          },
          {
@@ -142,37 +141,37 @@
            prop: "cardid",
            slot: true,
            display: false,
            width: 145
            width: 180
          },
          {
            label: "联系方式",
            prop: "phone",
            slot: true,
            display: false,
            width: 100
            width: 180
          },
          {
            label: "联系地址",
            prop: "address",
            slot: true,
            display: false,
            hide: true
          },
          // {
          //   label: "联系地址",
          //   prop: "address",
          //   slot: true,
          //   display: false,
          //   hide: true
          // },
          {
            label: "入职时间",
            prop: "rtime",
            slot: true,
            display: false,
            width: 82
            width: 180
          },
          {
            label: "所属角色",
            prop: "roleName",
            slot: true,
            display: false,
            width: 78,
            hide: true
          },
          // {
          //   label: "所属角色",
          //   prop: "roleName",
          //   slot: true,
          //   display: false,
          //   width: 78,
          //   hide: true
          // },

          // {
          //   label: "所属辖区",
@@ -213,7 +212,6 @@
            ],
            slot: true,
            display: false,
            width: 70
          },
          {
            label: "是否持证",
@@ -237,7 +235,6 @@
            ],
            slot: true,
            display: false,
            width: 70
          }
        ]
      },