Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

zhengpz

2021-08-30 b590d6372be2501ce9b42bcc20084031285e3985

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

 src/views/securityGuardManagement/register.vue

@@ -1,8 +1,8 @@
/*
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-07-10 15:41:13
 * @Last Modified by: liu
 * @Last Modified time: 2021-08-30 11:45:26
 * menu-name 保安员注册查询
 */
<template>
@@ -716,13 +716,14 @@
    honor(row) {
      this.objf = {};
      //打开荣誉录入
      console.log(this.objf);
      this.objf = {
        cardid: row.cardid,
        name: row.name,
        name: row.realName,
        honor: "",
        honortime: "",
      };
      console.log(this.objf);
      console.log(row);
      this.dialogVisible = true;
    },
    nodeClick(data) {