diff --git a/jshERP-web/src/views/system/modules/DepotModal.vue b/jshERP-web/src/views/system/modules/DepotModal.vue index 0ce8d69d..8a8fdaba 100644 --- a/jshERP-web/src/views/system/modules/DepotModal.vue +++ b/jshERP-web/src/views/system/modules/DepotModal.vue @@ -39,7 +39,7 @@ - + diff --git a/jshERP-web/src/views/system/modules/RoleModal.vue b/jshERP-web/src/views/system/modules/RoleModal.vue index f02c8be9..cd4c8e6d 100644 --- a/jshERP-web/src/views/system/modules/RoleModal.vue +++ b/jshERP-web/src/views/system/modules/RoleModal.vue @@ -27,7 +27,7 @@ - + diff --git a/jshERP-web/src/views/system/modules/UserModal.vue b/jshERP-web/src/views/system/modules/UserModal.vue index a05a6e51..679b8b91 100644 --- a/jshERP-web/src/views/system/modules/UserModal.vue +++ b/jshERP-web/src/views/system/modules/UserModal.vue @@ -49,7 +49,7 @@ - + @@ -116,8 +116,6 @@ } }, created () { - this.loadOrgaData() - this.loadRoleData() const token = Vue.ls.get(ACCESS_TOKEN); this.headers = {"X-Access-Token":token} }, @@ -126,13 +124,14 @@ this.edit({}); }, edit (record) { - let that = this; - that.form.resetFields(); - that.userId = record.id; - that.visible = true; - that.model = Object.assign({}, record); - that.$nextTick(() => { - that.form.setFieldsValue(pick(this.model,'loginName','username','roleId','orgaId','position', + this.loadOrgaData() + this.loadRoleData() + this.form.resetFields(); + this.userId = record.id; + this.visible = true; + this.model = Object.assign({}, record); + this.$nextTick(() => { + this.form.setFieldsValue(pick(this.model,'loginName','username','roleId','orgaId','position', 'phonenum','email','userBlngOrgaDsplSeq','description')) }); },