From 6f9ad0cd9306d3b3a3900dec5b79cd05c667a379 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Tue, 26 Jul 2022 12:37:39 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E4=BA=BA=E7=9A=84=E5=BC=BA=E5=88=B6=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ParameterItemCollectionList.vue                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 8c73836da..9ed4581f4 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -198,7 +198,7 @@
             </div>
             <!--      强制撤回-->
             <div @click="compulsoryWithdrawaljurisdiction" class="operator-text"
-                 v-if='currentPersonRole == "homo" || currentPersonRole == "sdt" ||currentPersonRole == "dre"'>
+                 v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
               <a-icon type="delete"/>
               {{$t('CompulsoryWithdrawal')}}
             </div>

From 4d523eddd8f97eb5e3997d26e06ff1f974e53261 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Tue, 26 Jul 2022 15:18:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../document/service/impl/BussDocumentLibraryEOServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index a56b95bbc..55d9aa986 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -3189,7 +3189,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 //您订阅的XXX已被修改
                 content = "In the "+category + " " + serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
                 String contentInfo = "In the "+category + " " + href+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
-                String msgTitle = serialNumber + " you subsribed to has been updated";
+                String msgTitle = serialNumber + " you subscribed to has been updated";
                 //封装消息的实体类
                 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, msgTitle, content, contentInfo,MessageTypeEnum.READ.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);

From 87de9dabe53958b611cd5e855ebac0c8c8fbab27 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 26 Jul 2022 16:43:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/RetrieveFilesList.vue          | 35 ++++++++++++++-----
 .../documentTranslation/index.vue             |  1 +
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
index 985d82608..b4883eed1 100644
--- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
@@ -42,7 +42,7 @@
       <a-table
         :columns="columns"
         rowKey="id"
-        :scroll="{x: '100%',y:'calc(100vh - 430px)'}"
+        :scroll="{x: '100%',y:'calc(100vh - 440px)'}"
         :data-source="dataList"
         :pagination="false"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
@@ -68,7 +68,7 @@
               <span class="Required-One">*</span>
               <span class="title-text-text-One" :title="$t('translationLanguage')">{{$t('translationLanguage')}}</span>
             </div>
-            <a-form-model-item class="itemModel-One" style="width: calc(50% - 20px)" prop="translationLanguage">
+            <a-form-model-item class="itemModel-One" style="width: calc(50% - 20px)" prop="sourceLanguage">
               <j-dict-select-tag class="box-input" v-model="formInline.sourceLanguage"
                                  @input="handleInput('sourceLanguage')"
                                  :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
@@ -78,7 +78,7 @@
             <span class="text-icon-One">
                   <a-icon type="arrow-right" style="font-size: 20px"/>
               </span>
-            <a-form-model-item class="itemModel-One" style="width: calc(50% - 20px)" prop="translationLanguageOne">
+            <a-form-model-item class="itemModel-One" style="width: calc(50% - 20px)" prop="targetLanguage">
               <j-dict-select-tag class="box-input" v-model="formInline.targetLanguage"
                                  @input="handleInput('targetLanguage')"
                                  :placeholder="$t('PleaseSelect')+$t('translationLanguage')"
@@ -111,14 +111,14 @@
         selectedRowKeys: [],
         formInline: {},
         rules: {
-          translationLanguage: [
+          sourceLanguage: [
             {
               required: true,
               message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
           ],
-          translationLanguageOne: [
+          targetLanguage: [
             {
               required: true,
               message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
@@ -191,6 +191,9 @@
         this.queryParam = {}
         this.selectedRowKeys = []
         this.replacePage()
+        this.$nextTick(() => {
+          this.$refs.ruleForm.clearValidate()
+        })
       },
       searchQuery() {
         this.pageNo = 1
@@ -216,7 +219,7 @@
         let query = {
           pageNo: pageNo + '',
           pageSize: pageSize + '',
-          type: 'pdf',
+          type: 'doc',
           ...this.queryParam
         }
         this.loading = true
@@ -249,9 +252,25 @@
         if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
           this.$refs.ruleForm.validate(valid => {
             if (valid) {
+              let query = {
+                ...this.formInline,
+                serialNumber: this.selectedRowKeysRecord[0].serial_number,
+                title: this.selectedRowKeysRecord[0].title,
+                fileName: this.selectedRowKeysRecord[0].file_name,
+                textStatus: this.selectedRowKeysRecord[0].text_info_id
+              }
               this.confirmLoading = true
-              let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-              this.visible = false
+              postAction('/docTranslation/docTranslationEO/add', query).then((res) => {
+                if (res.success) {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  this.visible = false
+                  this.confirmLoading = false
+                  this.$emit('RetrieveFilesListForm')
+                } else {
+                  this.$message.warning(this.$t('operationFailed'))
+                  this.confirmLoading = false
+                }
+              })
             }
           })
         } else {
diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue
index 2c3b82588..367a303da 100644
--- a/jero-web/src/views/documentTools/documentTranslation/index.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/index.vue
@@ -222,6 +222,7 @@
         this.getList()
       },
       RetrieveFilesListForm() {
+        this.pageNo = 1
         this.getList()
       },
       handleToggleSearch() {