Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-04-19 9094dea7cd9e45e4bb0a3d22a8dc1d682ca7463b

 src/views/security/security.vue

@@ -62,7 +62,8 @@
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: true,
          border: false,
          stripe: true,
          index: true,
          viewBtn: true,
          selection: true,
@@ -95,6 +96,23 @@
                message: "请输入名称",
                trigger: "blur"
              }]
            },
            {
              label: "所属部门",
              prop: "deptName"
            },
            {
              label: "在线状态",
              prop: "online_status",
              dicData: [{
                label: "离线",
                value: 0
              },
                {
                  label: "在线",
                  value: 1
                },
              ],
            },
            {
              label: "性别",
@@ -140,6 +158,7 @@
            {
              label: "创建时间",
              prop: "createTime",
              width:160,
              display: false,
              rules: [{
                required: true,