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

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

@@ -3310,8 +3310,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			fileTemp.mkdirs();
 			//文件
 			exportFile(dataList,fileInfos);
+			String excelName = "";
+			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
+				excelName = "法规清单.xlsx";
+			}else{
+				excelName = "Regulation List.xlsx";
+			}
 			//excel
-			OutputStream excelOS = new FileOutputStream(path + File.separator + "法规清单.xlsx");
+			OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
 			ExportParams exportParams = new ExportParams();
 			exportParams.setType(ExcelType.XSSF);
 			if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
@@ -3450,6 +3456,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			if(StringUtils.isNotBlank(pullVerifyDeliverableType)){
 				projectLawsInventoryEOEn.setVerifyDeliverableType(pullVerifyDeliverableType);
 			}
+			//清单确认状态
+			String inventoryAffirmStatus = projectLawsInventoryEOEn.getInventoryAffirmStatus();
+			if(StringUtils.isNotBlank(inventoryAffirmStatus)){
+				projectLawsInventoryEOEn.setInventoryAffirmStatusName(inventoryAffirmStatus);
+			}
+
+			//任务确认状态
+			String taskAffirmStatus = projectLawsInventoryEOEn.getTaskAffirmStatus();
+			if(StringUtils.isNotBlank(taskAffirmStatus)){
+				projectLawsInventoryEOEn.setTaskAffirmStatusName(taskAffirmStatus);
+			}
 		}
 	}
 

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

@@ -336,7 +336,7 @@
         // 默认为0  可全部删除
         let flag = 1
         this.selectedRowKeysvalArray.forEach((item) => {
-          if (item.state !== '已完成' && val.state !== 'Finished') {
+          if (item.state !== '已完成' && item.state !== 'Finished') {
             flag = 0
           }
         })