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

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

@@ -1240,4 +1240,5 @@ module.exports = {
   uploadOnly:'Upload only',
   turnOnAutoMatch:'Turn on auto match',
   Adjustareasofresponsibility:'Adjust areas of responsibility',
+  regulatoryTechnicalAssessment:'Regulatory Technical Assessment',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1343,4 +1343,5 @@ module.exports = {
   uploadOnly:'只能上传',
   turnOnAutoMatch:'打开自动匹配',
   Adjustareasofresponsibility:'调整责任领域',
+  regulatoryTechnicalAssessment:'法规技术评估',
 }

jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue

@@ -15,7 +15,7 @@
           </a-form-model-item>
         </div>
       </a-col>
-      <a-col :span="12" style="text-align: right">
+      <a-col :span="12">
         <div class="box-title-text">
           <div class="title-text">
               <span class="title-text-text"
@@ -292,15 +292,15 @@
         rules: {
           titleCn: [
             {
-              max: 100,
+              max: 500,
-              message: this.$t('title') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              message: this.$t('title') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
           titleEn: [
             {
-              max: 100,
+              max: 500,
-              message: this.$t('englishTitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
+              message: this.$t('englishTitle') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],

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

@@ -48,7 +48,7 @@
                   {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber :''}}
                 </div>
                 <div class="title-text-right" v-if="isTrue">
-                  <span @click="standardDecompositionDocumentClick">
+                  <span :title="$t('standardDecompositionDocument')" @click="standardDecompositionDocumentClick">
                     {{$t('standardDecompositionDocument')}}
                   </span>
                 </div>
@@ -96,7 +96,7 @@
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('processBackground')">{{$t('processBackground')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="taskExplain">
+                <a-form-model-item class="itemModel" prop="processBackground">
                   <a-textarea :placeholder="$t('pleaseEnter')+$t('processBackground')"
                               v-model="formInline.processBackground"
                               :disabled="!whetherDisplay"
@@ -111,7 +111,7 @@
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="remarks">
+                <a-form-model-item class="itemModel" prop="remark">
                   <a-textarea :placeholder="$t('pleaseEnter')+$t('remarks')"
                               v-model="formInline.remark"
                               :disabled="!whetherDisplay"
@@ -124,7 +124,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+<!--                  <span class="Required">*</span>-->
                   <span class="title-text-text" :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="gatherResult">
@@ -239,7 +239,21 @@
               message: this.$t('Assessor') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
-          ]
+          ],
+          processBackground:[
+            {
+              max: 300,
+              message: this.$t('processBackground') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
+          remark:[
+            {
+              max: 300,
+              message: this.$t('remarks') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
+          ],
         },
         searchParmes: {},
         selectedRowKeysRecord: [],

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -174,7 +174,7 @@
         toggleSearchStatus: false,
         dataSource: [],
         selectedRowKeys: [],
-        serialNumber:'',
+        serialNumber: '',
         total: 0,
         pageSize: 10,
         pageNo: 1,
@@ -197,7 +197,7 @@
           },
           {
             value: '2',
-            name: this.$t('not')
+            name: this.$t('notOnlyRz')
           }
         ],
         gatherResultList: [
@@ -215,12 +215,14 @@
             title: this.$t('standard'),
             align: 'center',
             dataIndex: 'serialNumber',
+            ellipsis: true,
             width: 170
           },
           {
             title: this.$t('title'),
             align: 'center',
             dataIndex: 'title',
+            ellipsis: true,
             width: 170
           },
           {
@@ -306,7 +308,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(page,pageSize) {
+      SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()
@@ -321,7 +323,7 @@
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-          serialNumber: this.$route.query.serialNumber?this.$route.query.serialNumber:'',
+          serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '',
           ...queryParam
         }
         this.loading = true
@@ -372,9 +374,9 @@
               id: row.id,
               processBackground: row.processBackground,
               serialNumber: row.serialNumber,
-              lawsTechnologyEvaluationId:row.id,
+              lawsTechnologyEvaluationId: row.id,
               standId: row.standId,
-              remark:row.remark
+              remark: row.remark
             }
           })
           window.open(newUrl.href, '_blank')
@@ -385,9 +387,9 @@
               id: row.id,
               processBackground: row.processBackground,
               serialNumber: row.serialNumber,
-              lawsTechnologyEvaluationId:row.id,
+              lawsTechnologyEvaluationId: row.id,
               standId: row.standId,
-              remark:row.remark
+              remark: row.remark
             }
           })
           window.open(newUrl.href, '_blank')

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

@@ -5,7 +5,7 @@
         {{title}}
       </div>
     </div>
-    <div class="content-text">
+    <div class="content-text-text">
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
         <a-row :gutter="24">
           <a-col :span="12">
@@ -60,7 +60,7 @@
                                     }]">
                   <a-input class="box-input"
                            :disabled="disabled"
-                           v-model="item.relatedSection"
+                           v-model.trim="item.relatedSection"
                            :placeholder="$t('PleaseEnter')+$t('relevantSections')"/>
                 </a-form-model-item>
               </div>
@@ -81,7 +81,7 @@
                                     }]">
                   <a-input class="box-input"
                            :disabled="disabled"
-                           v-model="item.issueOrSuggest"
+                           v-model.trim="item.issueOrSuggest"
                            :placeholder="$t('PleaseEnter')+$t('problemDescription')"/>
                 </a-form-model-item>
               </div>
@@ -185,8 +185,8 @@
               trigger: 'blur'
             },
             {
-              max: 300,
+              max: 1000,
-              message: this.$t('reviewComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              message: this.$t('reviewComments') + this.$t('cannotExceed') + 1000 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],

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

@@ -5,7 +5,7 @@
         {{title}}
       </div>
     </div>
-    <div class="content-text">
+    <div class="content-text-text">
       <a-table
         ref="table"
         :loading="loading"

jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue

@@ -64,7 +64,7 @@
     },
     data() {
       return {
-        title: this.$t('collectionOfRegulatoryOpinions'),
+        title: this.$t('regulatoryTechnicalAssessment'),
         url: {
           queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds',
           list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationResultEO/queryEvaluationResultAndComplianceResult'
@@ -141,6 +141,7 @@
       }
     },
     mounted() {
+      document.title = this.$t('regulatoryTechnicalAssessment')
       this.isDisplay = false
       if (this.$route.query.taskDefinitionKey == 'pgrqr') {
         this.isPreservation = true

jero-web/src/views/regulatoryEarlyWarning/index.vue

@@ -100,6 +100,7 @@
             title: this.$t('standard'),
             align: 'center',
             dataIndex: 'serial_number',
+            ellipsis: true,
             width: 170,
             scopedSlots: { customRender: 'serial_number' }
           },
@@ -107,6 +108,7 @@
             title: this.$t('title'),
             align: 'center',
             dataIndex: 'title',
+            ellipsis: true,
             width: 170,
             scopedSlots: { customRender: 'titleName' }
           },
@@ -182,11 +184,12 @@
         this.getList()
       })
     },
-    beforeDestroy(){
+    beforeDestroy() {
       eventBUs.$off('searchQuery')
     },
     methods: {
       callback(tab) {
+        this.selectedRowKeys = []
         this.activeTab = tab
         this.getList()
       },
@@ -203,22 +206,26 @@
         }
       },
       handleExport() {
-        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        let text = ''
+          let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
-        let flag
+          let text = ''
-        if (this.activeTab == this.$t('ImplementationDate')) {
+          let flag
-          flag = 0
+          if (this.activeTab == this.$t('ImplementationDate')) {
-          text = this.$t('ImplementationDate')
+            flag = 0
+            text = this.$t('ImplementationDate')
+          } else {
+            text = this.$t('vehicleInProductionDate')
+            flag = 1
+          }
+          let query = {
+            id: selectedRowKeys.join(','),
+            ...this.searchParmes,
+            flag: flag
+          }
+          downloadFile(this.url.exportData, text + '.xls', query, this.Deselect)
         } else {
-          text = this.$t('vehicleInProductionDate')
+          this.$message.warning(this.$t('selectLeastOne'))
-          flag = 1
         }
-        let query = {
-          id: selectedRowKeys.join(','),
-          ...this.searchParmes,
-          flag: flag
-        }
-        downloadFile(this.url.exportData, text + '.xls', query, this.Deselect)
       },
       Deselect() {
         this.selectedRowKeys = []
@@ -298,7 +305,7 @@
         this.pageNo = page
         this.getList()
       },
-      SizeChange(page,pageSize) {
+      SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
         this.getList()