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

jero-web/src/common/lang/en-us.js

@@ -1115,25 +1115,25 @@ module.exports = {
   RegulationTaskConfirmationNotification: 'Regulation Task Confirmation Notification',
   evaluationMethod: 'Evaluation method',
   uploadRelevantMaterials: 'Upload relevant materials',
-  processBackground: 'Process background',
+  processBackground: 'Process Background',
-  selectedStandard: 'Selected standard',
+  selectedStandard: 'Selected Standard',
   standardDecompositionDocument: 'Standard decomposition document',
   pleaseSelectStandardFirst: 'Please select a standard first',
   RelevantMaterials: 'RelevantMaterials',
-  evaluatorFeedback: 'Evaluator feedback',
+  evaluatorFeedback: 'Evaluator Feedback',
   nameTechnicalDocument: 'Name of technical document',
   chapter: 'chapter',
-  problemDescription: 'Problem description',
+  problemDescription: 'Problem Description',
   filingExternalOpinions: 'Filing of external opinions',
   regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results',
   initiateProcessForCurrentStandard: 'Initiate process for current standard',
   engineerFeedbackResults: 'Engineer feedback results',
-  fileExport: 'File export',
+  fileExport: 'File Export',
-  feedbackTime: 'Feedback time',
+  feedbackTime: 'Feedback Time',
   regulatoryTechnologyAssessmentProcess: 'Regulatory technology assessment process',
-  feedbackEvaluation: 'Feedback evaluation',
+  feedbackEvaluation: 'Feedback Evaluation',
-  clauseEvaluation: 'Clause evaluation',
+  clauseEvaluation: 'Clause Evaluation',
-  standardDocuments: 'Standard documents',
+  standardDocuments: 'Standard Documents',
   pleaseCompleteTheEvaluationMethodorEvaluator: 'Please complete the evaluation method or evaluator in the list',
   reviewComments: 'Review comments',
   PleaseCompleteList: 'Please complete the compliance results in the list',

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

@@ -147,12 +147,12 @@
             key: 'role',
           },
           {
-            title: this.$t('operationContent'),
+            title: this.$t('OperationContent'),
             dataIndex: 'content',
             key: 'content',
           },
           {
-            title: this.$t('operationTime'),
+            title: this.$t('OperationTime'),
             dataIndex: 'time',
             key: 'time',
           },

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

@@ -64,6 +64,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="endTime">
                   <a-date-picker class="box-input"
+                                 :disabledDate="disabledDate"
                                  :placeholder="$t('PleaseSelect')+$t('closingDate')"
                                  @change="dateChange('endTime')"
                                  :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -347,6 +348,9 @@
           }
         })
       },
+      disabledDate(current) {
+        return current && current < moment().subtract(1, 'day')
+      },
       pageOnChange(page) {
         this.pageNo = page
         this.getList()

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

@@ -78,6 +78,18 @@
              v-if="record.createBy == userInfoQuery.username && record.releaseState == 'draft'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
+        <span slot="serialNumberRight" :title="text" slot-scope="text,record">
+             <a @click="serialNumberRightClick(record)">{{text}}</a>
+        </span>
+        <span slot="serialNumberLeft" :title="text" slot-scope="text,record">
+             <a @click="serialNumberLeftClick(record)">{{text}}</a>
+        </span>
+        <span slot="fileNameLeft" :title="text" slot-scope="text,record">
+            <a @click="fileNameLeftClick(record)">{{text}}</a>
+        </span>
+        <span slot="fileNameRight" :title="text" slot-scope="text,record">
+            <a @click="fileNameRightClick(record)">{{text}}</a>
+        </span>
       </a-table>
       <div class="page" v-if="dataSource && dataSource.length > 0">
         <a-pagination
@@ -96,8 +108,9 @@
 </template>
 
 <script>
-  import { getAction, postAction, deleteAction } from '@/api/manage'
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
+  import { Base64 } from 'js-base64'
 
   export default {
     name: 'index',
@@ -112,6 +125,7 @@
         loading: false,
         dataSource: [],
         selectedRowKeys: [],
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         total: 0,
         pageSize: 10,
         pageNo: 1,
@@ -123,13 +137,17 @@
             title: this.$t('standard') + 1,
             align: 'center',
             dataIndex: 'serialNumberLeft',
-            width: 170
+            width: 170,
+            ellipsis: true,
+            scopedSlots: { customRender: 'serialNumberLeft' }
           },
           {
             title: this.$t('title') + 1,
             align: 'center',
             dataIndex: 'titleLeft',
-            width: 170
+            width: 170,
+            ellipsis: true,
+            scopedSlots: { customRender: 'serialNumberLeft' }
           },
           {
             title: this.$t('TextStatus'),
@@ -143,18 +161,23 @@
             align: 'center',
             width: 270,
             ellipsis: true,
-            dataIndex: 'fileNameLeft'
+            dataIndex: 'fileNameLeft',
+            scopedSlots: { customRender: 'fileNameLeft' }
           },
           {
             title: this.$t('standard') + 2,
             align: 'center',
             dataIndex: 'serialNumberRight',
+            ellipsis: true,
+            scopedSlots: { customRender: 'serialNumberRight' },
             width: 170
           },
           {
             title: this.$t('title') + 2,
             align: 'center',
             dataIndex: 'titleRight',
+            scopedSlots: { customRender: 'serialNumberRight' },
+            ellipsis: true,
             width: 170
           },
           {
@@ -169,7 +192,8 @@
             align: 'center',
             width: 270,
             ellipsis: true,
-            dataIndex: 'fileNameRight'
+            dataIndex: 'fileNameRight',
+            scopedSlots: { customRender: 'fileNameRight' }
           },
           {
             title: this.$t('releaseSituation'),
@@ -350,6 +374,58 @@
             })
           }
         })
+      },
+      serialNumberRightClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.fileKeyRight
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      serialNumberLeftClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.fileKeyLeft
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
+      fileNameLeftClick(row) {
+        let fileName = row.fileNameLeft
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix === '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + row.fileIdLeft + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix === '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + row.fileIdLeft + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + row.fileIdLeft + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          downloadFile('/sys/common/downLoadFile', row.fileNameLeft, { id: row.fileIdLeft })
+        }
+      },
+      fileNameRightClick(row) {
+        let fileName = row.fileNameRight
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix === '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + row.fileIdRight + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix === '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + row.fileIdRight + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + row.fileIdRight + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          downloadFile('/sys/common/downLoadFile', row.fileNameRight, { id: row.fileIdRight })
+        }
       }
     }
   }

jero-web/src/views/processCenter/components/circulationHistory.vue

@@ -41,7 +41,7 @@
         },
         columns: [
           {
-            title: this.$t('operationNode'),
+            title: this.$t('OperationNode'),
             dataIndex: 'name',
             align: 'center',
             width:'20%',
@@ -66,7 +66,7 @@
             width:'20%',
           },
           {
-            title: this.$t('operationTime'),
+            title: this.$t('OperationTime'),
             dataIndex: 'createTime',
             align: 'center',
             width:'20%',

jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue

@@ -32,7 +32,7 @@
         loading: false,
         columns: [
           {
-            title: this.$t('operationContent'),
+            title: this.$t('OperationContent'),
             dataIndex: 'taskDefinitionKeyName',
             align: 'center',
             width: '25%'
@@ -50,7 +50,7 @@
             width: '25%'
           },
           {
-            title: this.$t('operationTime'),
+            title: this.$t('OperationTime'),
             dataIndex: 'createTime',
             align: 'center',
             width: '25%',

jero-web/src/views/processCenter/components/taskCirculationHistory.vue

@@ -43,7 +43,7 @@
         },
         columns: [
           {
-            title: this.$t('operationNode'),
+            title: this.$t('OperationNode'),
             dataIndex: 'name',
             align: 'left'
           },