diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue index 839bb42b..08abdbba 100644 --- a/jshERP-web/src/views/material/modules/MaterialModal.vue +++ b/jshERP-web/src/views/material/modules/MaterialModal.vue @@ -732,9 +732,9 @@ let params = {}; params.currentPage = 1; params.pageSize = 100; - getAction('/unit/list', params).then((res) => { + getAction('/unit/getAllList', params).then((res) => { if(res){ - that.unitList = res.data.rows; + that.unitList = res.data; } }) }, diff --git a/jshERP-web/src/views/system/AccountList.vue b/jshERP-web/src/views/system/AccountList.vue index 4ad00c3c..eb019ae7 100644 --- a/jshERP-web/src/views/system/AccountList.vue +++ b/jshERP-web/src/views/system/AccountList.vue @@ -38,6 +38,8 @@ 删除 + 启用 + 禁用 批量操作 @@ -70,6 +72,10 @@ +