diff --git a/src/views/system/staff/index.vue b/src/views/system/staff/index.vue index c447dbf..b038a84 100644 --- a/src/views/system/staff/index.vue +++ b/src/views/system/staff/index.vue @@ -1261,9 +1261,9 @@ export default { }, reEmployment(row){ reEmployment(row.userId).then(response => { - if(response.data.code==200){ + if(response.code==200){ this.$modal.msgSuccess("重新入职成功"); - this.getList(); + this.getList(); }else{ this.$modal.msgError(response.data.msg); } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 6e91a5b..4b440e4 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -352,6 +352,7 @@ export default { status: undefined, deptId: undefined }, + columns:[], // 表单校验 rules: { userName: [ @@ -583,7 +584,7 @@ export default { for(var i=0;i