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

liuyg

2021-07-10 8ef98bfd45d97a4c7d494d5a4e51b573df8da268

 src/views/securityGuard/securityGuardDetail.vue

@@ -38,17 +38,17 @@
      optionTABS: {
        column: [
          {
            icon: "el-icon-info",
            // icon: "el-icon-info",
            label: "保安员入职登记基本信息",
            prop: "tab1",
          },
          {
            icon: "el-icon-info",
            // icon: "el-icon-info",
            label: "从业记录",
            prop: "tab2",
          },
          {
            icon: "el-icon-info",
            // icon: "el-icon-info",
            label: "现实表现记录",
            prop: "tab3",
          },
@@ -168,7 +168,7 @@
      for (var k in row) {
        this.obj0[k] = row[k];
      }
      this.obj0.title = row.name + "基本信息";
      this.obj0.title = "";
      this.cardid = row.cardid;
      this.name = row.name;
      this.dispatcherCompany = row.dispatcherCompany;