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

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java

@@ -170,6 +170,13 @@ public class CommonController {
 //                bizPath = "";
 //            }
         }
+        if(file.getOriginalFilename().length()>70){
+            if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+                throw new JeroBootException("文件名长度不能超过70位，请检查！");
+            }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                throw new JeroBootException("File name length cannot exceed 70 characters, please check!");
+            }
+        }
 //        OSSFile oSSFile = ossFileService.uploadLocal(file, bizPath,state,cut);
         OSSFile oSSFile = ossFileService.uploadLocalOfCos(file, bizPath,state,cut); // 切换cos
         if (oConvertUtils.isNotEmpty(oSSFile)) {
@@ -186,6 +193,10 @@ public class CommonController {
         return result;
     }
 
+    public static void main(String[] args) {
+
+    }
+
     /**
      * 查看已上传的文件
      * @param id

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java

@@ -88,11 +88,15 @@ public class TranslationDocumentUtils {
                     if(i == 0){
                         translateFrontTextSplit = translateFrontText.substring(0,splitLength);
                     }else {
+                        //每一次截取开始的下标
+                        int startSplitLength = i*(splitLength) + 1;
                         //如果长度不够根据splitLength再截取一次。
-                        if(translateFrontText.length() < i*splitLength+(splitLength+1)){
+                        if(translateFrontText.length() < i*splitLength+(splitLength)){
-                            translateFrontTextSplit = translateFrontText.substring(i*(splitLength + 1),translateFrontText.length());
+                            if(startSplitLength < translateFrontText.length()){
+                                translateFrontTextSplit = translateFrontText.substring(startSplitLength,translateFrontText.length());
+                            }
                         }else {
-                            translateFrontTextSplit = translateFrontText.substring(i*(splitLength + 1),i*splitLength+(splitLength+1));
+                            translateFrontTextSplit = translateFrontText.substring(startSplitLength,i*splitLength+(splitLength));
                         }
                     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -3550,7 +3550,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 //        List records = infoPage.getRecords();
         List records = bussDocumentLibraryEOMapper.ocrPageInfo(field, conditionSb.toString());
         page.setTotal(records.size());
-        records = records.subList(pageNo * pageSize - pageSize, pageNo * pageSize);
+
+        int subSize = pageSize; // 每页记录数
+        int subCount = records.size(); // 总记录数
+        int subPageTotal = (subCount / subSize) + ((subCount % subSize > 0) ? 1 : 0); //总页数
+
+        // 分页计算
+        int fromIndex = (pageNo-1) * subSize;
+        int toIndex = ((pageNo == subPageTotal) ? subCount : (pageNo * subSize));
+        if( fromIndex <= subCount && toIndex <= subCount) {
+            records = records.subList(fromIndex, toIndex);
+        } else {
+            records = new ArrayList();
+        }
+
 
         //数据字典
         List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();
@@ -3697,7 +3710,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         String cut = (String) parameter.get("cut");
         String flag = String.valueOf(parameter.get("flag"));
         //查询条件
-        StringBuilder conditionSb = new StringBuilder("where 1 = 1 and osf.connect_id is not null");
+        StringBuilder conditionSb = new StringBuilder("where 1 = 1");
 
         //过滤查询条件字段类型使用
         List<Map<String, Object>> mapList = queryCondition("1", cut, null);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java

@@ -113,7 +113,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
         removeByIds(ids);
 
         QueryWrapper deleteWrapper = new QueryWrapper();
-		deleteWrapper.lambda().in("laws_opinion_gather_id",ids);
+		deleteWrapper.in("laws_opinion_gather_id",ids);
         this.lawsOpinionAssessmentResultEOService.remove(deleteWrapper);
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java

@@ -140,7 +140,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
         removeByIds(ids);
 
         QueryWrapper deleteWrapper = new QueryWrapper();
-		deleteWrapper.lambda().in("laws_technology_evaluation_id",ids);
+		deleteWrapper.in("laws_technology_evaluation_id",ids);
         this.lawsTechnologyEvaluationFlowDetailEOService.remove(deleteWrapper);
 
         this.lawsTechnologyEvaluationItemResultEOService.remove(deleteWrapper);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java

@@ -887,7 +887,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		//生成页眉页脚
 		WordUtil.exportHeardAndFoot(document,moth);
 		//生成标题
-		WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18,
+		WordUtil.exportWord(document, "\r\n\r\n\r\n", null, ParagraphAlignment.CENTER, 0, 18,
 				false, true, "Blue Sky Noto Regular",null);
 		int oneCount = 1;
 

jero-web/src/components/SplitTable/index.vue

@@ -134,6 +134,10 @@
         this.getData()
         this.getTableList()
       })
+      if (this.$route.query.serial_number) {
+        this.searchParmes.serialNumber = this.$route.query.serial_number
+        this.searchParmes = { ...this.searchParmes }
+      }
       this.getData()
       this.getTableList()
       this.userData = this.userInfo()

jero-web/src/components/tableCollection/index.vue

@@ -33,7 +33,7 @@
            <span v-if='currentPersonRole === "homo"'>
 <!--           认证工程师  -->
            <span
-             v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "Wait Collect" || record.state == "Sdt Back" || record.state == "Change"'>
+             v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "To be collected" || record.state == "Rejected by eng. interface" || record.state == "Modify"'>
              <span
                @click='areaOfResponsibility(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}}</span>
            </span>
@@ -49,7 +49,7 @@
            <span v-if='currentPersonRole === "homo"'>
 <!--           认证工程师  -->
            <span
-             v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "Wait Collect" || record.state == "Sdt Back"'>
+             v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "To be collected" || record.state == "Rejected by eng. interface"'>
              <span :title='record.dataValue'
                @click='ondataValueTobe(record)'>{{ (record.dataValue  == null || record.dataValue  == 'undefined')? '--': record.dataValue }}</span>
            </span>
@@ -879,14 +879,14 @@
     border: none !important;
     padding: 0 !important;
   }
-  ::v-deep .ant-table-row:first-child {
+  //::v-deep .ant-table-row:first-child {
-    background: #fff!important;
+  //  background: #fff!important;
-    /*opacity: 0.9;*/
+  //  /*opacity: 0.9;*/
-  }
+  //}
-
+  //
-  ::v-deep .ant-table-body {
+  //::v-deep .ant-table-body {
-    background: transparent!important;
+  //  background: transparent!important;
-  }
+  //}
   .content-text {
     width: 100%;
     display: flex;

jero-web/src/store/modules/user.js

@@ -136,7 +136,7 @@ const user = {
           window._CONFIG['domianPreviewURL'] = Vue.ls.get('domianPreviewURL') + '/jero-boot'
           window._CONFIG['domianWebSocketURL'] = Vue.ls.get('domianWebSocketURL') + '/jero-boot'
           window._CONFIG['onlinePreviewDomainURL'] = Vue.ls.get('onlinePreviewDomainURL') + '/onlinePreview'
-          window._CONFIG['httpsOnlinePreviewDomainURL'] = Vue.ls.get('httpsOnlinePreviewDomainURL') + '/preview/onlinePreview'
+          window._CONFIG['httpsOnlinePreviewDomainURL'] = Vue.ls.get('httpsOnlinePreviewDomainURL') + '/onlinePreview'
           //Vue.ls.set(USER_AUTH,authData);
           sessionStorage.setItem(USER_AUTH, JSON.stringify(authData))
           sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData))

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue

@@ -234,6 +234,10 @@
           placeholder: '',
           theme: 'snow', // or 'bubble'
           modules: {
+            clipboard: {
+              // 粘贴版，处理粘贴时候带图片
+              matchers: [[Node.ELEMENT_NODE, this.handleCustomMatcher]],
+            },
             toolbar: {
               container: toolbarOptions, // 工具栏
               handlers: {
@@ -338,6 +342,18 @@
       quilleditorBlur() {
         this.$refs.ruleForm.validateField('content')
       },
+      handleCustomMatcher(node, Delta) {
+        let ops = []
+        Delta.ops.forEach(op => {
+          if (op.insert && typeof op.insert === 'string') {// 如果粘贴了图片，这里会是一个对象，如果是字符串则可以添加
+            ops.push({
+              insert: op.insert,
+            })
+          }
+        })
+        Delta.ops = ops
+        return Delta
+      },
       getBase() {
         getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => {
           if (res.success) {

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue

@@ -25,7 +25,7 @@
             <!--              {{$t('engineerFeedbackResults')}}-->
             <!--            </div>-->
             <a-card :bordered="false" class="box-clause" style="margin-top: 20px" v-for="(item,index) in dataSource">
-              <div class="table-operator">
+              <div class="table-operator" v-if="item.id">
                 <div class="operator-text" style="float: left;font-size: 16px">
                   {{$t('engineer')+item.createBy+$t('feedbackResults')}}
                 </div>
@@ -146,6 +146,11 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result || []
+            if (this.dataSource.length == 0) {
+              this.dataSource.push({
+                name: ''
+              })
+            }
             this.loading = false
           } else {
             this.dataSource = []

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -21,20 +21,23 @@
             <a-icon type="reload"/>
             {{$t('UpdateLog')}}
           </div>
-          <div @click="DocumentSplitting" v-has="'bussLog:page'" class="operator-text-text"
+          <div @click="DocumentSplitting" v-has="'bussLog:splitting'" class="operator-text-text"
                :title="$t('DocumentSplitting')">
             <a-icon type="codepen"/>
             {{$t('DocumentSplitting')}}
           </div>
-          <div @click="UpdateLog" v-has="'bussLog:page'" class="operator-text-text" :title="$t('DocumentTranslation')">
+          <div @click="DocumentTranslationClick" v-has="'bussLog:translation'" class="operator-text-text"
+               :title="$t('DocumentTranslation')">
             <a-icon type="file-pdf"/>
             {{$t('DocumentTranslation')}}
           </div>
-          <div @click="UpdateLog" v-has="'bussLog:page'" class="operator-text-text" :title="$t('DocumentComparison')">
+          <div @click="DocumentComparisonClick" v-has="'bussLog:comparison'" class="operator-text-text"
+               :title="$t('DocumentComparison')">
             <a-icon type="wallet"/>
             {{$t('DocumentComparison')}}
           </div>
-          <div @click="UpdateLog" v-has="'bussLog:page'" class="operator-text-text" :title="$t('KnowledgeDatabase')">
+          <div @click="KnowledgeDatabaseClick" v-has="'bussLog:database'" class="operator-text-text"
+               :title="$t('KnowledgeDatabase')">
             <a-icon type="folder"/>
             {{$t('KnowledgeDatabase')}}
           </div>
@@ -357,6 +360,46 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      DocumentTranslationClick() {
+        let serial_number = ''
+        if (this.detailList.length > 0) {
+          this.detailList[0][this.$t('essentialInformation')].forEach(res => {
+            if (res.db_field_name == 'serial_number') {
+              serial_number = res.value
+            }
+          })
+        }
+        let newUrl = this.$router.resolve({
+          path: '/documentTranslation',
+          query: {
+            serial_number: serial_number
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      DocumentComparisonClick() {
+        let serial_number = ''
+        if (this.detailList.length > 0) {
+          this.detailList[0][this.$t('essentialInformation')].forEach(res => {
+            if (res.db_field_name == 'serial_number') {
+              serial_number = res.value
+            }
+          })
+        }
+        let newUrl = this.$router.resolve({
+          path: '/documentComparison',
+          query: {
+            serial_number: serial_number
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      KnowledgeDatabaseClick() {
+        let newUrl = this.$router.resolve({
+          path: '/problemknowledgeBase',
+        })
+        window.open(newUrl.href, '_blank')
+      },
       getTitle(callback) {
         let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId
         getAction(this.url.getTitle, { id: _id }).then((res) => {
@@ -459,10 +502,18 @@
         this.bussLogList()
       },
       DocumentSplitting() {
+        let serial_number = ''
+        if (this.detailList.length > 0) {
+          this.detailList[0][this.$t('essentialInformation')].forEach(res => {
+            if (res.db_field_name == 'serial_number') {
+              serial_number = res.value
+            }
+          })
+        }
         let newUrl = this.$router.resolve({
           path: '/docManage/splite',
           query: {
-            serial_number: this.$route.query.serial_number
+            serial_number: serial_number
           }
         })
         window.open(newUrl.href, '_blank')
@@ -539,7 +590,7 @@
         }
 
         .doc-detail-right {
-          width: 800px;
+          /*width: 800px;*/
           line-height: 68px;
           display: flex;
 
@@ -642,7 +693,7 @@
     font-weight: 400;
     color: #040B29;
     display: inline-block;
-    width: 20%;
+    width: 100px;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;

jero-web/src/views/documentManage/splitting/index.vue

@@ -137,7 +137,7 @@
 
     },
     mounted() {
-      if (this.$route.query.serial_number !== undefined) {
+      if (this.$route.query.serial_number) {
         this.serialnumber = this.$route.query.serial_number
       }
     },

jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue

@@ -118,9 +118,9 @@
       @cancel="visible = false"
     >
       <template slot="footer">
-        <a-button type="primary" @click="fullTextCommentsEdit">
+        <!--        <a-button type="primary" @click="fullTextCommentsEdit">-->
-          {{$t('edit')}}
+        <!--          {{$t('edit')}}-->
-        </a-button>
+        <!--        </a-button>-->
         <a-button type="primary" :loading="confirmLoading" @click="fullTextCommentsSubmit">
           {{$t('submit')}}
         </a-button>
@@ -133,11 +133,11 @@
           <a-form-model-item class="itemModel" style="width: calc(100% - 113px)" prop="comment">
             <a-textarea :placeholder="$t('pleaseEnter')+$t('fullTextComments')"
                         v-model.trim="formInlineText.comment"
-                        :disabled="fullTextDisabled"
                         :rows="4"/>
           </a-form-model-item>
         </div>
       </a-form-model>
+      <JLoading :loading="textDataLoading">{{$t('dataLoading')}}</JLoading>
     </a-modal>
     <JLoading :loading="loading">{{dataLoadingText}}</JLoading>
   </div>
@@ -173,6 +173,7 @@
           ]
         },
         loading: false,
+        textDataLoading: false,
         visible: false,
         confirmLoading: false,
         fullTextDisabled: false,
@@ -256,11 +257,24 @@
       },
       addFullTextCommentClick() {
         this.visible = true
-        if (this.formInlineText.comment) {
+        let query = {
-          this.fullTextDisabled = true
+          id: this.$route.query.id
-        } else {
-          this.fullTextDisabled = false
         }
+        this.textDataLoading = true
+        postAction('/compare/sarFileCompareInfo/getComparisonDetail', query).then((res) => {
+          if (res.success) {
+            this.formInlineText.comment = res.result.comments || ''
+            this.formInlineText = { ...this.formInlineText }
+            this.textDataLoading = false
+          } else {
+            this.textDataLoading = false
+          }
+        })
+        // if (this.formInlineText.comment) {
+        //   this.fullTextDisabled = true
+        // } else {
+        //   this.fullTextDisabled = false
+        // }
       },
       turnOffAutomaticMatchingClick() {
         this.isMatching = !this.isMatching

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

@@ -220,6 +220,10 @@
       }
     },
     mounted() {
+      if (this.$route.query.serial_number) {
+        this.queryParam.serialNumber = this.$route.query.serial_number
+        this.queryParam = { ...this.queryParam }
+      }
       this.userInfoQuery = this.userInfo()
       this.getList()
     },

jero-web/src/views/documentTools/documentTranslation/components/documentTranslationResults.vue

@@ -85,16 +85,16 @@
         this.loadingRight = true
         // this.readExcelFromRemoteFileLeft(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix)
         // this.readExcelFromRemoteFileRight(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix)
-        let href = location.href.slice(0, 5)
+        // let href = location.href.slice(0, 5)
-        if (href.indexOf('s') == '-1') {
+        // if (href.indexOf('s') == '-1') {
           this.detailUrlLeft = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix)
           this.detailUrlRight = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix)
-          console.log(this.detailUrlLeft)
+          // console.log(this.detailUrlLeft)
-        } else {
+        // } else {
-          this.detailUrlLeft = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix)
+        //   this.detailUrlLeft = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.sourceFileId + fileSuffix)
-          this.detailUrlRight = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix)
+        //   this.detailUrlRight = window._CONFIG['httpsOnlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + this.fileQuery.targetFileId + fileSuffix)
-          console.log(this.detailUrlLeft)
+        //   console.log(this.detailUrlLeft)
-        }
+        // }
       },
       readExcelFromRemoteFileLeft: function(url) {
         var vm = this

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

@@ -227,6 +227,10 @@
       }
     },
     mounted() {
+      if (this.$route.query.serial_number) {
+        this.queryParam.serialNumber = this.$route.query.serial_number
+        this.queryParam = { ...this.queryParam }
+      }
       this.getList()
       this.userInfoQuery = this.userInfo()
     },
@@ -455,6 +459,7 @@
     margin-right: 4px;
     display: inline-block;
   }
+
   ::v-deep .ant-table-row:first-child {
     background: #fff !important;
     opacity: 0.9;

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -739,6 +739,11 @@
         this.$nextTick(()=>{
           this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole
           this.$refs.ruleFormRoleSwitching.clearValidate()
+          setTimeout(() => {
+            if (this.currentPersonRole == 'dre') {
+              this.handlePreservation()
+            }
+          }, 10000)
         })
       },
       GetgetLoginUserType() {
@@ -769,7 +774,7 @@
         } else {
           this.selectedRowKeysValue.forEach((item, index) => {
             //  状态不符合，不能下发收集
-            if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') {
+            if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'To be collected' && item.state !== 'Rejected by eng. interface' && item.state !== 'Modify') {
               this.NotSelectedRowKeysValue.push(item)
               flag = 0
             }
@@ -796,7 +801,7 @@
             this.$message.warning(this.$t('selectLeastOne'))
           } else {
             this.selectedRowKeysValue.forEach((item, index) => {
-              if (item.state !== '已提交' && item.state !== 'Submit') {
+              if (item.state !== '已提交' && item.state !== 'Submitted') {
                 this.NotSelectedRowKeysValue.push(item)
                 this.jurisdiction = 'homoTH'
                 flag = 0
@@ -814,7 +819,7 @@
             this.$message.warning(this.$t('selectLeastOne'))
           } else {
             this.selectedRowKeysValue.forEach((item, index) => {
-              if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') {
+              if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') {
                 this.NotSelectedRowKeysValue.push(item)
                 this.jurisdiction = 'sdtTH'
                 flag = 0
@@ -832,7 +837,7 @@
             this.$message.warning(this.$t('selectLeastOne'))
           } else {
             this.selectedRowKeysValue.forEach((item, index) => {
-              if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') {
+              if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') {
                 this.NotSelectedRowKeysValue.push(item)
                 this.jurisdiction = 'dreTH'
                 flag = 0
@@ -894,7 +899,7 @@
           this.$message.warning(this.$t('selectLeastOne'))
         } else {
           this.selectedRowKeysValue.forEach((item, index) => {
-            if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') {
+            if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'To be collected' && item.state !== 'Rejected by eng. interface' && item.state !== 'Modify') {
               this.NotSelectedRowKeysValue.push(item)
               flag = 0
             }
@@ -913,7 +918,7 @@
           this.$message.warning(this.$t('selectLeastOne'))
         } else {
           this.selectedRowKeysValue.forEach((item, index) => {
-            if (item.state !== '已提交' && item.state !== '变更' && item.state !== 'Submit' && item.state !== 'Change') {
+            if (item.state !== '已提交' && item.state !== '变更' && item.state !== 'Submitted' && item.state !== 'Modify') {
               this.NotSelectedRowKeysValue.push(item)
               flag = 0
             }
@@ -932,7 +937,7 @@
           this.$message.warning(this.$t('selectLeastOne'))
         } else {
           this.selectedRowKeysValue.forEach((item, index) => {
-            if (item.state !== '待发起收集' && item.state !== 'Wait Collect') {
+            if (item.state !== '待发起收集' && item.state !== 'To be collected') {
               this.NotSelectedRowKeysValue.push(item)
               flag = 0
             }
@@ -953,7 +958,7 @@
             this.$message.warning(this.$t('selectLeastOne'))
           } else {
             this.selectedRowKeysValue.forEach((item, index) => {
-              if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') {
+              if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') {
                 this.NotSelectedRowKeysValue.push(item)
                 this.jurisdiction = 'homoQZTH'
                 flag = 0
@@ -972,7 +977,7 @@
             this.$message.warning(this.$t('selectLeastOne'))
           } else {
             this.selectedRowKeysValue.forEach((item, index) => {
-              if (item.state !== '待填写' && item.state !== 'Wait Fill') {
+              if (item.state !== '待填写' && item.state !== 'To be filled') {
                 this.NotSelectedRowKeysValue.push(item)
                 this.jurisdiction = 'sdtQZTH'
                 flag = 0
@@ -990,7 +995,7 @@
             this.$message.warning(this.$t('selectLeastOne'))
           } else {
             this.selectedRowKeysValue.forEach((item, index) => {
-              if (item.state !== '已提交' && item.state !== 'Submit') {
+              if (item.state !== '已提交' && item.state !== 'Submitted') {
                 this.NotSelectedRowKeysValue.push(item)
                 this.jurisdiction = 'dreQZTH'
                 flag = 0
@@ -1011,7 +1016,7 @@
           this.$message.warning(this.$t('selectLeastOne'))
         } else {
           this.selectedRowKeysValue.forEach((item, index) => {
-            if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') {
+            if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') {
               this.NotSelectedRowKeysValue.push(item)
               flag = 0
             }
@@ -1030,7 +1035,7 @@
           this.$message.warning(this.$t('selectLeastOne'))
         } else {
           this.selectedRowKeysValue.forEach((item, index) => {
-            if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') {
+            if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') {
               this.NotSelectedRowKeysValue.push(item)
               flag = 0
             }
@@ -1048,7 +1053,7 @@
           this.$message.warning(this.$t('selectLeastOne'))
         } else {
           this.selectedRowKeysValue.forEach((item, index) => {
-            if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') {
+            if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') {
               this.NotSelectedRowKeysValue.push(item)
               flag = 0
             }
@@ -1295,8 +1300,8 @@
         let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource))
         let selectedRowKeysValue = []
         data.forEach(res => {
-          if (res.state == 'Wait Fill' || res.state == '待填写' || res.state == '认证工程师退回' ||
+          if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' ||
-          res.state == 'Cert Back') {
+          res.state == 'Rejected by homo engineer') {
             selectedRowKeysValue.push(res)
           }
         })