56405 法规/认证任务计划展示字段修改。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java

@@ -360,6 +360,17 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		//校验文件格式
 		int pos = file.getOriginalFilename().lastIndexOf(".");
 		String fileSuffixStr = file.getOriginalFilename().substring(pos+1).toLowerCase();
+
+		String title = "";
+		String verifyTemplateMsg = "";
+		if (CutEnum.CN.getValue().equals(cut)) {
+			title = "条款号,条款名称,条款内容";
+			verifyTemplateMsg = "模板不正确，请下载正确的模板导入！";
+		} else {
+			title = "Item num,Item name,Item Contents";
+			verifyTemplateMsg = "The template is not correct, please download the correct template to import!";
+		}
+
 		if(!StringUtils.equals(fileSuffixStr,"xls")){
 			if(StringUtils.equals(cut,CutEnum.CN.getValue())){
 				throw new JeroBootException("请上传xls文件");
@@ -377,6 +388,23 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		if (workbook != null) {
 			Sheet sheet = workbook.getSheetAt(0);
 			if (sheet != null) {
+				Row firstRow = sheet.getRow(0);
+				List<String> titleList = Arrays.asList(title.split(","));
+				//校验模板
+				for (int cellIndex = 0; cellIndex < 3; cellIndex++){
+					boolean flag = false;
+					Cell cell = firstRow.getCell(cellIndex);
+					for (String titl : titleList) {
+						if(StringUtils.equals(titl,cell.toString())){
+							flag = true;
+							break;
+						}
+					}
+					if(!flag){
+						throw new JeroBootException(verifyTemplateMsg);
+					}
+				}
+
 				int rowNos = sheet.getPhysicalNumberOfRows();// 得到excel的总记录条数
 				for (int i = 0; i < rowNos ; i++) {
 					Row row = sheet.getRow(i + 1);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java

@@ -4,11 +4,13 @@ public enum ProjectTaskPlanningNameEnum {
     LIST_CONFIRMATION("清单确认"," Checklist confirmation"),
     LEGAL_TASK_CONFIRMATION("任务确认","Task confirmation"),
     DESIGN_DEADLINE("设计符合性","Design compliance"),
-    PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"),
+//    PREHOMO_DEADLINE("Pre-Homo","Pre-Homo"),
-    ATTESTATION_START_TIME("认证开始","Certification begins"),
+//    ATTESTATION_START_TIME("认证开始","Certification begins"),
-    ATTESTATION_END_TIME("认证结束"," End of certification"),
+//    ATTESTATION_END_TIME("认证结束"," End of certification"),
+    PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Completion"), // name:Pre-Homo   value:Pre-Homo
+    ATTESTATION_START_TIME("认证试验结束","Homo Test Completion"),//  name:认证开始   value:Certification begins
+    ATTESTATION_END_TIME("认证批准","Type Approval"),//  name:认证结束   value:End of certification
     VERIFY_DEADLINE("验证符合性","Verify compliance"),
-
     ;
     String name;
     String value;

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',
+  certificationStart: 'Homo Test Completion',
-  certificationEnd: 'Homo Completion',
+  preHomoCompletion:'Pre-Homo Completion',
+  certificationEnd: 'Type Approval',
   directoryName: 'Catalogue Name',
   batch: 'Batch',
   uploadTime: 'Upload Time',

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

@@ -728,8 +728,9 @@ module.exports = {
   time: '时间',
   confirmationOfRegulationsList: '法规清单确认',
   regulatoryTaskConfirmation: '法规任务确认',
-  certificationStart: '认证开始',
+  certificationStart: '认证试验结束',
-  certificationEnd: '认证结束',
+  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')">
+              <span class="title-text-text" :title="$t('preHomoCompletion')">
-                {{$t('PrehomoConfirmation')}}</span>
+                {{$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;