From 538a067e4a481a9391f765c632707ff9ae50cc4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 31 Jan 2024 17:41:48 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=8B=E5=86=99=E7=AB=A0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8Bid=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/zh-cn.js               |  3 ++-
 src/utils/onlyOfficeUtils.js           |  3 ++-
 src/views/system/modules/UserModal.vue | 19 ++++++++++---------
 3 files changed, 14 insertions(+), 11 deletions(-)

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 @@
           </j-multi-select-tag>
         </a-form-model-item>
         <!-- 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"-->
-        <!--                          :text="$t('upload')"-->
-        <!--                          v-model="model.avatar"-->
-        <!--                          :disabled="disableSubmit"-->
-        <!--                          :number=1-->
-        <!--                          accept='.png,.PNG,.jpg,.JPG'></j-image-upload>-->
-        <!--        </a-form-model-item>-->
+        <!--手写章，用于企标制修订流程最后一个节点在线编辑的手写章信息维护-->
+        <a-form-model-item :label="$t('user.handStamp')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-image-upload class="avatar-uploader"
+                          :text="$t('upload')"
+                          v-model="model.avatar"
+                          :disabled="disableSubmit"
+                          :number=1
+                          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-select v-model="model.sex"
@@ -201,7 +202,7 @@ export default {
           pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{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') }],