依据性文件删除修改功能

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectClaimController.java

@@ -186,6 +186,7 @@ public class ProjectClaimController extends BaseController {
                             contentData.setCnumber(contract.getCnumber());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
+                            contentData.setCreateDate(data.getCreateDate());
                             //添加工作内容id
                             contentData.setProjectContentId(record.getProjectContentId());
 

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectDesignController.java

@@ -305,6 +305,7 @@ public class ProjectDesignController extends BaseController {
                             contentData.setCnumber(contract.getCnumber());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
+                            contentData.setCreateDate(data.getCreateDate());
                             //添加工作内容id
                             contentData.setProjectContentId(record.getProjectContentId());
 

src/main/java/com/jeeplus/modules/projectVisa/web/ProjectVisaController.java

@@ -323,6 +323,7 @@ public class ProjectVisaController extends BaseController {
                             contentData.setCnumber(contract.getCnumber());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
+                            contentData.setCreateDate(data.getCreateDate());
                             //添加工作内容id
                             contentData.setProjectContentId(record.getProjectContentId());
 

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectContentDataDao.java

@@ -83,4 +83,11 @@ public interface ProjectContentDataDao extends CrudDao<ProjectContentData> {
      */
     List<ProjectContentData> getProjectContentData(String id);
 
+    /**
+     * 根据参数删除project_content_based表中的数据
+     * @param contentId
+     * @param basedId
+     */
+    void deleteProjectContentBased(@Param("contentId") String contentId,@Param("basedId") String basedId);
+
 }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectContentDataService.java

@@ -120,35 +120,41 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
         HashMap<String, Object> map = new HashMap<>(5);
         map.put("contentId", contentId);
         map.put("projectBasedDataList", projectBasedDataList);
-        dao.batchInsertBaseData(map);
+        if(projectBasedDataList.size() > 0){
+            dao.batchInsertBaseData(map);
+        }
     }
 
     @Transactional(readOnly = false)
-    public void deleteBased(String contentId,String basedId) {
+    public void deleteBased(String contentId,String basedId,String condition) {
         int i = dao.deleteBasedData(contentId, basedId);
         if(i==0){
             return;
         }
-        //删除菜单
-        Projectcontentinfo parent = projectcontentinfoDao.getByInfoId(contentId);
-        Projectcontentinfo select2 = new Projectcontentinfo();
-        select2.setParent(parent);
-        select2.setProject(parent.getProject());
-        select2.setName("依据资料");
-        List<Projectcontentinfo> infos = projectcontentinfoDao.findListByParentSelective(select2);
-        Projectcontentinfo projectcontentinfo = infos.get(0);
-        select2.setParent(projectcontentinfo);
-        select2.setName(null);
+        if("according".equals(condition) || "completion".equals(condition) || "early".equals(condition) || "claim".equals(condition) || "design".equals(condition) || "visa".equals(condition) || "interim".equals(condition) || "distribution".equals(condition)){
+            dao.deleteProjectContentBased(contentId,basedId);
+        }else{
+            //删除菜单
+            Projectcontentinfo parent = projectcontentinfoDao.getByInfoId(contentId);
+            Projectcontentinfo select2 = new Projectcontentinfo();
+            select2.setParent(parent);
+            select2.setProject(parent.getProject());
+            select2.setName("依据资料");
+            List<Projectcontentinfo> infos = projectcontentinfoDao.findListByParentSelective(select2);
+            Projectcontentinfo projectcontentinfo = infos.get(0);
+            select2.setParent(projectcontentinfo);
+            select2.setName(null);
 //        select2.setLinkId(basedId);
-        select2.setInfoId(basedId);
-        //删除当前菜单
-        projectcontentinfoDao.deleteByParentAndLinkId(select2);
-        //是否删除父级菜单
-        select2.setInfoId(null);
-        select2.setLinkId(null);
-        List<Projectcontentinfo> sonList = projectcontentinfoDao.findListByParentSelective(select2);
-        if(sonList==null || sonList.isEmpty()){
-            projectcontentinfoDao.delete(projectcontentinfo);
+            select2.setInfoId(basedId);
+            //删除当前菜单
+            projectcontentinfoDao.deleteByParentAndLinkId(select2);
+            //是否删除父级菜单
+            select2.setInfoId(null);
+            select2.setLinkId(null);
+            List<Projectcontentinfo> sonList = projectcontentinfoDao.findListByParentSelective(select2);
+            if(sonList==null || sonList.isEmpty()){
+                projectcontentinfoDao.delete(projectcontentinfo);
+            }
         }
     }
 

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -270,10 +270,14 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 			}
 			//保存依据资料信息
 			if(projectContentData.getProjectBasedDataList()!=null&&!projectContentData.getProjectBasedDataList().isEmpty()){
+				//删除已存在的附件信息
+				workattachmentDao.deleteByDivIdType(projectContentData.getId());
 				for (ProjectBasedData data:projectContentData.getProjectBasedDataList()) {
 					//判定是否为全过程管理中的项目复核模块
 					if("132".equals(data.getFlag())){
 						if("132".equals(data.getFileAttachmentFlag())) {
+							//删除已存在的工作内容和依据性资料关系
+							projectImplementEarlyService.delProjectContrntAndBasedId(projectContentData.getId(),data.getId());
 							//添加工作内容和依据性资料关系
 							projectImplementEarlyService.saveProjectContrntAndBasedId(projectContentData.getId(),data.getId());
 							//将工作内容信息附件保存

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectContentDataController.java

@@ -218,11 +218,11 @@ public class ProjectContentDataController extends BaseController {
 
     @RequestMapping("ajaxdelete")
     @ResponseBody
-    public AjaxJson deleteBased(String contentId,String basedId){
+    public AjaxJson deleteBased(String contentId,String basedId,String condition){
         AjaxJson ajaxJson = new AjaxJson();
         try {
             if (StringUtils.isNotBlank(contentId)) {
-                projectContentDataService.deleteBased(contentId, basedId);
+                projectContentDataService.deleteBased(contentId, basedId,condition);
             }
             Integer count = projectContentDataService.countBased(basedId);
             ajaxJson.getBody().put("inuse", count == null ? true : count > 0);

src/main/java/com/jeeplus/modules/projectrecord/dao/ProjectImplementEarlyDao.java

@@ -39,6 +39,7 @@ public interface ProjectImplementEarlyDao extends CrudDao<ProjectImplementEarly>
      * @return
      */
     Integer getProjectContrntAndReport(@Param("contentId") String contentId,@Param("reportId") String reportId);
+
     /**
      * 添加依据性资料和工作内容关系
      * @param contentId
@@ -46,4 +47,12 @@ public interface ProjectImplementEarlyDao extends CrudDao<ProjectImplementEarly>
      * @return
      */
     Integer saveProjectContrntAndBasedId(@Param("contentId") String contentId,@Param("basedId") String basedId);
+
+    /**
+     * 添加依据性资料和工作内容关系
+     * @param contentId
+     * @param basedId 依据性资料id
+     * @return
+     */
+    Integer delProjectContrntAndBasedId(@Param("contentId") String contentId,@Param("basedId") String basedId);
 }

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectImplementEarlyService.java

@@ -113,6 +113,13 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
     public Integer saveProjectContrntAndBasedId(String contentId,String basedId){
         return dao.saveProjectContrntAndBasedId(contentId,basedId);
     }
+    /**
+     * 删除依据性资料和工作内容关系
+     * @return
+     */
+    public Integer delProjectContrntAndBasedId(String contentId,String basedId){
+        return dao.delProjectContrntAndBasedId(contentId,basedId);
+    }
 
     /**
      * 添加项目内容id和项目报告id的关系

src/main/java/com/jeeplus/modules/projectrecord/web/armorForMaterials/ArmorForMaterialsController.java

@@ -173,6 +173,7 @@ public class ArmorForMaterialsController extends BaseController {
                             contentData.setCnumber(contract.getCnumber());
                             contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
+                            contentData.setCreateDate(data.getCreateDate());
 
                             //将项目设置为第二级数据
                             contentData.setCondition(3);

src/main/java/com/jeeplus/modules/projectrecord/web/check/ChechDesignController.java

@@ -303,6 +303,7 @@ public class ChechDesignController extends BaseController {
                             contentData.setNumber(data.getReportName());
                             contentData.setProjectId(record.getId());
                             contentData.setReportId(data.getReportId());
+                            contentData.setCreateDate(data.getCreateDate());
 
                             if(p.size()>0){
                                 contentData.setContentPId(p.get(0).getId());

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckClaimController.java

@@ -188,6 +188,7 @@ public class CheckClaimController extends BaseController {
                             contentData.setNumber(data.getReportName());
                             contentData.setProjectId(record.getId());
                             contentData.setReportId(data.getReportId());
+                            contentData.setCreateDate(data.getCreateDate());
 
                             if(p.size()>0){
                                 contentData.setContentPId(p.get(0).getId());

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckDistributionSettlementController.java

@@ -203,6 +203,7 @@ public class CheckDistributionSettlementController extends BaseController {
                             contentData.setStatus(data.getStatus());
                             contentData.setProjectId(record.getId());
                             contentData.setReportId(data.getReportId());
+                            contentData.setCreateDate(data.getCreateDate());
 
                             if(p.size()>0){
                                 contentData.setContentPId(p.get(0).getId());

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckInterimPaymentController.java

@@ -197,6 +197,7 @@ public class CheckInterimPaymentController extends BaseController {
                             }
                             contentData.setProjectId(record.getId());
                             contentData.setReportId(data.getReportId());
+                            contentData.setCreateDate(data.getCreateDate());
 
                             if(p.size()>0){
                                 contentData.setContentPId(p.get(0).getId());
@@ -318,6 +319,7 @@ public class CheckInterimPaymentController extends BaseController {
         model.addAttribute("reviewStandard", projectReportData.getReviewStandard());
         model.addAttribute("projectId", projectcontentinfo.getProject().getId());
         model.addAttribute("reportType", projectcontentinfo.getReportType());
+        model.addAttribute("projectType",projectcontentinfo.getProjectType());
         if (projectReportData == null || StringUtils.isBlank(projectReportData.getId())) {
             model.addAttribute("condition", projectcontentinfo.getCondition());
             return "modules/projectrecord/check/reportForm";

src/main/java/com/jeeplus/modules/projectrecord/web/check/CheckVisaController.java

@@ -317,6 +317,7 @@ public class CheckVisaController extends BaseController {
                             contentData.setNumber(data.getReportName());
                             contentData.setProjectId(record.getId());
                             contentData.setReportId(data.getReportId());
+                            contentData.setCreateDate(data.getCreateDate());
 
                             if(p.size()>0){
                                 contentData.setContentPId(p.get(0).getId());

src/main/java/com/jeeplus/modules/projectrecord/web/concealProject/ConcealProjectController.java

@@ -173,6 +173,7 @@ public class ConcealProjectController extends BaseController {
                             contentData.setCnumber(contract.getCnumber());
                             contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
+                            contentData.setCreateDate(data.getCreateDate());
 
                             //将项目设置为第二级数据
                             contentData.setCondition(3);

src/main/java/com/jeeplus/modules/projectrecord/web/contractMaterial/MaterialController.java

@@ -174,6 +174,7 @@ public class MaterialController extends BaseController {
                             contentData.setCnumber(contract.getCnumber());
                             contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
+                            contentData.setCreateDate(data.getCreateDate());
                             //将项目设置为第二级数据
                             contentData.setCondition(3);
                             for (String masterId : masterIdList) {

src/main/java/com/jeeplus/modules/projectrecord/web/distributionSettlement/DistributionSettlementController.java

@@ -196,6 +196,7 @@ public class DistributionSettlementController extends BaseController {
                             contentData.setCnumber(contract.getCnumber());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
+                            contentData.setCreateDate(data.getCreateDate());
                             //添加工作内容id
                             contentData.setProjectContentId(record.getProjectContentId());
 

src/main/java/com/jeeplus/modules/projectrecord/web/implementStage/ProjectInterimPaymentController.java

@@ -175,6 +175,7 @@ public class ProjectInterimPaymentController extends BaseController {
                             contentData.setCnumber(contract.getCnumber());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
+                            contentData.setCreateDate(data.getCreateDate());
                             //添加工作内容id
                             contentData.setProjectContentId(record.getProjectContentId());
 

src/main/java/com/jeeplus/modules/projectreportnum/web/ProjectReportNumController.java

@@ -187,6 +187,7 @@ public class ProjectReportNumController extends BaseController {
 		if(StringUtils.isNotEmpty(projectTypeId)){
 			model.addAttribute("projectTypeId",projectTypeId);
 		}
+		model.addAttribute("projectType",reportNum.getProjectType());
 		model.addAttribute("projectId",reportNum.getProjectId());
 		model.addAttribute("reportType",reportNum.getReportType());
 		model.addAttribute("page", page);

src/main/java/com/jeeplus/modules/sys/dao/WorkattachmentDao.java

@@ -46,4 +46,6 @@ public interface WorkattachmentDao extends CrudDao<Workattachment> {
     List<Workattachment> findListOnRural(Workattachment workattachment);
 
     int updateAttachmentId(@Param("oldAttachmentId") String oldAttachmentId, @Param("newAttachmentId") String newAttachmentId);
+
+    Integer deleteByDivIdType(String divIdType);
 }

src/main/resources/mappings/modules/projectType/ProjectTypeDao.xml

@@ -187,7 +187,7 @@
 	</select>
 
 	<select id="getBasedData" resultType="ProjectBasedData">
-		select ifnull(wa.url,'') as fileUrl,
+		select ifnull(wa.url,'') as fileUrl,ifnull(wa.type,'') as fileType,ifnull(wa.attachment_flag,'') as fileAttachmentFlag,
 		ifnull(wa.attachment_name,'') as fileName,ifnull(wa.update_date,'') as uploadDate,
 		ifnull(wa.update_by,'') as fileAttachmentId
 		from project_content_based_relation pcbr

src/main/resources/mappings/modules/projectcontentinfo/ProjectContentDataDao.xml

@@ -372,4 +372,9 @@
 		left join sys_user su on su.id = a.master
 		where a.id = #{id} and a.del_flag=0
 	</select>
+	<delete id="deleteProjectContentBased">
+		delete from project_content_based
+		where based_id = #{basedId}
+		and content_id = #{contentId}
+	</delete>
 </mapper>

src/main/resources/mappings/modules/projectrecord/ProjectImplementEarlyDao.xml

@@ -235,4 +235,8 @@
 		values
   		(#{contentId}, #{basedId})
 	</insert>
+
+	<delete id="delProjectContrntAndBasedId">
+		delete from project_content_based_relation where content_id = #{contentId} and based_id = #{basedId}
+	</delete>
 </mapper>

src/main/resources/mappings/modules/sys/WorkattachmentDao.xml

@@ -323,5 +323,10 @@
 	<select id="findUniqueByProperty" resultType="Workattachment" statementType="STATEMENT">
 		select * FROM work_attachment  where ${propertyName} = '${value}'
 	</select>
+
+	<delete id="deleteByDivIdType">
+		DELETE FROM work_attachment
+		WHERE div_id_type = #{divIdType}
+	</delete>
 	
 </mapper>

src/main/webapp/static/bos/bosupload.js

@@ -71,6 +71,7 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
                             }else {
                                 str = '<a class="attention-info" href="javascript:void(0)" title="'+data.attachmentName+'" onclick="preview(\'预览\',\''+data1.url+'\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
                             }
+                            $(prefix+"_fileTypeDiv").empty();
                             $(prefix+"_fileTypeDiv").append(str);
                             $(prefix+"_fileName").val(data.attachmentName);
                             $(prefix+"_fileType").val(data.type);
@@ -78,10 +79,10 @@ function multitestFlag (storeAs, file,attachmentId,attachmentFlag,uploadPath,div
                             $(prefix+"_fileAttachmentFlag").val(data.attachmentFlag);
                             $(prefix+"_fileAttachmentId").val(data.attachmentId);
                             var result = '<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
-                            var delResult = '<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,\''+realPath+'/sys/workattachment/deleteFileFromAliyun?url='+data.url+'&id='+data.id+'&type=2\',\''+prefix+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>';
+                            var delResult =
+                                '<a href="javascript:void(0)" onclick="accordingBtn(this,\''+prefix+'\')" class=\"op-btn op-btn-edit" ><i class="fa fa-edit"></i>&nbsp;修改</a>';
                             $(prefix+"_operation").empty();
-                            //$(prefix+"_operation").append(delResult);
-                            //$(prefix+"_operation").append(result);
+                            $(prefix+"_operation").append(delResult);
                         }else {
                             parent.layer.msg("上传失败！",{icon:2});
                         }

src/main/webapp/webpage/modules/projectrecord/check/checkClaimList.jsp

@@ -295,7 +295,7 @@
                             }
                         }},
                     {field: 'date', align:'center', title: '签证日期',width:100,templet: function(d){
-                            var date=d.date;
+                            var date=d.createDate;
                             /*date=date.replace(new RegExp(/-/gm) ,"/");*/
 
                             if(d.condition ==1){

src/main/webapp/webpage/modules/projectrecord/check/checkDesignList.jsp

@@ -297,7 +297,7 @@
                             }
                         }},
                     {field: 'date', align:'center', title: '变更日期',width:100,templet: function(d){
-                            var date=d.date;
+                            var date=d.createDate;
                             /*date=date.replace(new RegExp(/-/gm) ,"/");*/
 
                             if(d.condition ==1){

src/main/webapp/webpage/modules/projectrecord/check/checkVisaList.jsp

@@ -297,7 +297,7 @@
                             }
                         }},
                     {field: 'date', align:'center', title: '签证日期',width:100,templet: function(d){
-                            var date=d.date;
+                            var date=d.createDate;
 
                             if(d.condition ==1){
                                 return "";

src/main/webapp/webpage/modules/projectrecord/claim/projectClaimList.jsp

@@ -293,7 +293,7 @@
                             }
                         }},*/
                     {field: 'date', align:'center', title: '签证日期',width:100,templet: function(d){
-                            var date=d.date;
+                            var date=d.createDate;
                             /*date=date.replace(new RegExp(/-/gm) ,"/");*/
 
                             if(d.condition ==1){

src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectImplementCompletionList.jsp

@@ -385,7 +385,7 @@
 					if(d.status ==null){
 						//子级内容
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=early&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=complement&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
 							/*'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.id+'&id='+d.contentPId+'&type=8&condition=record" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
 						].join('');
 

src/main/webapp/webpage/modules/projectrecord/implementStage/projectDesignList.jsp

@@ -295,7 +295,7 @@
                             }
                         }},*/
                     {field: 'date', align:'center', title: '变更日期',width:100,templet: function(d){
-                            var date=d.date;
+                            var date=d.createDate;
                             /*date=date.replace(new RegExp(/-/gm) ,"/");*/
 
                             if(d.condition ==1){

src/main/webapp/webpage/modules/projectrecord/implementStage/projectVisaList.jsp

@@ -291,7 +291,7 @@
                             }
                         }},
                     {field: 'date', align:'center', title: '签证日期',width:100,templet: function(d){
-                            var date=d.date;
+                            var date=d.createDate;
 
                             if(d.condition ==1){
                                 return "";

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workContentForm.jsp

@@ -180,7 +180,7 @@
             return currentdate;
         }
 
-        function accordingBtn(obj, prefix,userId){
+        function accordingBtn(obj, prefix){
             //var id = $(prefix+"_id").val();
             $(prefix+"_file").click();
         }
@@ -201,7 +201,6 @@
                 multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0",1,idx,prefix);
             }
             $(prefix+"_file").val(123)
-            //var idx1 = $("#workBaseDataList tr").length +1;
         }
 
         
@@ -209,17 +208,19 @@
             var val = $(obj).val();
             var modify = $("#modify").val();
             if("modify" != modify){
-                $("#workBaseDataList").empty();
                 $.ajax({
                     type:'post',
-                    url:'${ctx}/project/projectImplementEarly/projectBasedDataList',
+                    url:'${ctx}/projectcontentinfo/projectcontentinfo/projectBasedDataList',
                     data:{
-                        "typeId":val
+                        "typeId":val,
+                        "contentId":"${contentId}"
                     },
                     success:function(data){
                         console.log(data);
                         if(data.projectBasedDataList.length > 0){
                             var data = data.projectBasedDataList;
+                            var idArr = $("#workBaseDataList tr:visible .clientId").length;
+                            workBaseDataRowIdx = idArr;
                             for(var i=0;i<data.length;i++){
                                 var idArr = $("#workBaseDataList tr:visible .clientId");
                                 if(data[i].id!=''&&!hasInArr(data[i].id,idArr)){
@@ -230,10 +231,36 @@
                         }
                     }
                 })
-
+            }else{
+                $.ajax({
+                    type:'post',
+                    url:'${ctx}/projectcontentinfo/projectcontentinfo/projectBasedDataList',
+                    data:{
+                        "typeId":val,
+                        "contentId":"${contentId}"
+                    },
+                    success:function(data){
+                        console.log(data);
+                        if(data.projectBasedDataList.length > 0){
+                            var data = data.projectBasedDataList;
+                            var idArr = $("#workBaseDataList tr:visible .clientId").length;
+                            workBaseDataRowIdx = idArr;
+                            for(var i=0;i<data.length;i++){
+                                var idArr = $("#workBaseDataList tr:visible .clientId");
+                                if(data[i].id!=''&&!hasInArr(data[i].id,idArr)){
+                                    addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTplFirstModify,data[i]);
+                                    $("#workBaseDataList"+workBaseDataRowIdx+"_fileUrl").val(data[i].fileUrl);
+                                    $("#workBaseDataList"+workBaseDataRowIdx+"_fileType").val(data[i].fileType);
+                                    $("#workBaseDataList"+workBaseDataRowIdx+"_fileName").val(data[i].fileName);
+                                    $("#workBaseDataList"+workBaseDataRowIdx+"_fileAttachmentFlag").val(data[i].fileAttachmentFlag);
+                                    workBaseDataRowIdx=workBaseDataRowIdx+1;
+                                }
+                            }
+                        }
+                    }
+                })
             }
 
-
             $("#contentDetail").empty();
             contentDetailTypeShow(val);
             $("#contentDetailTypeDiv").show();
@@ -722,7 +749,7 @@
                                                 <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${projectBasedData.fileUrl}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                             </c:when>
                                             <c:otherwise>
-                                                <a href=javascript:void(0); onclick="accordingBtn(this, '#workBaseDataList${idx.index}','${projectBasedData.uploadUser.id}')"   class="op-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i> 添加附件</a>
+                                                <a href=javascript:void(0); onclick="accordingBtn(this, '#workBaseDataList${idx.index}')"   class="op-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i> 添加附件</a>
                                             </c:otherwise>
                                         </c:choose>
 
@@ -768,6 +795,55 @@
                     </td>
                     <td style="text-align:center;">
                         <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.uploadUser.name}}
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.uploadDate}}
+                    </td>
+                    <td class="text-center op-td">
+                        <div id="workBaseDataList{{idx}}_operation">
+                            <a href=javascript:void(0); onclick="accordingBtn(this, '#workBaseDataList{{idx}}')"   class="op-btn op-btn-edit" title="上传附件"><i class="fa fa-edit"></i> 上传</a>
+                            <%--<c:if test="${'' != {{row.fileUrl}} }">
+                                <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('{{row.fileUrl}}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                            </c:if>--%>
+                        </div>
+                    </td>
+                </tr>//-->
+            </script>
+            <script type="text/template" id="workBaseDataTplFirstModify">//<!--
+                <tr id="budgetList{{idx}}">
+                    <td class="hide">
+                            <input id="workBaseDataList{{idx}}_file" type="file" name="projectContentData.projectBasedDataList[{{idx}}].file" multiple="multiple" style="display: none;" onChange="if(this.value)insertAccording(this.value,{{idx}},'#workBaseDataList{{idx}}');"/>
+                            <input id="workBaseDataList{{idx}}_flag"	 name="projectContentData.projectBasedDataList[{{idx}}].flag"   type="hidden" value="132"/>
+                            <input id="workBaseDataList{{idx}}_chooseCondition"	 name="projectContentData.projectBasedDataList[{{idx}}].chooseCondition"   type="hidden" value="{{row.chooseCondition}}"/>
+
+                        <input id="workBaseDataList{{idx}}_id" name="projectContentData.projectBasedDataList[{{idx}}].id" type="hidden" value="{{row.id}}" class="clientId"/>
+                        <input id="workBaseDataList{{idx}}_number" name="projectContentData.projectBasedDataList[{{idx}}].number" type="hidden" value="{{row.number}}"/>
+                        <input id="workBaseDataList{{idx}}_name" name="projectContentData.projectBasedDataList[{{idx}}].name" type="hidden" value="{{row.name}}"/>
+                        <input id="workBaseDataList{{idx}}_type" name="projectContentData.projectBasedDataList[{{idx}}].type" type="hidden" value="{{row.type}}"/>
+
+                        <input id="workBaseDataList{{idx}}_fileType"	 name="projectContentData.projectBasedDataList[{{idx}}].fileType"   type="hidden" value=""/>
+                        <input id="workBaseDataList{{idx}}_fileName"	 name="projectContentData.projectBasedDataList[{{idx}}].fileName"   type="hidden" value=""/>
+                        <input id="workBaseDataList{{idx}}_fileUrl"	 name="projectContentData.projectBasedDataList[{{idx}}].fileUrl"   type="hidden" value=""/>
+                        <input id="workBaseDataList{{idx}}_fileAttachmentFlag"	 name="projectContentData.projectBasedDataList[{{idx}}].fileAttachmentFlag"   type="hidden" value=""/>
+                        <input id="workBaseDataList{{idx}}}_fileAttachmentId"	 name="projectContentData.projectBasedDataList[{{idx}}].fileAttachmentId"   type="hidden" value=""/>
+                    </td>
+                    <%--<td style="text-align:center;">
+                        {{row.number}}
+                    </td>--%>
+                    <td style="text-align:center;">
+                        {{row.name}}
+                    </td>
+                    <td style="text-align:center;">
+                        {{row.typeLabel}}
+                    </td>
+                    <td style="text-align:center;">
+                        <div id="workBaseDataList{{idx}}_fileTypeDiv">
+                            <a class="attention-info" href="javascript:void(0)" title ="{{row.fileName}}" onclick="preview('预览','{{row.fileUrl}}','90%','90%')">{{row.fileName}}</a>
                         </div>
                     </td>
                     <td style="text-align:center;">
@@ -778,7 +854,10 @@
                     </td>
                     <td class="text-center op-td">
                         <div id="workBaseDataList{{idx}}_operation">
-                            <a href=javascript:void(0); onclick="accordingBtn(this, '#workBaseDataList{{idx}}','{{row.uploadUser.id}}')"   class="op-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i> 添加附件</a>
+                            <a href=javascript:void(0); onclick="accordingBtn(this, '#workBaseDataList{{idx}}')"   class="op-btn op-btn-edit" title="修改附件"><i class="fa fa-edit"></i> 修改</a>
+                            <%--<c:if test="${'' != {{row.fileUrl}} }">
+                                <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('{{row.fileUrl}}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                            </c:if>--%>
                         </div>
                     </td>
                 </tr>//-->
@@ -818,6 +897,7 @@
             <script type="text/javascript">
                 var workBaseDataTpl = $("#workBaseDataTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workBaseDataTplFirst = $("#workBaseDataTplFirst").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                var workBaseDataTplFirstModify = $("#workBaseDataTplFirstModify").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workBaseDataRowIdx = ${fn:length(projectcontentinfo.projectReportData.projectBasedDataList)};
                 function setValuee(obj){
                     for(var i=0;i<obj.length;i++){
@@ -873,15 +953,19 @@
                     var currentUser = '${fns:getUser().id}';
                     var contentId = '${projectcontentinfo.projectContentData.id}';
                     console.log(contentId);
-
+                    var condition = "${flag}";
                     $.ajax({
                         type:"post",
                         url:'${ctx}/projectcontentinfo/projectContentData/ajaxdelete',
-                        data:{"contentId":contentId,"basedId":id},
+                        data:{"contentId":contentId,"basedId":id,"condition":condition},
                         dataType:"json",
                         success:function(data){
                             if(data.success) {
-                                $(obj).parent().parent().remove();
+                                if("according" == condition || "completion" == condition || "early" == condition || "claim" == condition || "design" == condition || "visa" == condition || "interim" == condition || "distribution" == condition ){
+                                    $(obj).parent().parent().parent().remove();
+                                }else{
+                                    $(obj).parent().parent().remove();
+                                }
                                 if(data.body.inuse){
                                     return;
                                 }

src/main/webapp/webpage/modules/projectreportnum/projectReportNumSel.jsp

@@ -102,7 +102,7 @@
 				treeDefaultClose: false,//是否默认折叠
 				treeLinkage: true,//父级展开时是否自动展开所有子级
 				elem: '#contentTable',
-				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}',
+				url: '${ctx}/projectreportnum/projectReportNum/getReportNumList?projectType=${projectType}&projectTypeId=${projectTypeId}&projectId=${projectId}&reportType=${reportType}',
 				page: false,
 				cols: [[
 					{checkbox: true,width:80},