合并分支 'fix_bug_first_stage' 到 'master'

Fix bug first stage

查看合并请求 laws-nio/laws-weilai!114

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

@@ -713,8 +713,9 @@ module.exports = {
 
   confirmationOfRegulationsList: 'Regulation List Confirmation',
   regulatoryTaskConfirmation: 'Regulation Task Confirmation',
-  certificationStart: 'Homo KO',
-  certificationEnd: 'Homo Completion',
+  certificationStart: 'Homo Test Completion',
+  preHomoCompletion:'Pre-Homo Completion',
+  certificationEnd: 'Type Approval',
   directoryName: 'Catalogue Name',
   batch: 'Batch',
   uploadTime: 'Upload Time',

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

@@ -729,8 +729,9 @@ module.exports = {
   time: '时间',
   confirmationOfRegulationsList: '法规清单确认',
   regulatoryTaskConfirmation: '法规任务确认',
-  certificationStart: '认证开始',
-  certificationEnd: '认证结束',
+  certificationStart: '认证试验结束',
+  preHomoCompletion:'摸底试验结束',
+  certificationEnd: '认证批准',
   directoryName: '目录名称',
   batch: '批次',
   uploadTime: '上传时间',

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

@@ -71,12 +71,12 @@
           <div class="box-title-text">
             <div class="title-text">
               <span class="Required">*</span>
-              <span class="title-text-text" :title="$t('PrehomoConfirmation')">
-                {{$t('PrehomoConfirmation')}}</span>
+              <span class="title-text-text" :title="$t('preHomoCompletion')">
+                {{$t('preHomoCompletion')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="prehomoDeadline">
               <a-date-picker class="box-input"
-                             :placeholder="$t('PleaseSelect')+$t('PrehomoConfirmation')"
+                             :placeholder="$t('PleaseSelect')+$t('preHomoCompletion')"
                              @change="dateChange({db_field_name:'prehomoDeadline'})"
                              format="YYYY-MM-DD"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -187,7 +187,7 @@
           prehomoDeadline: [
             {
               required: true,
-              message: this.$t('PrehomoConfirmation') + this.$t('cannotEmpty'),
+              message: this.$t('preHomoCompletion') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
           ],

jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue

@@ -497,7 +497,7 @@
       .process-content-right-top {
         font-size: 12px;
         color: #040B29;
-        width: 70px;
+        width: 75px;
         background: #fff;
         display: inline-block;
         overflow: hidden;
@@ -509,7 +509,7 @@
       .process-content-right-button{
         font-size: 12px;
         color: #040B29;
-        width: 70px;
+        width: 75px;
         background: #fff;
         display: inline-block;
         overflow: hidden;
@@ -519,7 +519,7 @@
         transform: translate(-50%, -50%);
       }
       .process-content-right-button {
-        width: 70px;
+        width: 75px;
         font-size: 12px;
         font-weight: 400;
         color: #6F7385;

jero-web/src/views/projectManagement/projectStatusBoard/index.vue

@@ -648,7 +648,7 @@
       .process-content-right-top {
         font-size: 12px;
         color: #040B29;
-        width: 70px;
+        width: 75px;
         background: #fff;
         display: inline-block;
         overflow: hidden;
@@ -660,7 +660,7 @@
      .process-content-right-button{
        font-size: 12px;
        color: #040B29;
-       width: 70px;
+       width: 75px;
        background: #fff;
        display: inline-block;
        overflow: hidden;
@@ -670,7 +670,7 @@
        transform: translate(-50%, -50%);
      }
       .process-content-right-button {
-        width: 70px;
+        width: 75px;
         font-size: 12px;
         font-weight: 400;
         color: #6F7385;

jero-web/src/views/system/modules/UserModal.vue

@@ -59,6 +59,7 @@
           <a-select
             mode="multiple"
             style="width: 100%"
+            class="selectUserRole"
             :placeholder="$t('selectUserRole')"
             optionFilterProp="children"
             v-model="selectedRole"
@@ -736,4 +737,9 @@
     background: #fff;
     border-radius: 0 0 2px 2px;
   }
+</style>
+<style>
+  .selectUserRole .ant-select-selection--multiple {
+    height: 100px!important;
+  }
 </style>