diff --git a/src/pages/src/components/catalog/home/ImportUser.vue b/src/pages/src/components/catalog/home/ImportUser.vue index 2226e491b..0d8caa368 100644 --- a/src/pages/src/components/catalog/home/ImportUser.vue +++ b/src/pages/src/components/catalog/home/ImportUser.vue @@ -48,6 +48,13 @@ {{$t('仅支持xls、xlsx格式文件')}} {{$t('下载模板')}}

+

+ + 允许对同名用户覆盖更新 + + +

@@ -69,6 +76,7 @@ export default { name: '', size: '', type: false, + isOverwrite: false, }, }; }, @@ -116,6 +124,7 @@ export default { name: '', size: '', type: false, + isOverwrite: false, }; }, // 上传 @@ -307,4 +316,12 @@ export default { cursor: pointer; } } + +.tip-wrapper { + margin-top: 10px; + .tip-icon { + display: inline-block; + transform: translateY(4px); + } +} diff --git a/src/pages/src/store/modules/catalog.js b/src/pages/src/store/modules/catalog.js index e51dbece8..c6592eb97 100644 --- a/src/pages/src/store/modules/catalog.js +++ b/src/pages/src/store/modules/catalog.js @@ -78,7 +78,7 @@ export default { }, // eslint-disable-next-line no-unused-vars ajaxImportUser(_context, params, _config = {}) { - return http.post(`api/v1/web/categories/${params.id}/operations/sync_or_import/`, params.data); + return http.post(`api/v1/web/categories/${params.id}/operations/sync_or_import/?is_overwrite=${params.isOverwrite}`, params.data); // const mockUrl = `?mock-file=catalog` // return http.get(mockUrl, config) }, diff --git a/src/pages/src/views/audit/index.vue b/src/pages/src/views/audit/index.vue index 2711e553a..12a48e417 100644 --- a/src/pages/src/views/audit/index.vue +++ b/src/pages/src/views/audit/index.vue @@ -39,7 +39,7 @@ v-if="panelActive === 'operate'" class="king-input-search" style="width: 400px;" - :placeholder="$t('搜索操作人员、操作对象、操作类型')" + :placeholder="$t('搜索操作用户、操作对象、操作类型')" :clearable="true" :left-icon="'bk-icon icon-search'" @clear="handleClear" @@ -71,6 +71,7 @@