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

liuyg

2021-11-30 00dc96f9ac5defece02f3634b701c0d3987142ad

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

 src/views/securityGuard/securityGuard.vue

@@ -1754,12 +1754,15 @@
        var data = {
          cardid: this.search.cardid,
          deptId: this.search.deptId,
          roleAlias:"111",
          hold: this.search.hold,
          realName: this.search.realName,
          securitynumber: this.search.securitynumber,
          status: this.search.status,
          userType: this.search.startTime,
          examinationType:this.search.examinationType
        };
        // console.log(data,123456);
        //导出
        if (this.userInfo.role_name == "保安公司管理员") {
          //如果是保安公司管理员