ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 用户管理新增手写章字段，在线编辑新增流程id参数

Browse Source
This commit is contained in:
赵霄
2024-01-31 17:41:48 +08:00
parent db483f977a
commit 538a067e4a
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/lang/zh-cn.js
+2 -1
View File
@@ -257,7 +257,8 @@ module.exports = {
mailboxExists: '邮箱已存在', mailboxExists: '邮箱已存在',
enterMailboxCorrect: '请输入正确格式的邮箱', enterMailboxCorrect: '请输入正确格式的邮箱',
userExists: '用户名已存在', userExists: '用户名已存在',
workNoExists: '工号已存在' workNoExists: '工号已存在',
handStamp: '手写章'
}, },
// 高级查询 // 高级查询
superQuery: { superQuery: {
src/utils/onlyOfficeUtils.js
+2 -1
View File
@@ -74,7 +74,8 @@ export const onlineEditor = async (params, fileId) => {
standEnName: params.standard_english_name, standEnName: params.standard_english_name,
issueTime: params.release_date, issueTime: params.release_date,
putTime: params.implementation_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)}` 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') window.open(url, '_blank')
src/views/system/modules/UserModal.vue
+10 -9
View File
@@ -114,14 +114,15 @@
</j-multi-select-tag> </j-multi-select-tag>
</a-form-model-item> </a-form-model-item>
<!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ --> <!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
<!-- <a-form-model-item :label="$t('user.heads')" :labelCol="labelCol" :wrapperCol="wrapperCol">--> <!--手写章，用于企标制修订流程最后一个节点在线编辑的手写章信息维护-->
<!-- <j-image-upload class="avatar-uploader"--> <a-form-model-item :label="$t('user.handStamp')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- :text="$t('upload')"--> <j-image-upload class="avatar-uploader"
<!-- v-model="model.avatar"--> :text="$t('upload')"
<!-- :disabled="disableSubmit"--> v-model="model.avatar"
<!-- :number=1--> :disabled="disableSubmit"
<!-- accept='.png,.PNG,.jpg,.JPG'></j-image-upload>--> :number=1
<!-- </a-form-model-item>--> accept='.png,.PNG,.jpg,.JPG'></j-image-upload>
</a-form-model-item>
<a-form-model-item :label="$t('user.gender')" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-model-item :label="$t('user.gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select v-model="model.sex" <a-select v-model="model.sex"
@@ -201,7 +202,7 @@ export default {
pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/, pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
message: this.$t('user.passwordConsists') message: this.$t('user.passwordConsists')
}, },
{ validator: this.validateToNextPassword, trigger: 'change' }], { validator: this.validateToNextPassword, trigger: 'change' }],
confirmpassword: [{ required: true, message: this.$t('user.reenterLoginPassword') }, confirmpassword: [{ required: true, message: this.$t('user.reenterLoginPassword') },
{ validator: this.compareToFirstPassword }], { validator: this.compareToFirstPassword }],
realname: [{ required: true, message: this.$t('pleaseEnter') + this.$t('user.userName') }], realname: [{ required: true, message: this.$t('pleaseEnter') + this.$t('user.userName') }],