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

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

@@ -1723,4 +1723,6 @@ module.exports = {
   dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset',
   reasonForReturnOfDesignCompliance:'Reason for return of design compliance',
   noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10',
+  notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n',
+  notethree:'Provide supporting materials',
 }

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

@@ -1825,4 +1825,6 @@ module.exports = {
   theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起',
   dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置',
   reasonForReturnOfDesignCompliance:'设计符合性退回原因',
+  notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n',
+  notethree:'\n提供证明材料\n',
 }

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue

@@ -62,8 +62,10 @@
             </a-radio-group>
           </span>
         </a-layout-content>
-        <a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;max-width: 522px'>
-          <a-button style='margin-top: 20%;margin-left: 10%;' @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+        <a-layout-content style='border: black solid 1px;border-left: none;border-bottom: none;max-width: 428px'>
+          <a-button style='margin-top: 15%;margin-left: 10%;' @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+          <span class="spanone">{{$t('notetwo')}}</span>
+          <span class="spanone">{{$t('format')}}</span>
         </a-layout-content>
       </a-layout>
       <div class='box-layout'>
@@ -110,7 +112,7 @@
             </a-radio-group>
           </span>
           <span class='box-text'>
-            <a-radio-group style='margin-left: 40px;' v-model="form.yhqr"> 
+            <a-radio-group style='margin-left: 40px;' v-model="form.yhqr">
                     <a-radio :value="1"> {{ $t('yes') }} </a-radio>
                     <a-radio :value="2"> {{ $t('not') }} </a-radio>
             </a-radio-group>
@@ -133,7 +135,9 @@
           </span>
         </div>
         <div class='layout-box-three'>
-          <a-button style='margin-top: 20%;margin-left: 10%;' @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+          <a-button style='margin-top: 15%;margin-left: 10%;' @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+          <span class="spanone">{{$t('notethree')}}</span>
+          <span class="spanone">{{$t('format')}}</span>
         </div>
       </div>
     </a-layout>
@@ -464,7 +468,7 @@ this.$forceUpdate()
 }
 ::v-deep  .ant-layout-content {
   min-height: 60px;
-  line-height: 50px;
+  line-height: 20px;
 }
 //::v-deep  > .ant-layout {
 //  margin-bottom: 48px;
@@ -542,4 +546,9 @@ this.$forceUpdate()
   height: 50px;
   margin-top: 8px;
 }
+.spanone{
+  white-space: pre-wrap;
+  padding: 0 45px;
+  display: flex;
+}
 </style>