diff --git a/src/api/api.js b/src/api/api.js index f9804607..fcb1e090 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -20,6 +20,8 @@ const checkOnlyUser = (params) => getAction('/sys/user/checkOnlyUser', params) const changePassword = (params) => postAction('/sys/user/changePassword', params) // 单点登录获取用户信息 const getSSOUserInfo = (params) => postAction('/iam/loginByOauth2', params) +// 上传手写章 +const uploadHandStamp = (params) => postAction('/sys/user/uploadHandStamp', params) // 权限管理 const addPermission = (params) => postAction('/sys/permission/add', params) @@ -221,6 +223,7 @@ export { getEnterpriseLevelMapList, getSSOUserInfo, + uploadHandStamp, addAsmsInterface, editAsmsInterface, diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 30e23c37..a69ae7cf 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -259,7 +259,8 @@ module.exports = { enterMailboxCorrect: '请输入正确格式的邮箱', userExists: '用户名已存在', workNoExists: '工号已存在', - handStamp: '手写章' + handStamp: '手写章', + uploadHandStamp:'上传手写章' }, // 高级查询 superQuery: { diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue index 54626222..7b915eae 100644 --- a/src/views/system/UserList.vue +++ b/src/views/system/UserList.vue @@ -74,7 +74,7 @@
{{ toggleSearchStatus ? $t('putAway') : $t('open') }} - + {{ $t('query') }} {{ $t('reset') }} @@ -85,28 +85,28 @@
- {{ $t('user.addUser') }} + {{ $t('user.addUser') }} {{ $t('export') }} {{ $t('recycleBin') }} {{ $t('user.roleAllocation') }} - + {{ $t('delete') }} - + {{ $t('user.frozen') }} - + {{ $t('user.thaw') }} {{ $t('batchOperation') }} - + @@ -129,12 +129,12 @@
@@ -183,12 +185,16 @@ - + - - - + + + + @@ -204,6 +210,7 @@ import JInput from '@/components/jero/JInput' import UserRecycleBinModal from './modules/UserRecycleBinModal' import JTable from '@/components/jero/JTable' import JSearchSelectTag from '@/components/dict/JSearchSelectTag' +import UploadHandStampModal from './modules/UploadHandStampModal' export default { name: 'UserList', @@ -215,12 +222,13 @@ export default { JInput, UserRecycleBinModal, JTable, - JSearchSelectTag + JSearchSelectTag, + UploadHandStampModal }, data () { return { // 是否开发环境(线上需隐藏按钮) - isDev: process.env.VUE_APP_TAG_FLAG === '0', + isDev: process.env.VUE_APP_TAG_FLAG !== '0', description: this.$t('user.freezePasManagementPage'), queryParam: {}, recycleBinVisible: false, @@ -446,6 +454,13 @@ export default { rolevisibleMethods () { this.onClearSelected() this.selectedRowKeys = [] + }, + /** + * 上传手写章 + * @param record + */ + handleUploadHandStamp (record) { + this.$refs.uploadHandStampModal.edit(record) } } @@ -453,6 +468,7 @@ export default {