Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-18 2402f7902663a20fe1b66f4305abb5ba05d7016f

 src/views/febs/system/role/Index.vue

@@ -222,7 +222,7 @@
        if (valid) {
          this.buttonLoading = true
          if (this.role.roleId) {
            this.role.menuIds = this.$refs.permsTree.getCheckedKeys().join(',')
            this.role.menuIds = this.$refs.permsTree.getCheckedKeys().concat(this.$refs.permsTree.getHalfCheckedKeys()).join(',')
            this.role.createTime = this.role.modifyTime = null
            this.$put('system/role', { ...this.role }).then(() => {
              this.buttonLoading = false
@@ -233,7 +233,7 @@
              this.reset()
            })
          } else {
            this.role.menuIds = this.$refs.permsTree.getCheckedKeys().join(',')
            this.role.menuIds = this.$refs.permsTree.getCheckedKeys().concat(this.$refs.permsTree.getHalfCheckedKeys()).join(',')
            this.$post('system/role', { ...this.role }).then(() => {
              this.buttonLoading = false
              this.$message({