diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 342777ea..78d5ca4f 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -257,7 +257,8 @@ module.exports = { mailboxExists: '邮箱已存在', enterMailboxCorrect: '请输入正确格式的邮箱', userExists: '用户名已存在', - workNoExists: '工号已存在' + workNoExists: '工号已存在', + handStamp: '手写章' }, // 高级查询 superQuery: { diff --git a/src/utils/onlyOfficeUtils.js b/src/utils/onlyOfficeUtils.js index 3fde92b3..6ef93350 100644 --- a/src/utils/onlyOfficeUtils.js +++ b/src/utils/onlyOfficeUtils.js @@ -74,7 +74,8 @@ export const onlineEditor = async (params, fileId) => { standEnName: params.standard_english_name, issueTime: params.release_date, putTime: params.implementation_date, - standardNumberPrefix: standardNumberPrefix + standardNumberPrefix: standardNumberPrefix, + processId: params.processId } const url = `${window._CONFIG.onlyOfficeUrl}/editorPage?filePath=${fileInfo.editFilePath}&fileName=${fileInfo.fileName}&fileType=${fileSuffix}&fileId=${fileInfo.id}&key=${fileInfo.id}&userId=${userInfo.id}&userName=${userInfo.realname}&business=${JSON.stringify(businessParams)}` window.open(url, '_blank') diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue index ad75aa04..1c754eeb 100644 --- a/src/views/system/modules/UserModal.vue +++ b/src/views/system/modules/UserModal.vue @@ -114,14 +114,15 @@ - - - - - - - - + + + + ?,./]).{8,}$/, message: this.$t('user.passwordConsists') }, - { validator: this.validateToNextPassword, trigger: 'change' }], + { validator: this.validateToNextPassword, trigger: 'change' }], confirmpassword: [{ required: true, message: this.$t('user.reenterLoginPassword') }, { validator: this.compareToFirstPassword }], realname: [{ required: true, message: this.$t('pleaseEnter') + this.$t('user.userName') }],