合并分支 'dev_third_stage' 到 'master'

Dev third stage

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

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -1108,3 +1108,6 @@ INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `c
 INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1567712001896923137', '1546316593837740034', '法规技术评估-删除', NULL, NULL, NULL, NULL, 2, 'regulatoryAndTechnicalAssessment:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:10:43', 'admin', '2022-09-08 11:12:55', 0, 0, '1', 0, 'Regulatory and technical assessment - delete');
 INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1567711678239260673', '1539780399024934914', '法规意见-批量删除', NULL, NULL, NULL, NULL, 2, 'regulatoryComments:batchDelete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:09:25', NULL, NULL, 0, 0, '1', 0, 'Regulatory Comments - batch Delete');
 INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1567711460491968513', '1539780399024934914', '法规意见-删除', NULL, NULL, NULL, NULL, 2, 'regulatoryComments:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:08:34', NULL, NULL, 0, 0, '1', 0, 'Regulatory Comments - delete');
+
+-- 上报库删除按钮
+INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1569609701240446977', '1539429224550457346', '删除', NULL, NULL, NULL, NULL, 2, 'params:report:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-13 16:51:29', NULL, NULL, 0, 0, '1', 0, 'Delete');

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java

@@ -101,6 +101,24 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  *   通过id删除
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "上报库-通过id删除")
+	 @ApiOperation(value="上报库-通过id删除", notes="上报库-通过id删除")
+	 @GetMapping(value = "/delete")
+	 @RequiresPermissions("params:report:delete")
+	 public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		 boolean isSuccess = paramsReportEOService.deleteById(id);
+		 if (isSuccess) {
+			 return Result.OK("删除成功!");
+		 } else {
+			 return Result.error("删除失败！");
+		 }
+	 }
 
 
 
@@ -147,20 +165,6 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 		return Result.OK("编辑成功!");
 	}
 
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "上报库-通过id删除")
-	@ApiOperation(value="上报库-通过id删除", notes="上报库-通过id删除")
-	@GetMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		paramsReportEOService.deleteById(id);
-		return Result.OK("删除成功!");
-	}
-
 	/**
 	 *  批量删除
 	 *

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java

@@ -30,4 +30,11 @@ public interface IParamsReportConfigDataEOService extends IService<ParamsReportC
 	 * @return
 	 */
 	List<ParamsReportConfigDataEO> queryListByConfigIdList(List<String> configIdList);
+
+	/**
+	 * 批量删除清单的所有配置数据
+	 * @param paramsReportDetailIdList
+	 * @return
+	 */
+	int deleteByParamsReportDetailIdList(List<String> paramsReportDetailIdList);
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java

@@ -59,4 +59,6 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
 	// 保存
 	boolean save(List<Map<String, Object>> configDataList, String paramsManifestId);
 
+	// 删除
+	boolean deleteByIds(List<String> ids);
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java

@@ -36,7 +36,7 @@ public interface IParamsReportEOService extends IService<ParamsReportEO> {
 	 * @param id
 	 * @return
 	 */
-    void deleteById(String id);
+	boolean deleteById(String id);
 
 	/**
 	 * 批量删除

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportExportHistoryEOService.java

@@ -61,4 +61,6 @@ public interface IParamsReportExportHistoryEOService extends IService<ParamsRepo
     List<ParamsReportExportHistoryEO> queryList();
 
 	IPage queryPage(IPage page, ParamsReportExportHistoryEO paramsReportExportHistoryEO, String cut);
+
+	void deleteByParamsManifestId(String paramsManifestId);
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java

@@ -55,4 +55,11 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl<ParamsRepor
 		return null;
 	}
 
+	@Override
+	public int deleteByParamsReportDetailIdList(List<String> paramsReportDetailIdList) {
+		LambdaQueryWrapper<ParamsReportConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.in(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsReportDetailIdList);
+		return baseMapper.delete(queryWrapper);
+	}
+
 }

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java

@@ -1711,6 +1711,19 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 		}
 	}
 
+	/**
+	 * 删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@Override
+	public boolean deleteByIds(List<String> ids) {
+		// 关联删除配置数据
+		paramsReportConfigDataEOService.deleteByParamsReportDetailIdList(ids);
+		return removeByIds(ids);
+	}
+
 	/**
 	 * 实体对象转成Map
 	 * @param obj 实体对象

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java

@@ -6,9 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper;
 import com.jero.modules.cert.collect.vo.ParamsManifestVO;
+import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
+import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.entity.ParamsReportEO;
+import com.jero.modules.cert.report.mapper.ParamsReportConfigEOMapper;
 import com.jero.modules.cert.report.mapper.ParamsReportEOMapper;
+import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
 import com.jero.modules.cert.report.service.IParamsReportEOService;
+import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,6 +37,15 @@ public class ParamsReportEOServiceImpl extends ServiceImpl<ParamsReportEOMapper,
 	@Autowired
 	private ParamsManifestEOMapper paramsManifestEOMapper;
 
+	@Autowired
+	private ParamsReportConfigEOMapper paramsReportConfigEOMapper;
+
+	@Autowired
+	private IParamsReportDetailEOService paramsReportDetailEOService;
+
+	@Autowired
+	private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService;
+
 	/**
 	 * 保存
 	 *
@@ -66,8 +80,26 @@ public class ParamsReportEOServiceImpl extends ServiceImpl<ParamsReportEOMapper,
 	 * @return
 	 */
 	@Override
-    public void deleteById(String id) {
+    public boolean deleteById(String id) {
-        removeById(id);
+
+		// 关联删除配置
+		LambdaQueryWrapper<ParamsReportConfigEO>  configEOQueryWrapper = new LambdaQueryWrapper<>();
+		configEOQueryWrapper.eq(ParamsReportConfigEO::getParamsManifestId, id);
+		paramsReportConfigEOMapper.delete(configEOQueryWrapper);
+
+		// 关联删除收集的参数项（包含配置数据）
+		LambdaQueryWrapper<ParamsReportDetailEO>  queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsReportDetailEO::getParamsManifestId, id);
+		List<ParamsReportDetailEO> paramsReportDetailEOList = paramsReportDetailEOService.list(queryWrapper);
+		if (CollectionUtil.isNotEmpty(paramsReportDetailEOList)) {
+			List<String> paramsReportDetailIdList = paramsReportDetailEOList.stream().map(ParamsReportDetailEO::getId).collect(Collectors.toList());
+			paramsReportDetailEOService.deleteByIds(paramsReportDetailIdList);
+		}
+
+		// 关联删除导出历史
+		paramsReportExportHistoryEOService.deleteByParamsManifestId(id);
+
+        return removeById(id);
     }
 
 	/**

jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportExportHistoryEOServiceImpl.java

@@ -1,7 +1,9 @@
 package com.jero.modules.cert.report.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
 import com.jero.modules.cert.report.enums.ExportTypeEnum;
 import com.jero.modules.cert.report.mapper.ParamsReportExportHistoryEOMapper;
@@ -10,11 +12,10 @@ import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.List;
-import java.util.Date;
-import java.util.Map;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 上报库导出历史
@@ -119,4 +120,11 @@ public class ParamsReportExportHistoryEOServiceImpl extends ServiceImpl<ParamsRe
 
 		return pageInfo;
 	}
+
+	@Override
+	public void deleteByParamsManifestId(String paramsManifestId) {
+		LambdaQueryWrapper<ParamsReportExportHistoryEO> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(ParamsReportExportHistoryEO::getParamsManifestId, paramsManifestId);
+		paramsReportExportHistoryEOMapper.delete(queryWrapper);
+	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java

@@ -67,7 +67,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String projectLibraryId;
 
 	/**编号*/
-	@Excel(name = "编号", width = 20)
+	@Excel(name = "*编号", width = 20)
     @ApiModelProperty(value = "编号")
     private String serialNumber;
 
@@ -150,7 +150,7 @@ public class ProjectLawsInventoryEO implements Serializable {
 	private String attestationType_dictText;
 
 	/**认证级别*/
-	@Excel(name = "认证级别", width = 20,dicCode ="attestation_rank")
+	@Excel(name = "*认证级别", width = 20,dicCode ="attestation_rank")
     @ApiModelProperty(value = "认证级别")
     //@Dict(dicCode ="attestation_rank")
     private String attestationRank;
@@ -167,7 +167,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String wvtaId;
 
 	/**责任领域*/
-	@Excel(name = "责任领域", width = 20,dicCode ="duty_territory")
+	@Excel(name = "*责任领域", width = 20,dicCode ="duty_territory")
     @ApiModelProperty(value = "责任领域")
     //@Dict(dicCode ="duty_territory")
     private String dutyTerritory;
@@ -207,7 +207,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String remark;
 
 	/**设计符合性确认-交付物类型*/
-	@Excel(name = "设计符合性确认-交付物类型", width = 20,dicCode ="deliverable_template")
+	@Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "设计符合性确认")
     @ApiModelProperty(value = "设计符合性确认-交付物类型")
     //@Dict(dicCode ="deliverable_template")
     private String designDeliverableType;
@@ -222,7 +222,7 @@ public class ProjectLawsInventoryEO implements Serializable {
 
     /**设计符合性确认-交付物模板名称*/
     @TableField(exist = false)
-    @Excel(name = "设计符合性确认-交付物模板", width = 20)
+    @Excel(name = "交付物模板", width = 20,groupName = "设计符合性确认")
     private String designDeliverableTemplateName;
 
 	/**设计符合性确认-发起人角色*/
@@ -238,7 +238,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String designInitiatorId;
 
     /**设计符合性确认-发起人名称*/
-    @Excel(name = "设计符合性确认-发起人", width = 20)
+    @Excel(name = "发起人", width = 20,groupName = "设计符合性确认")
     @TableField(exist = false)
     private String designInitiatorName;
 
@@ -255,12 +255,12 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String designDutyId;
 
     /**设计符合性确认-责任人名称*/
-    @Excel(name = "设计符合性确认-责任人", width = 20)
+    @Excel(name = "责任人", width = 20,groupName = "设计符合性确认")
     @TableField(exist = false)
     private String designDutyName;
 
 	/**设计符合性确认-截止时间*/
-	@Excel(name = "设计符合性确认-截止时间", width = 20, format = "yyyy-MM-dd")
+	@Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "设计符合性确认")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "设计符合性确认-截止时间")
@@ -270,11 +270,11 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String designDueDateString;
 
     //交付物说明
-    @Excel(name = "设计符合性确认-交付物说明", width = 20)
+    @Excel(name = "交付物说明", width = 20,groupName = "设计符合性确认")
     private String designRemark;
 
 	/**prehomo确认-交付物类型*/
-	@Excel(name = "prehomo确认-交付物类型", width = 20,dicCode ="deliverable_template")
+	@Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "Pre-homo确认")
     @ApiModelProperty(value = "prehomo确认-1")
     ////@Dict(dicCode ="deliverable_template")
     private String prehomoDeliverableType;
@@ -289,7 +289,7 @@ public class ProjectLawsInventoryEO implements Serializable {
 
     /**prehomo确认-交付物模板名称*/
     @TableField(exist = false)
-    @Excel(name = "prehomo确认-交付物模板", width = 20)
+    @Excel(name = "交付物模板", width = 20,groupName = "Pre-homo确认")
     private String prehomoDeliverableTemplateName;
 
 	/**prehomo确认-发起人角色*/
@@ -305,7 +305,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String prehomoInitiatorId;
 
     /**prehomo确认-发起人名称*/
-    @Excel(name = "prehomo确认-发起人", width = 20)
+    @Excel(name = "发起人", width = 20,groupName = "Pre-homo确认")
     @TableField(exist = false)
     private String prehomoInitiatorName;
 
@@ -322,12 +322,12 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String prehomoDutyId;
 
     /**prehomo确认-责任人名称*/
-    @Excel(name = "prehomo确认-责任人", width = 20)
+    @Excel(name = "责任人", width = 20,groupName = "Pre-homo确认")
     @TableField(exist = false)
     private String prehomoDutyName;
 
 	/**prehomo确认-截止时间*/
-	@Excel(name = "prehomo确认-截止时间", width = 20, format = "yyyy-MM-dd")
+	@Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "Pre-homo确认")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "prehomo确认-截止时间")
@@ -337,11 +337,11 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String prehomoDueDateString;
 
     //prehomo确认-交付物说明
-    @Excel(name = "prehomo确认-交付物说明", width = 20)
+    @Excel(name = "交付物说明", width = 20,groupName = "Pre-homo确认")
     private String prehomoRemark;
 
 	/**验证符合性确认-交付物类型*/
-	@Excel(name = "验证符合性确认-交付物类型", width = 20,dicCode ="deliverable_template")
+	@Excel(name = "交付物类型", width = 20,dicCode ="deliverable_template",groupName = "验证符合性确认")
     @ApiModelProperty(value = "验证符合性确认-交付物类型")
     //@Dict(dicCode ="deliverable_template")
     private String verifyDeliverableType;
@@ -355,7 +355,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String verifyDeliverableTemplate;
 
     /**验证符合性确认-交付物模板名称*/
-    @Excel(name = "验证符合性确认-交付物模板", width = 20)
+    @Excel(name = "交付物模板", width = 20,groupName = "验证符合性确认")
     @TableField(exist = false)
     private String verifyDeliverableTemplateName;
 
@@ -372,7 +372,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String verifyInitiatorId;
 
     /**验证符合性确认-发起人名称*/
-    @Excel(name = "验证符合性确认-发起人", width = 20)
+    @Excel(name = "发起人", width = 20,groupName = "验证符合性确认")
     @TableField(exist = false)
     private String verifyInitiatorName;
 
@@ -389,12 +389,12 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String verifyDutyId;
 
     /**验证符合性确认-责任人名称*/
-    @Excel(name = "验证符合性确认-责任人", width = 20)
+    @Excel(name = "责任人", width = 20,groupName = "验证符合性确认")
     @TableField(exist = false)
     private String verifyDutyName;
 
 	/**验证符合性确认-截止时间*/
-	@Excel(name = "验证符合性确认-截止时间", width = 20, format = "yyyy-MM-dd")
+	@Excel(name = "截止时间", width = 20, format = "yyyy-MM-dd",groupName = "验证符合性确认")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "验证符合性确认-截止时间")
@@ -404,7 +404,7 @@ public class ProjectLawsInventoryEO implements Serializable {
     private String verifyDueDateString;
 
     //验证备注
-    @Excel(name = "验证符合性确认-交付物说明", width = 20)
+    @Excel(name = "交付物说明", width = 20,groupName = "验证符合性确认")
     private String verifyRemark;
 
     @TableField(exist = false)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEOEn.java

@@ -188,7 +188,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String remark;
 
 	/**设计符合性确认-交付物类型*/
-	@Excel(name = "Design Compliance Check Deliverable Type", width = 50,dicCode ="deliverable_template")
+	@Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Design Compliance Check")
     @ApiModelProperty(value = "设计符合性确认-交付物类型")
     @Dict(dicCode ="deliverable_template")
     private String designDeliverableType;
@@ -199,7 +199,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
 
     /**设计符合性确认-交付物模板名称*/
     @TableField(exist = false)
-    @Excel(name = "Design Compliance Check Deliverable Template", width = 50)
+    @Excel(name = "Deliverable Template", width = 25,groupName = "Design Compliance Check")
     private String designDeliverableTemplateName;
 
 	/**设计符合性确认-发起人角色*/
@@ -212,7 +212,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String designInitiatorId;
 
     /**设计符合性确认-发起人名称*/
-    @Excel(name = "Design Compliance Check Initiator", width = 50)
+    @Excel(name = "Initiator", width = 25,groupName = "Design Compliance Check")
     @TableField(exist = false)
     private String designInitiatorName;
 
@@ -226,12 +226,12 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String designDutyId;
 
     /**设计符合性确认-责任人名称*/
-    @Excel(name = "Design Compliance Check Assignee", width = 50)
+    @Excel(name = "Assignee", width = 25,groupName = "Design Compliance Check")
     @TableField(exist = false)
     private String designDutyName;
 
 	/**设计符合性确认-截止时间*/
-	@Excel(name = "Design Compliance Check Due Date", width = 50, format = "yyyy-MM-dd")
+	@Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Design Compliance Check")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "设计符合性确认-截止时间")
@@ -240,11 +240,11 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String designDueDateString;
 
     //交付物说明
-    @Excel(name = "Design Compliance Check Deliverable Description", width = 50)
+    @Excel(name = "Deliverable Description", width = 25,groupName = "Design Compliance Check")
     private String designRemark;
 
 	/**prehomo确认-交付物类型*/
-	@Excel(name = "Pre-homo Check Deliverable Type", width = 50,dicCode ="deliverable_template")
+	@Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Pre-homo Check")
     @ApiModelProperty(value = "prehomo确认-1")
     @Dict(dicCode ="deliverable_template")
     private String prehomoDeliverableType;
@@ -255,7 +255,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
 
     /**prehomo确认-交付物模板名称*/
     @TableField(exist = false)
-    @Excel(name = "Pre-homo Check Deliverable Template", width = 50)
+    @Excel(name = "Deliverable Template", width = 25,groupName = "Pre-homo Check")
     private String prehomoDeliverableTemplateName;
 
 	/**prehomo确认-发起人角色*/
@@ -268,7 +268,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoInitiatorId;
 
     /**prehomo确认-发起人名称*/
-    @Excel(name = "Pre-homo Check Initiator", width = 50)
+    @Excel(name = "Initiator", width = 25,groupName = "Pre-homo Check")
     @TableField(exist = false)
     private String prehomoInitiatorName;
 
@@ -282,12 +282,12 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoDutyId;
 
     /**prehomo确认-责任人名称*/
-    @Excel(name = "Pre-homo Check Assignee", width = 50)
+    @Excel(name = "Assignee", width = 25,groupName = "Pre-homo Check")
     @TableField(exist = false)
     private String prehomoDutyName;
 
 	/**prehomo确认-截止时间*/
-	@Excel(name = "Pre-homo Check Due Date", width = 50, format = "yyyy-MM-dd")
+	@Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Pre-homo Check")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "prehomo确认-截止时间")
@@ -296,11 +296,11 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String prehomoDueDateString;
 
     //prehomo确认-交付物说明
-    @Excel(name = "Pre-homo Check Deliverable Description", width = 50)
+    @Excel(name = "Deliverable Description", width = 25,groupName = "Pre-homo Check")
     private String prehomoRemark;
 
 	/**验证符合性确认-交付物类型*/
-	@Excel(name = "Validation Compliance Check Deliverable Type", width = 50,dicCode ="deliverable_template")
+	@Excel(name = "Deliverable Type", width = 25,dicCode ="deliverable_template",groupName = "Validation Compliance Check")
     @ApiModelProperty(value = "验证符合性确认-交付物类型")
     @Dict(dicCode ="deliverable_template")
     private String verifyDeliverableType;
@@ -310,7 +310,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String verifyDeliverableTemplate;
 
     /**验证符合性确认-交付物模板名称*/
-    @Excel(name = "Validation Compliance Check Deliverable Template", width = 50)
+    @Excel(name = "Deliverable Template", width = 25,groupName = "Validation Compliance Check")
     @TableField(exist = false)
     private String verifyDeliverableTemplateName;
 
@@ -324,7 +324,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String verifyInitiatorId;
 
     /**验证符合性确认-发起人名称*/
-    @Excel(name = "Validation Compliance Check Initiator", width = 50)
+    @Excel(name = "Initiator", width = 25,groupName = "Validation Compliance Check")
     @TableField(exist = false)
     private String verifyInitiatorName;
 
@@ -338,12 +338,12 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String verifyDutyId;
 
     /**验证符合性确认-责任人名称*/
-    @Excel(name = "Validation Compliance Check Assignee", width = 50)
+    @Excel(name = "Assignee", width = 25,groupName = "Validation Compliance Check")
     @TableField(exist = false)
     private String verifyDutyName;
 
 	/**验证符合性确认-截止时间*/
-	@Excel(name = "Validation Compliance Check Due Date", width = 50, format = "yyyy-MM-dd")
+	@Excel(name = "Due Date", width = 25, format = "yyyy-MM-dd",groupName = "Validation Compliance Check")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "验证符合性确认-截止时间")
@@ -352,7 +352,7 @@ public class ProjectLawsInventoryEOEn implements Serializable {
     private String verifyDueDateString;
 
     //验证备注
-    @Excel(name = "Validation Compliance Check Deliverable Description", width = 60)
+    @Excel(name = "Deliverable Description", width = 25,groupName = "Validation Compliance Check")
     private String verifyRemark;
 
     @TableField(exist = false)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -3990,7 +3990,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		if(StringUtils.isNotBlank(projectLawsInventoryEO.getIds())){
 			queryWrapper.in("id",Arrays.asList(projectLawsInventoryEO.getIds().split(",")));
 		}
-		queryWrapper.orderByDesc("create_time");
+		queryWrapper.orderByDesc("create_time","serial_number");
 
 		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
 		if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java

@@ -22,6 +22,13 @@ public interface ISarFileSplitMenuEOService extends IService<SarFileSplitMenuEO>
 
     int addMenu(SarFileSplitMenuEO sarFileSplitMenuEO);
 
+    /**
+     * 根据ID查询所有的子节点包括父节点
+     * @param sarFileSplitMenuEO
+     * @return
+     */
+    List<SarFileSplitMenuEO> queryAllChildrenById(SarFileSplitMenuEO sarFileSplitMenuEO);
+
     void deleteMenu(String id);
 
     int insert(SarFileSplitMenuEO sarFileSplitMenuEO);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java

@@ -45,6 +45,7 @@ import com.jero.modules.split.page.SarFileSplitMenuEOPage;
 import com.jero.modules.split.service.IFileSplitItemsEOService;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
 import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
+import com.jero.modules.split.service.ISarFileSplitMenuEOService;
 import com.jero.modules.split.util.POIReadExcelToHtml;
 import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysCategoryTreeVO;
@@ -124,6 +125,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
     private IBussDocumentLibraryEOService documentLibraryEOService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ISarFileSplitMenuEOService sarFileSplitMenuEOService;
 
 
     @Value(value = "${jero.path.upload}")
@@ -682,9 +685,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     // 查询所有子级id
                     SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
                     sarFileSplitMenuEO.setId(value);
-                    List<String> menuIdList = sarFileSplitMenuEOMapper.queryAllChildrenByid(sarFileSplitMenuEO).stream()
+                    List<String> menuIdList = sarFileSplitMenuEOService.queryAllChildrenById(sarFileSplitMenuEO).stream()
                             .map(SarFileSplitMenuEO::getId)
                             .collect(Collectors.toList());
+//                    List<String> menuIdList = sarFileSplitMenuEOMapper.queryAllChildrenByid(sarFileSplitMenuEO).stream()
+//                            .map(SarFileSplitMenuEO::getId)
+//                            .collect(Collectors.toList());
                     String menuIds = StringUtils.join(menuIdList,"','");
                     conditionSb.append(" and sar_file_split_items." + key + " in('" + menuIds + "')");
                 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java

@@ -1,6 +1,6 @@
 package com.jero.modules.split.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.modules.split.entity.SarFileSplitMenuEO;
 import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper;
@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -79,12 +80,41 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
         return count;
     }
 
+    public List<SarFileSplitMenuEO> queryAllChildrenById(SarFileSplitMenuEO sarMenuEO) {
+        SarFileSplitMenuEO sarFileSplitMenuEO = dao.selectByPrimaryKey(sarMenuEO.getId());
+        SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage();
+        page.setInfoId(sarFileSplitMenuEO.getInfoId());
+        List<SarFileSplitMenuEO> listAll = dao.queryByList(page); // 查询所有目录
+
+        List<SarFileSplitMenuEO> result = new ArrayList<>();
+        // 递归查询 指定父节点下的所有子节点，包括父节点
+        if (CollectionUtil.isNotEmpty(listAll)) {
+            result.add(sarFileSplitMenuEO); // 加上父节点
+            recursion(listAll, result, sarFileSplitMenuEO);
+        }
+
+        return result;
+    }
+
+    private void recursion(List<SarFileSplitMenuEO> listAll, List<SarFileSplitMenuEO> result, SarFileSplitMenuEO father) {
+        List<SarFileSplitMenuEO> childern = listAll.stream().filter(e-> father.getId().equals(e.getPId())).collect(Collectors.toList());
+        if (CollectionUtil.isNotEmpty(childern)) {
+            result.addAll(childern);
+            for(SarFileSplitMenuEO menuEO : childern) {
+                recursion(listAll, result, menuEO);
+            }
+
+        }
+    }
+
     public void deleteMenu(String id){
         List<String> menuIds = new ArrayList<>();
         SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO();
         sarMenuEO.setId(id);
         // 查询当前节点及所有子节点
-        List<SarFileSplitMenuEO> list = dao.queryAllChildrenByid(sarMenuEO);
+//        List<SarFileSplitMenuEO> list = dao.queryAllChildrenByid(sarMenuEO);
+        List<SarFileSplitMenuEO> list = queryAllChildrenById(sarMenuEO);
+
         if (list != null && !list.isEmpty()) {
             for(SarFileSplitMenuEO menu : list){
                 menuIds.add(menu.getId());

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

@@ -1286,4 +1286,10 @@ module.exports = {
   listConfirmationRejectionReason:'List confirmation rejection reason',
   taskConfirmationRejectionReason:'Task confirmation rejection reason',
   onlyCompletedDataCanBeDeleted:'Only completed data can be deleted',
+  reportedDelete:'You\'re about to permanently delete the parameter list',
+  reportDelete:',including its parameters and export history. Once you confirm and press Delete, it cannot be undone or recovered.',
+  confirmdelete:'Confirm the listing title you want to delete',
+  Deletetitle:'Delete the title',
+  toConfirmed: 'to confirm',
+  confirmtitle:'The title is incorrect. Please re-enter it',
 }

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

@@ -1387,5 +1387,11 @@ module.exports = {
   collectionLegislativeComments:'法规意见收集',
   regulatoryAndTechnicalAssessment:'法规技术评估',
   listConfirmationRejectionReason:'清单确认驳回原因',
-  taskConfirmationRejectionReason:'任务确认驳回原因'
+  taskConfirmationRejectionReason:'任务确认驳回原因',
+  reportedDelete:'您将永久删除清单',
+  reportDelete:',包括清单参数项及导出历史。一旦删除将无法撤销或恢复。',
+  confirmdelete:'请确认要删除的清单标题',
+  Deletetitle:'删除标题',
+  toConfirmed: '来确认',
+  confirmtitle:'标题不正确，请重新输入',
 }

jero-web/src/components/TaskCutOffTime/index.vue

@@ -1,4 +1,13 @@
 <template>
+  <a-modal
+    :title="listTitle"
+    :width="500"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
   <div class='diolag-area'>
     <a-spin :spinning='spinLoading'>
       <a-form-model
@@ -11,7 +20,7 @@
       >
         <a-row :gutter='24'>
           <a-col :span="12">
-            <div class="box-title-text">
+            <div class="box-title-text" style='margin-top: -33px'>
               <div class="title-text">
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('cutoffTime')">
@@ -36,10 +45,10 @@
         </a-row>
       </a-form-model>
     </a-spin>
-    <div class='drawer-bootom-button'>
+<!--    <div class='drawer-bootom-button'>-->
-      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
+<!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
-      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
+<!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
-    </div>
+<!--    </div>-->
     <!--    错误数据提示-->
     <a-modal
       :title="$t('operationFailed')"
@@ -69,6 +78,7 @@
     </a-modal>
     <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
   </div>
+  </a-modal>
 </template>
 
 <script>
@@ -85,12 +95,14 @@ export default {
     return {
       token:Vue.ls.get(ACCESS_TOKEN),
       title: this.$t('add'),
+      listTitle:this.$t('OneclickCollection'),
       total: 0,
       selectedRowKeysDate: {},
       loading: false,
       editId: '',
       visibleoperationFailed:false,
       newVisible: false,
+      visible:false,
       textLoading:false,
       NotSelectedRowKeysValue:[],
       labelCol: {
@@ -134,6 +146,9 @@ export default {
     }
   },
   methods: {
+    searchData(){
+      this.visible = true
+    },
     loadData() {
       this.loading = true
       let params = {
@@ -158,6 +173,7 @@ export default {
       this.loadData()
     },
     handleCancel() {
+      this.visible = false
       this.$emit('areaVisibleTaskCutOffTimeflag', false)
     },
     handleTableChange(val) {
@@ -289,33 +305,40 @@ export default {
 /deep/.ant-modal-body{
   height: 100% !important;
 }
+/deep/.ant-form-item-control{
+  width: 323%;
+  margin-top: 29px;
+}
 .box-title-text {
   line-height: 1.4;
   display: flex;
-  width: 276px;
+  align-items: center;
-  /*align-items: center;*/
+  /*margin-bottom: 10px;*/
 }
 
 .title-text {
-  width: 90px;
+  width: 100%;
-  text-align: right;
+  color: #000F16;
   display: inline-block;
-  font-weight: bold;
+  font-weight: 500;
   font-size: 14px;
   margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
 }
 
 .box-input {
   display: inline-block;
+  width: 70%;
   height: 38px;
-  width: 100%;
+  margin-top: 2px;
 }
 
 .itemModel {
-  width: calc(100% - 130px);
+  width: 100%;
   display: inline-block;
   margin-top: 2px;
 }

jero-web/src/components/TaskCutOffTime/indexonekey.vue

@@ -1,4 +1,13 @@
 <template>
+  <a-modal
+    :title="listTitle"
+    :width="500"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :maskClosable="false"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
   <div class='diolag-area'>
     <a-spin :spinning='spinLoading'>
       <a-form-model
@@ -11,7 +20,7 @@
       >
         <a-row :gutter='24'>
           <a-col :span="12">
-            <div class="box-title-text" >
+            <div class="box-title-text" style='margin-top: -33px'>
               <div class="title-text">
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('cutoffTime')">
@@ -36,10 +45,10 @@
         </a-row>
       </a-form-model>
     </a-spin>
-    <div class='drawer-bootom-button'>
+<!--    <div class='drawer-bootom-button'>-->
-      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
+<!--      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>-->
-      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
+<!--      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>-->
-    </div>
+<!--    </div>-->
     <!--    错误数据提示-->
     <a-modal
       :title="$t('operationFailed')"
@@ -70,6 +79,7 @@
     </a-modal>
     <JLoading :loading="textLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
   </div>
+  </a-modal>
 </template>
 
 <script>
@@ -86,9 +96,11 @@ export default {
     return {
       token:Vue.ls.get(ACCESS_TOKEN),
       title: this.$t('add'),
+      listTitle:this.$t('OneclickCollection'),
       total: 0,
       selectedRowKeysDate: {},
       loading: false,
+      visible:false,
       editId: '',
       visibleoperationFailed:false,
       newVisible: false,
@@ -134,6 +146,9 @@ export default {
     }
   },
   methods: {
+    searchData(){
+      this.visible = true
+    },
     loadData() {
       this.loading = true
       let params = {
@@ -158,6 +173,7 @@ export default {
       this.loadData()
     },
     handleCancel() {
+      this.visible = false
       this.$emit('areaVisibleTaskCutOffTimeAll', false)
     },
     handleTableChange(val) {
@@ -286,33 +302,40 @@ export default {
 
 </style>
 <style scoped>
+/deep/.ant-form-item-control{
+  width: 323%;
+  margin-top: 29px;
+}
 .box-title-text {
   line-height: 1.4;
   display: flex;
-  width: 276px;
+  align-items: center;
-  /*align-items: center;*/
+  /*margin-bottom: 10px;*/
 }
 
 .title-text {
-  width: 90px;
+  width: 100%;
-  text-align: right;
+  color: #000F16;
   display: inline-block;
-  font-weight: bold;
+  font-weight: 500;
   font-size: 14px;
   margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
 }
 
 .box-input {
   display: inline-block;
+  width: 70%;
   height: 38px;
-  width: 100%;
+  margin-top: 2px;
 }
 
 .itemModel {
-  width: calc(100% - 130px);
+  width: 100%;
   display: inline-block;
   margin-top: 2px;
 }

jero-web/src/components/tableCollection/index.vue

@@ -25,10 +25,11 @@
           <span style='padding-right: 10px;margin-left: -16px'>{{ item.db_field_txt }} </span>
           <a-button @click='onClickSee(item)'>{{$t('See')}}</a-button>
         </div>
+<!--        {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}-->
         <span slot="ParameterDescription" slot-scope="text,record" :title="text">
-            {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}
-        </span>
 
+          <a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
+        </span>
         <span slot="operationbtn" slot-scope="record">
            <span v-if='currentPersonRole === "homo"'>
 <!--           认证工程师  -->
@@ -192,6 +193,18 @@
         </div>
       </div>
     </a-modal>
+    <!--  参数说明--->
+    <a-modal v-model="seeVisibleView" :title="$t('ParameterDescription')" width='550px' :footer="null">
+      <div class="content-text">
+        <div class="textfield">
+          <span class="textfield-left" :title="$t('ParameterDescription')">{{$t('ParameterDescription')}}:</span>
+          <span class="textfield-right"
+                :title="this.description"
+          >{{this.description}}</span>
+        </div>
+      </div>
+    </a-modal>
+
   </div>
 </template>
 
@@ -219,6 +232,7 @@
         default: {},
         require: true
       },
+      description:'',
       formInline: {
         type: Object,
         default: true
@@ -331,6 +345,7 @@
         Dateline: {},
         getquerySdtId: '', // 当前工程接口人的id
         areaVisibleView: false, // 查看配置得弹框
+        seeVisibleView:false,
         configDetail: {} // 查看配置得详细信息
       }
     },
@@ -376,6 +391,12 @@
         this.$emit('handlePreservation')
         this.getTableList()
       },
+      onClickTitle(val){
+        console.log(val)
+        this.description = val.description
+        this.seeVisibleView = true
+
+      },
       // 查看配置详细信息
       onClickSee(val) {
         let _this = this
@@ -662,6 +683,7 @@
               }
             })
             this.columns = [...this.columns]
+            this.$forceUpdate()
           }
         })
       },
@@ -919,6 +941,34 @@
         font-weight: 400;
       }
     }
+    .textfield {
+      width: 100%;
+      margin-bottom: 8px;
+      display: flex;
+
+      .textfield-left {
+        width: 80px;
+        display: inline-block;
+        font-size: 16px;
+        color: #040B29;
+        font-weight: 400;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+      }
+
+      .textfield-right {
+        display: inline-block;
+        font-size: 16px;
+        //text-overflow: ellipsis;
+        //white-space: nowrap;
+        width: 100%;
+        overflow: hidden;
+        word-break: break-word;
+        color: #040B29;
+        font-weight: 400;
+      }
+    }
   }
 </style>
 <style>

jero-web/src/views/parameter/escalationlibrary/index.vue

@@ -48,6 +48,7 @@
         <span slot="operation" slot-scope="text,record">
             <a class="text-operation" @click="handlecody(record)" v-has="'params:report:history'">{{$t('Exporthistory')}}</a>
             <a class="text-operation" @click="deleteLib(record)" v-has="'report:detail:list'">{{$t('See')}}</a>
+            <a class="action-delete"  @click="onDelete(record)" v-has="'params:report:delete'">{{$t('delete')}}</a>
         </span>
       </a-table>
     </div>
@@ -67,6 +68,37 @@
     <a-modal class="show-drawer" :title="titleTag" width="900px" v-model="drawerVisible" :footer="null">
       <export-history v-if='drawerVisible' @areaVisible='drawerVisible = false' :paramsManifestId='paramsManifestId'></export-history>
     </a-modal>
+    <!--     删除-->
+    <a-modal class="show-drawer" :title="titleDelete" width="500px" v-model="deleteVisible" :footer="null">
+      <a-spin :spinning="confirmLoading">
+        <a-form>
+          <a-form-model :model="formInline" class="formAdd" :rules="rules1" ref="ruleForm">
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="titletext">
+                  <span>{{$t('reportedDelete')}}&nbsp;<span style="font-weight: bold">{{ this.deleteformtltle }}</span>&nbsp;{{$t('reportDelete')}}</span>
+                </div>
+                <div class="title-text">
+                  <span class="title-text-text">{{$t('pleaseEnter')}}&nbsp;<span style="color: #BD3B1E;background-color: #F9E5E1">{{ this.deleteformtltle }}</span>&nbsp;{{$t('toConfirmed')}}</span>
+                </div>
+                <div class="box-title-text">
+                  <a-form-model-item class="itemModel" prop="paramsTemplateName">
+                    <a-input class="box-input"
+                             :disabled="disabled"
+                             v-model="formInline.paramsTemplateName"
+                             :placeholder="$t('PleaseEnter')+this.deleteformtltle"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
+            </a-row>
+          </a-form-model>
+        </a-form>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('determine')}}</a-button>
+      </div>
+    </a-modal>
   </a-card>
 </template>
 
@@ -88,6 +120,8 @@
         token: Vue.ls.get(ACCESS_TOKEN),
         loading: false,
         toggleSearchStatus: false,
+        deleteVisible:false,
+        titleDelete:this.$t('Deletetitle'),
         selectedRowKeys: [],
         paramsManifestId:'',
         selectedRowKeysArray: '',
@@ -97,8 +131,17 @@
             { required: true, message: this.$t('PleaseEnter') + this.$t('templateName'), trigger: 'change' }
           ]
         },
+        rules1: {
+          paramsTemplateName:[
+            { required: true, message: this.$t('PleaseEnter')+this.$t('title'), trigger: 'change' },
+            { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' },
+          ],
+        },
+        disabled: false,
+        projectNameList: [],
         visible: false,
         dataSource: [],
+        deleteformtltle:'',
         confirmLoading: false,
         url: {
           list: 'params/report/page'
@@ -134,6 +177,7 @@
           }
         ],
         queryParam: {},
+        deleteform:{},
         areaVisible: false,
         paramsTemplateName: '',
         drawerVisible: false,
@@ -145,24 +189,28 @@
     },
     methods: {
       handleCancel() {
-        this.areaVisible = false
+        this.deleteVisible = false
+        this.$refs.ruleForm.resetFields()
       },
       handleSubmit() {
-        if (this.formInline.paramsTemplateName !== undefined) {
-          this.formInline.paramsTemplateName = this.formInline.paramsTemplateName.trim()
-        }
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
-            getAction(this.url.copy + `?id=${this.selectedRowKeys[0]}&paramsTemplateName=${this.formInline.paramsTemplateName}`, {}).then((res) => {
+            if(this.formInline.paramsTemplateName === this.deleteform.title){
-              if (res.success) {
+              getAction('/params/report/delete', {
-                this.areaVisible = false
+                id: this.deleteform.id
-                this.$message.success(res.message)
+              }).then((res) => {
-                this.selectedRowKeys = []
+                if (res.success) {
-                this.getList()
+                  this.deleteVisible = false
-              } else {
+                  this.$message.success(res.message)
-                this.$message.warning(res.message)
+                  this.getList()
-              }
+                } else {
-            })
+                  this.$message.warning(res.message)
+                }
+              })
+            }else{
+              this.$message.warning(this.$t('confirmtitle'))
+            }
+
           }
         })
       },
@@ -226,6 +274,36 @@
         this.queryParam[value] = id
         this.queryParam = { ...this.queryParam }
       },
+      //删除
+      onDelete(val) {
+        this.deleteform = val
+        this.deleteformtltle = val.title
+        this.formInline = {}
+        this.deleteVisible = true
+        this.titleDelete = this.$t('Deletetitle') + "'" + val.title + "'" + '?'
+        // let param = {
+        //   id: val.id
+        // }
+        // this.$confirm({
+        //   title: this.$t('reportedDelete'),
+        //   content: '',
+        //   onOk:
+        //     async () => {
+        //       getAction(`sys/dict/logicDelete`, param).then(res => {
+        //         if (res.success) {
+        //           this.$message.success(this.$t('OperationSuccessful'))
+        //           this.reFresh()
+        //           if (this.tableData && this.tableData.length == 1 && this.queryParams.pageNo != 1) {
+        //             this.queryParams.pageNo = this.queryParams.pageNo - 1
+        //           }
+        //           this.loadData()
+        //         } else {
+        //           this.$message.warning(this.$t('operationFailed'))
+        //         }
+        //       })
+        //     }
+        // })
+      },
       getList() {
         let query = {
           pageNo: this.pageNo,
@@ -264,12 +342,12 @@
   }
 
   .title-text {
-    width: 20%;
+    /*width: 60%;*/
     min-width: 110px;
     color: #000F16;
     display: inline-block;
     font-weight: 500;
-    font-size: 14px;
+    font-size: 16px;
     margin-right: 16px;
     margin-top: 3px;
     text-align: right;
@@ -277,10 +355,23 @@
     overflow: hidden;
     text-overflow: ellipsis;
   }
-
+ .titletext{
+   width: 460px;
+   min-width: 110px;
+   color: #000F16;
+   display: inline-block;
+   font-weight: 500;
+   font-size: 16px;
+   /*margin-right: 16px;*/
+   /*margin-top: 3px;*/
+   /*text-align: right;*/
+   /*white-space: nowrap;*/
+   overflow: hidden;
+   text-overflow: ellipsis;
+ }
   .box-input {
     display: inline-block;
-    width: 70%;
+    width: 213%;
     height: 38px;
     margin-top: 2px;
   }
@@ -330,7 +421,8 @@
   }
 
   .itemModel {
-    width: calc(100% - 130px);
+    /*width: calc(100% - 130px);*/
+    width: 100%;
     display: inline-block;
     margin-top: 2px;
   }
@@ -368,7 +460,11 @@
     background: #fff!important;
     opacity: 0.9;
   }
-
+  /deep/.ant-modal-title{
+    font-weight: bold;
+    font-size: 18px;
+    letter-spacing: 1px;
+  }
   ::v-deep .ant-table-body {
     background: transparent!important;
   }

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

@@ -290,17 +290,17 @@
                    @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag' @areaVisible='areaVisibleAssignedby = false'/>
     </a-modal>
     <!--  下发收集--->
-    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">
+<!--    <a-modal v-model="areaVisibleTaskCutOffTime" :title="$t('distributionAndCollection')" width='400px' :footer="null">-->
-      <task-cut-off-time v-if='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
+      <task-cut-off-time ref='areaVisibleTaskCutOffTime' :selectedRowKeysArray='selectedRowKeysArray'
                          @GetgetTableList='GetgetTableList'
                          @areaVisibleTaskCutOffTimeflag='areaVisibleTaskCutOffTimeflag'/>
-    </a-modal>
+<!--    </a-modal>-->
     <!--  一键下发收集--->
-    <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">
+<!--    <a-modal v-model="OneclickCollection" :title="$t('OneclickCollection')" width='400px' :footer="null">-->
-      <task-time v-if='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
+      <task-time ref='OneclickCollection' :selectedRowKeysArray='selectedRowKeysArray'
                          @GetgetTableList='GetgetTableList'
                          @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/>
-    </a-modal>
+<!--    </a-modal>-->
 <!--    调整责任领域-->
     <a-modal v-model="Adjustareasofrespon" :title="$t('Adjustareasofresponsibility')" width='620px' :footer="null">
       <adjustarea-sofrespon v-if='Adjustareasofrespon' :selectedRowKeysArray='selectedRowKeysArray'
@@ -1195,7 +1195,7 @@
         if(this.selectedRowKeysValue.length == 0){
           this.$message.warning(this.$t('selectLeastOne'))
         }else{
-          this.areaVisibleTaskCutOffTime = true
+          this.$refs.areaVisibleTaskCutOffTime.searchData()
         }
         // let homodistributionAndCollection = this.homodistributionAndCollection()
         // if (homodistributionAndCollection == 1) {
@@ -1211,7 +1211,8 @@
       },
       // 一键下发收集
       defOneclickCollection() {
-          this.OneclickCollection = true
+        this.$refs.OneclickCollection.searchData()
+          // this.OneclickCollection = true
       },
       // // 下发收集---请求接口
       // distributionAndCollection() {
@@ -1538,13 +1539,9 @@
       // },
       // 截至时间确定弹框关闭
       areaVisibleTaskCutOffTimeflag(val) {
-        console.log(val)
-        this.areaVisibleTaskCutOffTime = val
         this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
       },
       areaVisibleTaskCutOffTimeAll(val){
-        console.log(val)
-        this.OneclickCollection = val
         this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
       },
       AdjustareasofresponAll(val){

jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue

@@ -78,7 +78,7 @@
     </div>
     <!--  清单弹框  -->
     <a-modal v-model="listVisible" :title="$t('parameterTemplate')" width='700px' :footer="null">
-      <parameter-template v-if='listVisible' @listVisibleRow='listVisibleRow'></parameter-template>
+      <parameter-template v-if='listVisible' @areaVisible='drawerhandleCancel' @listVisibleRow='listVisibleRow'></parameter-template>
     </a-modal>
   </div>
 </template>
@@ -250,6 +250,9 @@ export default {
     handleCancel() {
       this.$emit('areaVisible', false)
     },
+    drawerhandleCancel(val) {
+      this.listVisible = val
+    },
     onSelectChange(selectedRowKeys, selectedRowKeysDate) {
       this.selectedRowKeysDate = selectedRowKeysDate
       this.selectedRowKeys = selectedRowKeys