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

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

@@ -1726,4 +1726,5 @@ module.exports = {
   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',
+  verifyComplianceConfirmReturnReason:'Verify compliance Confirm return reason',
 }

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

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

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

@@ -782,11 +782,11 @@
             </div>
           </a-col>
         </a-row>
-        <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0">
-          {{$t('listConfirmationRejectionReason')}}
+        <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 0">
+          {{$t('reasonForReturnOfDesignCompliance')}}
         </div>
 
-        <div v-if="rejectCauseList && rejectCauseList.length > 0"
+        <div v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 0"
              v-for="(item,index) in rejectCauseList">
           <a-row :gutter="24">
             <a-col :span="12">
@@ -827,11 +827,11 @@
           </a-row>
         </div>
 
-        <div class="header-text" v-if="rejectCauseListOne && rejectCauseListOne.length > 0">
-          {{$t('taskConfirmationRejectionReason')}}
+        <div class="header-text" v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0">
+          {{$t('verifyComplianceConfirmReturnReason')}}
         </div>
 
-        <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0"
+        <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0"
              v-for="(item,index) in rejectCauseListOne">
           <a-row :gutter="24">
             <a-col :span="12">