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

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

@@ -594,7 +594,7 @@ module.exports = {
   labelAreaDeleted: 'If it is deleted, All label items under the display area will be deleted',
   searchInResults: 'Search In Results',
   searchContent: 'Search Content',
-  viewFile: 'View File',
+  viewFile: 'View',
   fileFormatIncorrect: 'The file format is incorrect',
   pleaseUploadFile: 'Please upload the file',
   documentSplitList: 'Document Split List Display',
@@ -1523,7 +1523,7 @@ module.exports = {
   VINcodeupload:'VIN code upload',
   Tasknode:'Task Node',
   Taskresponsibilityrecognition:'Task responsibility recognition',
-  uploadattachment:'Upload attachment',
+  uploadattachment:'Upload',
   Processhistory:'Process history',
   resultofhandling:'Result of handling',
   cause:'cause',

jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue

@@ -202,8 +202,10 @@ import ImportFile from '@/components/ImportFileData/index'
           // this.dataSource[2].info= Number(res.result.sjsbcs)== 0 ? undefined :Number(res.result.sjsbcs)
           this.dataSource[2].info= res.result.sjsbcs
           this.dataSource[3].info= res.result.xxaqjz
+           if(res.result.zmclList){
+             console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile'))
+           }
            this.fileList.uploadName = res.result.zmclList
-           this.fileList.certifyingmaterials = this.$t('viewFile')
            this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName)
            this.$forceUpdate()
            this.loading = false

jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue

@@ -221,12 +221,10 @@ export default {
           this.dataSource[7].relevantverification=Number(res.result.sjsbaq)
           this.dataSource[8].relevantverification=Number(res.result.sjgg)
           this.dataSource[9].relevantverification=Number(res.result.sjzt)
+          if(res.result.zmclList){
+            console.log(this.dataSource[0].certifyingmaterials = this.$t('viewFile'))
+          }
           this.fileList.uploadName = res.result.zmclList
-          this.$nextTick(() => {
-            this.fileList.certifyingmaterials = this.$t('viewFile')
-          })
-          this.fileList.certifyingmaterials = this.$t('viewFile')
-          console.log(this.fileList)
           this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName)
           this.$forceUpdate()
         })

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

@@ -11,7 +11,7 @@
         ref="table"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%'}"
         :data-source="dataSource"
         :columns="columns"
       >

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

@@ -11,7 +11,7 @@
         :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%'}"
         :data-source="dataSource"
         :columns="columns"
       >

jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue

@@ -30,9 +30,10 @@
     <div style="width: 100%">
       <a-table
         ref="table"
+        size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%'}"
         :data-source="dataSource"
         :columns="columns"
       >
@@ -104,7 +105,7 @@
             title: this.$t('Operator'),
             dataIndex: 'assignee',
             align: 'left',
-            width: 200,
+            width: 120,
             ellipsis: true
           },
           {
@@ -128,7 +129,7 @@
             title: this.$t('resultofhandling'),
             dataIndex: 'operatorResultName',
             align: 'left',
-            width: 200,
+            width: 160,
             ellipsis: true,
           },
           {
@@ -246,6 +247,7 @@
 </script>
 
 <style scoped lang="less">
+  @import '~@assets/less/common.less';
   .box {
     padding: 0 0 24px 0;
     box-sizing: border-box;