Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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);

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))
+              postAction('/docTranslation/docTranslationEO/add', query).then((res) => {
-              this.visible = false
+                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 {

jero-web/src/views/documentTools/documentTranslation/index.vue

@@ -222,6 +222,7 @@
         this.getList()
       },
       RetrieveFilesListForm() {
+        this.pageNo = 1
         this.getList()
       },
       handleToggleSearch() {

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>