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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java

@@ -93,6 +93,15 @@ public class LawsWarnService {
     private IPhasedImplementationDetailsEOService phasedImplementationDetailsEOService;
 
     public IPage getInfoPage(Map<String, Object> parameter) {
+        //处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期)
+        String flag = String.valueOf(parameter.get("flag"));
+        if(StringUtils.equals(flag,"0")){
+            parameter.put("xin1_che1_xing2_shi2_shi1_ri4_qi1",parameter.get("WarnTime"));
+        } else if(StringUtils.equals(flag,"1")){
+            parameter.put("implement_time",parameter.get("WarnTime"));
+        }
+        parameter.remove("WarnTime");
+
         String cut = (String) parameter.get("cut");//中英文切换标识
         List<OnlCgformField> onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue());
         //查询的字段

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java

@@ -15,7 +15,7 @@ public enum FlowTypeEnum {
     YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性确认","Verify conformance confirmation"),
     FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc","法规意见收集","Collection of Legislative Comments"),
     FGJSPG("6","法规技术评估流程","FGJSPG","法规技术评估流程","fgjspglc","法规技术评估","Regulatory and technical assessment"),
-    QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单确认","Regulation list confirmation"),
+    QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单发布","Release of regulatory list"),
     CERTIFICATION_LC("21","认证流程","CERTIFICATION_LC","认证流程","certification_lc","Pre-Homo流程","Pre-Homo flow"),
     ;
 

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -1612,6 +1612,9 @@
   /deep/ .ant-table-column-title {
     font-weight: bold !important;
   }
+  ::v-deep .ant-table-thead > tr > th .ant-table-header-column {
+    max-width: none !important;
+  }
 </style>
 <style lang="less">
   .popconfirm {

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

@@ -645,7 +645,7 @@
             align: 'left',
             ellipsis: true,
             dataIndex: 'applicableSupplement',
-            width: 180
+            width: 200
           },
           {
             title: this.$t('certificationType'),
@@ -2870,6 +2870,11 @@
     color: #00B3BE;
     cursor: pointer;
   }
+
+  ::v-deep .ant-table-thead > tr > th .ant-table-header-column {
+    max-width: none !important;
+  }
+
 </style>
 <style lang="less">
   .box-input .ant-select-selection {

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

@@ -284,6 +284,12 @@
           if (row.taskId.length > 30) {
             row.taskId = ''
           }
+          let designDueDate = ''
+          if (row.taskDefinitionKey == 'zrrqr' || row.taskDefinitionKey == 'dezrrqr') {
+            designDueDate = 'endTime'
+          } else {
+            designDueDate = 'designDueDate'
+          }
           query = {
             router: row.router,
             taskIds: row.taskId,
@@ -354,6 +360,12 @@
           if (row.taskId.length > 30) {
             row.taskId = ''
           }
+          let verifyDueDate = ''
+          if (row.taskDefinitionKey == 'zrrqr' || row.taskDefinitionKey == 'dezrrqr') {
+            verifyDueDate = 'endTime'
+          } else {
+            verifyDueDate = 'verifyDueDate'
+          }
           query = {
             router: row.router,
             taskIds: row.taskId,

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

@@ -266,6 +266,9 @@
         getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => {
           if (res.success) {
             this.queryProject = res.result[0] || {}
+            if (this.queryData.TaskKey == 'zrrqr' || this.queryData.TaskKey == 'dezrrqr'){
+              this.queryProject.endTime = this.queryData.endTime
+            }
             this.loading = false
             this.isDisplay = true
           } else {