实施阶段新增数据依据性文件获取处理

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

@@ -503,7 +503,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 				}
 			}
 			//保存tree数据
-			if ("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition()) || "early".equals(projectcontentinfo.getCondition()) || "claim".equals(projectcontentinfo.getCondition()) || "design".equals(projectcontentinfo.getCondition()) || "visa".equals(projectcontentinfo.getCondition()) || "interim".equals(projectcontentinfo.getCondition()) || "distribution".equals(projectcontentinfo.getCondition())){
+			if (!"according".equals(projectcontentinfo.getCondition()) && !"completion".equals(projectcontentinfo.getCondition()) && !"early".equals(projectcontentinfo.getCondition()) && !"claim".equals(projectcontentinfo.getCondition()) && !"design".equals(projectcontentinfo.getCondition()) && !"visa".equals(projectcontentinfo.getCondition()) && !"interim".equals(projectcontentinfo.getCondition()) && !"distribution".equals(projectcontentinfo.getCondition())){
 				saveReportTree(projectcontentinfo,status,company,office,reportDataName,infoId,attachmentList,projectReportData.getReviewStandard(),1);
 			}
 		}

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

@@ -642,13 +642,14 @@ public class ProjectcontentinfoController extends BaseController {
 				projectContentData = projectContentDataService.get(projectcontentinfo.getProjectContentData().getId());
 			}
 			projectContentData.setMaster(UserUtils.getUser());
+			//查询是否含有上传或者引用的依据性文件信息
 			if(StringUtils.isNotBlank(projectContentData.getId())){
 				List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
 				projectContentData.setProjectControlTableList(controlData);
 				projectContentDataService.queryBasedData(projectContentData);
 			}
 
-			if("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition()) || "early".equals(projectcontentinfo.getCondition())){
+			if ("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition()) || "early".equals(projectcontentinfo.getCondition()) || "claim".equals(projectcontentinfo.getCondition()) || "design".equals(projectcontentinfo.getCondition()) || "visa".equals(projectcontentinfo.getCondition()) || "distribution".equals(projectcontentinfo.getCondition())){
 				/**
 				 * 查询配置的宜居性资料并添加到展示view中
 				 */
@@ -666,6 +667,12 @@ public class ProjectcontentinfoController extends BaseController {
 					if (StringUtils.isNotBlank(projectBasedData.getFileAttachmentId())) {
 						projectBasedData.setUploadUser(UserUtils.get(projectBasedData.getFileAttachmentId()));
 					}
+
+					//判断是否有上传文件 如果没有上传文件则添加当前登录人信息 和当前时间作为上传时间
+					if(StringUtils.isBlank(projectBasedData.getFileUrl())){
+						projectBasedData.setUploadDate(new Date());
+						projectBasedData.setUploadUser(UserUtils.getUser());
+					}
 				}
 				for (ProjectBasedData projectBasedData: projectContentData.getProjectBasedDataList()) {
 					projectBasedData.setType(dictService.dictLabel("project_document_type",projectBasedData.getType()));
@@ -681,7 +688,7 @@ public class ProjectcontentinfoController extends BaseController {
 			}else {
 				projectReportData.setNumber("");
 			}
-			if("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition())){
+			if ("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition()) || "early".equals(projectcontentinfo.getCondition()) || "claim".equals(projectcontentinfo.getCondition()) || "design".equals(projectcontentinfo.getCondition()) || "visa".equals(projectcontentinfo.getCondition()) || "distribution".equals(projectcontentinfo.getCondition())){
 				if(StringUtils.isNotBlank(projectReportData.getAchievementType())){
 					ProjectTemplateType projectTemplateType = projectResultsFileTemplateService.get(projectReportData.getAchievementType());
 					if(null != projectTemplateType){
@@ -695,7 +702,7 @@ public class ProjectcontentinfoController extends BaseController {
 
 
 			if (projectcontentinfo.getView().equals("contentView")){
-				if ("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition())){
+				if ("according".equals(projectcontentinfo.getCondition()) || "completion".equals(projectcontentinfo.getCondition()) || "early".equals(projectcontentinfo.getCondition()) || "claim".equals(projectcontentinfo.getCondition()) || "design".equals(projectcontentinfo.getCondition()) || "visa".equals(projectcontentinfo.getCondition()) || "interim".equals(projectcontentinfo.getCondition()) || "distribution".equals(projectcontentinfo.getCondition())){
 					return "modules/projectrecord/workContentFromAndView/workContentView";
 				}
 				return "modules/projectcontentinfo/workContentView";
@@ -980,6 +987,26 @@ public class ProjectcontentinfoController extends BaseController {
 					if("completion".equals(projectcontentinfo.getCondition())){
 						return "redirect:"+Global.getAdminPath()+"/project/projectCompletionReview/?repage";
 					}
+					//跳转索赔管理页面
+					if("claim".equals(projectcontentinfo.getCondition())){
+						return "redirect:"+Global.getAdminPath()+"/project/checkClaim/?repage";
+					}
+					//跳转设计变更页面
+					if("design".equals(projectcontentinfo.getCondition())){
+						return "redirect:"+Global.getAdminPath()+"/project/checkDesign/?repage";
+					}
+					//跳转签证页面
+					if("visa".equals(projectcontentinfo.getCondition())){
+						return "redirect:"+Global.getAdminPath()+"/project/checkVisa/?repage";
+					}
+					//跳转工程进度款页面
+					if("interim".equals(projectcontentinfo.getCondition())){
+						return "redirect:"+Global.getAdminPath()+"/project/checkInterimPayment/?repage";
+					}
+					//跳转分布结算页面
+					if("distribution".equals(projectcontentinfo.getCondition())){
+						return "redirect:"+Global.getAdminPath()+"/project/checkDistributionSettlement/?repage";
+					}
 					if (StringUtils.isNotBlank(projectcontentinfo.getEdit()) && projectcontentinfo.getEdit().equals("edit")){
 						return "redirect:"+Global.getAdminPath()+"/projectcontentinfo/projectcontentinfo/list?id="+projectcontentinfo.getId()+"&edit=edit";
 					}
@@ -1059,6 +1086,26 @@ public class ProjectcontentinfoController extends BaseController {
 		if("completion".equals(projectcontentinfo.getCondition())){
 			return "redirect:"+Global.getAdminPath()+"/project/projectCompletionReview/?repage";
 		}
+		//跳转索赔管理页面
+		if("claim".equals(projectcontentinfo.getCondition())){
+			return "redirect:"+Global.getAdminPath()+"/project/checkClaim/?repage";
+		}
+		//跳转设计变更页面
+		if("design".equals(projectcontentinfo.getCondition())){
+			return "redirect:"+Global.getAdminPath()+"/project/checkDesign/?repage";
+		}
+		//跳转签证页面
+		if("visa".equals(projectcontentinfo.getCondition())){
+			return "redirect:"+Global.getAdminPath()+"/project/checkVisa/?repage";
+		}
+		//跳转工程进度款页面
+		if("interim".equals(projectcontentinfo.getCondition())){
+			return "redirect:"+Global.getAdminPath()+"/project/checkInterimPayment/?repage";
+		}
+		//跳转分布结算页面
+		if("distribution".equals(projectcontentinfo.getCondition())){
+			return "redirect:"+Global.getAdminPath()+"/project/checkDistributionSettlement/?repage";
+		}
 		return "redirect:"+Global.getAdminPath()+"/projectcontentinfo/projectcontentinfo/?project.id="+projectRecords.getId();
 	}
 

src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyReviewController.java

@@ -13,6 +13,8 @@ import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportChangeService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
+import com.jeeplus.modules.projectcontroltable.entity.ProjectControlTable;
+import com.jeeplus.modules.projectcontroltable.service.ProjectControlTableService;
 import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.projectrecord.entity.ProjectImplementEarly;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
@@ -20,6 +22,7 @@ import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.projectrecord.service.early.ProjectEarlyReviewService;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.DictService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
@@ -57,6 +60,11 @@ public class ProjectEarlyReviewController extends BaseController {
     private ProjectTypeService projectTypeService;
     @Autowired
     private WorkProjectUserDao workProjectUserDao;
+    @Autowired
+    private ProjectControlTableService projectControlTableService;
+    @Autowired
+    private DictService dictService;
+
     /**
      * 项目列表页面
      */
@@ -227,6 +235,22 @@ public class ProjectEarlyReviewController extends BaseController {
         List<ProjectContentData> projectContentDataList = projectContentDataService.getProjectContentData(projectcontentinfo.getInfoId());
         //获取需要复核工作内容的对应typeId
         String typeId = projectContentDataList.get(0).getType();
+
+        ProjectContentData projectContentData = new ProjectContentData();
+        projectContentData.setType(dictType);
+        if (StringUtils.isNotBlank(projectcontentinfo.getInfoId())){
+            projectContentData = projectContentDataService.get(projectcontentinfo.getInfoId());
+        }else if (projectcontentinfo.getProjectContentData()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectContentData().getId())) {
+            projectContentData = projectContentDataService.get(projectcontentinfo.getProjectContentData().getId());
+        }
+        projectContentData.setMaster(UserUtils.getUser());
+        //查询是否含有上传或者引用的依据性文件信息
+        if(StringUtils.isNotBlank(projectContentData.getId())){
+            List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
+            projectContentData.setProjectControlTableList(controlData);
+            projectContentDataService.queryBasedData(projectContentData);
+        }
+
         //获取该工作内容的依据性资料信息
         List<ProjectBasedData> projectBasedDataList =  projectTypeService.getAccrdingDataList(typeId);
         for (ProjectBasedData projectBasedData: projectBasedDataList) {
@@ -248,19 +272,12 @@ public class ProjectEarlyReviewController extends BaseController {
                 projectBasedData.setUploadUser(UserUtils.getUser());
             }
         }
-        /*for (ProjectBasedData projectBasedData: projectContentData.getProjectBasedDataList()) {
+        for (ProjectBasedData projectBasedData: projectContentData.getProjectBasedDataList()) {
             projectBasedData.setType(dictService.dictLabel("project_document_type",projectBasedData.getType()));
-        }*/
-        //projectReportData.getProjectBasedDataList().addAll(projectBasedDataList);
+        }
+        projectContentData.getProjectBasedDataList().addAll(projectBasedDataList);
 
-        /*if(projectBasedDataList.size()>0){
-            for (ProjectBasedData projectBasedData: projectBasedDataList) {
-                projectBasedData.setFlag("according");
-                projectBasedData.setUploadDate(new Date());
-                projectBasedData.setUploadUser(UserUtils.getUser());
-            }
-        }*/
-        projectReportData.setProjectBasedDataList(projectBasedDataList);
+        projectReportData.setProjectBasedDataList(projectContentData.getProjectBasedDataList());
         projectReportData.setProjectContentDataList(projectContentDataList);
         projectcontentinfo.setProjectReportData(projectReportData);
         model.addAttribute("projectcontentinfo", projectcontentinfo);

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

@@ -25,6 +25,7 @@ import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.projectrecord.service.early.ProjectEarlyReviewService;
 import com.jeeplus.modules.projectrecord.service.implementStage.ProjectInterimPaymentService;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.DictService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +65,10 @@ public class CheckInterimPaymentController extends BaseController {
     private ProjectReportChangeService projectReportChangeService;
     @Autowired
     private ProjectcontentinfoService projectcontentinfoService;
+    @Autowired
+    private ProjectControlTableService projectControlTableService;
+    @Autowired
+    private DictService dictService;
 
     /**
      * 合同列表页面
@@ -281,7 +286,29 @@ public class CheckInterimPaymentController extends BaseController {
                 projectBasedData.setUploadUser(UserUtils.getUser());
             }
         }
-        projectReportData.setProjectBasedDataList(projectBasedDataList);
+
+        ProjectContentData projectContentData = new ProjectContentData();
+        projectContentData.setType(dictType);
+        if (StringUtils.isNotBlank(projectcontentinfo.getInfoId())){
+            projectContentData = projectContentDataService.get(projectcontentinfo.getInfoId());
+        }else if (projectcontentinfo.getProjectContentData()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectContentData().getId())) {
+            projectContentData = projectContentDataService.get(projectcontentinfo.getProjectContentData().getId());
+        }
+        projectContentData.setMaster(UserUtils.getUser());
+        //查询是否含有上传或者引用的依据性文件信息
+        if(StringUtils.isNotBlank(projectContentData.getId())){
+            List<ProjectControlTable> controlData = projectControlTableService.getControlData(projectContentData.getId(),"");
+            projectContentData.setProjectControlTableList(controlData);
+            projectContentDataService.queryBasedData(projectContentData);
+        }
+
+
+        for (ProjectBasedData projectBasedData: projectContentData.getProjectBasedDataList()) {
+            projectBasedData.setType(dictService.dictLabel("project_document_type",projectBasedData.getType()));
+        }
+        projectContentData.getProjectBasedDataList().addAll(projectBasedDataList);
+
+        projectReportData.setProjectBasedDataList(projectContentData.getProjectBasedDataList());
         projectReportData.setProjectContentDataList(projectContentDataList);
         projectcontentinfo.setProjectReportData(projectReportData);
         model.addAttribute("projectcontentinfo", projectcontentinfo);

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

@@ -280,7 +280,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=claim&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){

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

@@ -282,7 +282,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=design&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){

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

@@ -280,7 +280,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=distribution&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){

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

@@ -282,7 +282,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=visa&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'reportName', align:'center', title: '成果文件名称',templet:function(d){

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

@@ -51,10 +51,18 @@
                     }
                 }
 
-                var idArr = $("#workBaseDataList tr:visible .clientId").length;
-                if(idArr == 0){
-                    layer.msg('请添加一条依据性文件', {icon: 5});
-                    return false;
+                var length = document.getElementById("workBaseDataList");
+                var rows = length.rows.length;
+                var idList = [];
+                for (var i=0;i<rows;i++){
+                    var chooseCondition = $("#workBaseDataList"+i+"_chooseCondition").val();
+                    if(chooseCondition==1){
+                        var fileUrl = $("#workBaseDataList"+i+"_fileUrl").val();
+                        if(fileUrl == null || fileUrl == ''){
+                            layer.msg('请上传依据性资料必填文件', {icon: 5});
+                            return false;
+                        }
+                    }
                 }
                 beforeSubmit();
                 $("#inputForm").submit();
@@ -187,7 +195,35 @@
 
         function changeContentDetail(obj) {
             $("#contentDetail").empty();
-            var val = "410";
+            var val = "46";
+
+            var modify = $("#modify").val();
+            if("modify" != modify){
+                $("#workBaseDataList").empty();
+                $.ajax({
+                    type:'post',
+                    url:'${ctx}/project/projectImplementEarly/projectBasedDataList',
+                    data:{
+                        "typeId":val
+                    },
+                    success:function(data){
+                        console.log(data);
+                        if(data.projectBasedDataList.length > 0){
+                            var data = data.projectBasedDataList;
+                            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,workBaseDataTplFirst,data[i]);
+                                    workBaseDataRowIdx=workBaseDataRowIdx+1;
+                                }
+                            }
+                        }
+                    }
+                })
+
+            }
+
+
             contentDetailTypeShow(val);
             $("#contentDetailTypeDiv").show();
             $("#projectContentDataSign").val(val);
@@ -414,6 +450,30 @@
             }
 
         }
+
+        //依据性文件点击事件
+        function accordingBtn(obj, prefix,userId){
+            $(prefix+"_file").click();
+        }
+        //依据性文件上传文件方法
+        function insertAccording(tValue,idx,prefix) {
+            var files = $(prefix+"_file")[0].files;
+            for(var i=0;i<files.length;i++) {
+                var file = files[i];
+                var attachmentId = "";
+                var attachmentFlag = "132";
+                console.log(file);
+                var timestamp = new Date().getTime();
+
+                var storeAs = "attachment-file/basedData/" + timestamp + "/" + file['name'];
+                var uploadPath = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/" + storeAs;
+                /*将这段字符串存到数据库即可*/
+                var divId = "_attachment";
+                multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0",1,idx,prefix);
+            }
+            $(prefix+"_file").val(123)
+            //var idx1 = $("#workBaseDataList tr").length +1;
+        }
     </script>
 </head>
 <body>
@@ -487,7 +547,19 @@
                         <c:forEach items="${concealProjectInfo.projectContentData.projectBasedDataList}" var="projectBasedData" varStatus="idx">
                             <tr>
                                 <td class="hide">
-                                    <input type="hidden" id="workBaseDataList${idx.index}_id" value="${projectBasedData.id}" class="clientId">
+                                    <input id="workBaseDataList${idx.index}_id"      name="projectReportData.projectBasedDataList[${idx.index}].id"     type="hidden" value="${projectBasedData.id}"  class="clientId">
+                                    <input id="workBaseDataList${idx.index}_file" type="file" name="projectReportData.projectBasedDataList[${idx.index}].file" multiple="multiple" style="display: none;" onChange="if(this.value)insertAccording(this.value,${idx.index},'#workBaseDataList${idx.index}');"/>
+                                    <input id="workBaseDataList${idx.index}_number"	 name="projectReportData.projectBasedDataList[${idx.index}].number" type="hidden" value="${projectBasedData.number}"/>
+                                    <input id="workBaseDataList${idx.index}_name" 	 name="projectReportData.projectBasedDataList[${idx.index}].name"   type="hidden" value="${projectBasedData.name}"/>
+                                    <input id="workBaseDataList${idx.index}_type"	 name="projectReportData.projectBasedDataList[${idx.index}].type"   type="hidden" value="${projectBasedData.type}"/>
+                                    <input id="workBaseDataList${idx.index}_flag"	 name="projectReportData.projectBasedDataList[${idx.index}].flag"   type="hidden" value="132"/>
+                                    <input id="workBaseDataList${idx.index}_chooseCondition"	 name="projectReportData.projectBasedDataList[${idx.index}].chooseCondition"   type="hidden" value="${projectBasedData.chooseCondition}"/>
+
+                                    <input id="workBaseDataList${idx.index}_fileType"	 name="projectReportData.projectBasedDataList[${idx.index}].fileType"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileName"	 name="projectReportData.projectBasedDataList[${idx.index}].fileName"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileUrl"	 name="projectReportData.projectBasedDataList[${idx.index}].fileUrl"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                                 </td>
                                 <td style="text-align:center;">
                                         ${projectBasedData.number}
@@ -514,6 +586,50 @@
                     </table>
                 </div>
             </div>
+            <script type="text/template" id="workBaseDataTplFirst">//<!--
+                <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">
+                        </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}}','{{row.uploadUser.id}}')"   class="op-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i> 添加附件</a>
+                        </div>
+                    </td>
+                </tr>//-->
+            </script>
             <script type="text/template" id="workBaseDataTpl">//<!--
                 <tr id="budgetList{{idx}}">
                     <td class="hide">
@@ -544,6 +660,7 @@
             </script>
             <script type="text/javascript">
                 var workBaseDataTpl = $("#workBaseDataTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                var workBaseDataTplFirst = $("#workBaseDataTplFirst").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workBaseDataRowIdx = ${fn:length(concealProjectInfo.projectReportData.projectBasedDataList)};
                 function setValuee(obj){
                     for(var i=0;i<obj.length;i++){

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

@@ -271,7 +271,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=claim&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     /*{field: 'sendMoney', align:'center', title: '送审金额',templet: function(d){

src/main/webapp/webpage/modules/projectrecord/design/projectDesignForm.jsp

@@ -51,10 +51,18 @@
                     }
                 }
 
-                var idArr = $("#workBaseDataList tr:visible .clientId").length;
-                if(idArr == 0){
-                    layer.msg('请添加一条依据性文件', {icon: 5});
-                    return false;
+                var length = document.getElementById("workBaseDataList");
+                var rows = length.rows.length;
+                var idList = [];
+                for (var i=0;i<rows;i++){
+                    var chooseCondition = $("#workBaseDataList"+i+"_chooseCondition").val();
+                    if(chooseCondition==1){
+                        var fileUrl = $("#workBaseDataList"+i+"_fileUrl").val();
+                        if(fileUrl == null || fileUrl == ''){
+                            layer.msg('请上传依据性资料必填文件', {icon: 5});
+                            return false;
+                        }
+                    }
                 }
                 beforeSubmit();
                 $("#inputForm").submit();
@@ -187,7 +195,35 @@
 
         function changeContentDetail(obj) {
             $("#contentDetail").empty();
-            var val = "410";
+            var val = "43";
+
+            var modify = $("#modify").val();
+            if("modify" != modify){
+                $("#workBaseDataList").empty();
+                $.ajax({
+                    type:'post',
+                    url:'${ctx}/project/projectImplementEarly/projectBasedDataList',
+                    data:{
+                        "typeId":val
+                    },
+                    success:function(data){
+                        console.log(data);
+                        if(data.projectBasedDataList.length > 0){
+                            var data = data.projectBasedDataList;
+                            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,workBaseDataTplFirst,data[i]);
+                                    workBaseDataRowIdx=workBaseDataRowIdx+1;
+                                }
+                            }
+                        }
+                    }
+                })
+
+            }
+
+
             contentDetailTypeShow(val);
             $("#contentDetailTypeDiv").show();
             $("#projectContentDataSign").val(val);
@@ -414,6 +450,30 @@
             }
 
         }
+
+        //依据性文件点击事件
+        function accordingBtn(obj, prefix,userId){
+            $(prefix+"_file").click();
+        }
+        //依据性文件上传文件方法
+        function insertAccording(tValue,idx,prefix) {
+            var files = $(prefix+"_file")[0].files;
+            for(var i=0;i<files.length;i++) {
+                var file = files[i];
+                var attachmentId = "";
+                var attachmentFlag = "132";
+                console.log(file);
+                var timestamp = new Date().getTime();
+
+                var storeAs = "attachment-file/basedData/" + timestamp + "/" + file['name'];
+                var uploadPath = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/" + storeAs;
+                /*将这段字符串存到数据库即可*/
+                var divId = "_attachment";
+                multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0",1,idx,prefix);
+            }
+            $(prefix+"_file").val(123)
+            //var idx1 = $("#workBaseDataList tr").length +1;
+        }
     </script>
 </head>
 <body>
@@ -488,7 +548,19 @@
                         <c:forEach items="${concealProjectInfo.projectContentData.projectBasedDataList}" var="projectBasedData" varStatus="idx">
                             <tr>
                                 <td class="hide">
-                                    <input type="hidden" id="workBaseDataList${idx.index}_id" value="${projectBasedData.id}" class="clientId">
+                                    <input id="workBaseDataList${idx.index}_id"      name="projectReportData.projectBasedDataList[${idx.index}].id"     type="hidden" value="${projectBasedData.id}"  class="clientId">
+                                    <input id="workBaseDataList${idx.index}_file" type="file" name="projectReportData.projectBasedDataList[${idx.index}].file" multiple="multiple" style="display: none;" onChange="if(this.value)insertAccording(this.value,${idx.index},'#workBaseDataList${idx.index}');"/>
+                                    <input id="workBaseDataList${idx.index}_number"	 name="projectReportData.projectBasedDataList[${idx.index}].number" type="hidden" value="${projectBasedData.number}"/>
+                                    <input id="workBaseDataList${idx.index}_name" 	 name="projectReportData.projectBasedDataList[${idx.index}].name"   type="hidden" value="${projectBasedData.name}"/>
+                                    <input id="workBaseDataList${idx.index}_type"	 name="projectReportData.projectBasedDataList[${idx.index}].type"   type="hidden" value="${projectBasedData.type}"/>
+                                    <input id="workBaseDataList${idx.index}_flag"	 name="projectReportData.projectBasedDataList[${idx.index}].flag"   type="hidden" value="132"/>
+                                    <input id="workBaseDataList${idx.index}_chooseCondition"	 name="projectReportData.projectBasedDataList[${idx.index}].chooseCondition"   type="hidden" value="${projectBasedData.chooseCondition}"/>
+
+                                    <input id="workBaseDataList${idx.index}_fileType"	 name="projectReportData.projectBasedDataList[${idx.index}].fileType"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileName"	 name="projectReportData.projectBasedDataList[${idx.index}].fileName"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileUrl"	 name="projectReportData.projectBasedDataList[${idx.index}].fileUrl"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                                 </td>
                                 <td style="text-align:center;">
                                         ${projectBasedData.number}
@@ -515,6 +587,50 @@
                     </table>
                 </div>
             </div>
+            <script type="text/template" id="workBaseDataTplFirst">//<!--
+                <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">
+                        </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}}','{{row.uploadUser.id}}')"   class="op-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i> 添加附件</a>
+                        </div>
+                    </td>
+                </tr>//-->
+            </script>
             <script type="text/template" id="workBaseDataTpl">//<!--
                 <tr id="budgetList{{idx}}">
                     <td class="hide">
@@ -545,15 +661,12 @@
             </script>
             <script type="text/javascript">
                 var workBaseDataTpl = $("#workBaseDataTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                var workBaseDataTplFirst = $("#workBaseDataTplFirst").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workBaseDataRowIdx = ${fn:length(concealProjectInfo.projectReportData.projectBasedDataList)};
                 function setValuee(obj){
                     for(var i=0;i<obj.length;i++){
                         var idArr = $("#workBaseDataList tr:visible .clientId");
                         if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
-                            if(idArr.length == 1){
-                                layer.msg('只能选择或新增一条依据性资料', {icon: 5});
-                                return;
-                            }
                             addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
                             workBaseDataRowIdx=workBaseDataRowIdx+1;
                         }

src/main/webapp/webpage/modules/projectrecord/distributionSettlement/distributionSettlementForm.jsp

@@ -54,10 +54,19 @@
                     }
                 }
 
-                var idArr = $("#workBaseDataList tr:visible .clientId").length;
-                if(idArr == 0){
-                    layer.msg('请添加分部结算审核所需依据性文件', {icon: 5});
-                    return false;
+
+                var length = document.getElementById("workBaseDataList");
+                var rows = length.rows.length;
+                var idList = [];
+                for (var i=0;i<rows;i++){
+                    var chooseCondition = $("#workBaseDataList"+i+"_chooseCondition").val();
+                    if(chooseCondition==1){
+                        var fileUrl = $("#workBaseDataList"+i+"_fileUrl").val();
+                        if(fileUrl == null || fileUrl == ''){
+                            layer.msg('请上传依据性资料必填文件', {icon: 5});
+                            return false;
+                        }
+                    }
                 }
 
                 beforeSubmit();
@@ -192,6 +201,33 @@
         function changeContentDetail(obj) {
             $("#contentDetail").empty();
             var val = "412";
+
+            var modify = $("#modify").val();
+            if("modify" != modify){
+                $("#workBaseDataList").empty();
+                $.ajax({
+                    type:'post',
+                    url:'${ctx}/project/projectImplementEarly/projectBasedDataList',
+                    data:{
+                        "typeId":val
+                    },
+                    success:function(data){
+                        console.log(data);
+                        if(data.projectBasedDataList.length > 0){
+                            var data = data.projectBasedDataList;
+                            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,workBaseDataTplFirst,data[i]);
+                                    workBaseDataRowIdx=workBaseDataRowIdx+1;
+                                }
+                            }
+                        }
+                    }
+                })
+
+            }
+
             contentDetailTypeShow(val);
             $("#contentDetailTypeDiv").show();
             $("#projectContentDataSign").val(val);
@@ -418,6 +454,30 @@
             }
 
         }
+
+        //依据性文件点击事件
+        function accordingBtn(obj, prefix,userId){
+            $(prefix+"_file").click();
+        }
+        //依据性文件上传文件方法
+        function insertAccording(tValue,idx,prefix) {
+            var files = $(prefix+"_file")[0].files;
+            for(var i=0;i<files.length;i++) {
+                var file = files[i];
+                var attachmentId = "";
+                var attachmentFlag = "132";
+                console.log(file);
+                var timestamp = new Date().getTime();
+
+                var storeAs = "attachment-file/basedData/" + timestamp + "/" + file['name'];
+                var uploadPath = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/" + storeAs;
+                /*将这段字符串存到数据库即可*/
+                var divId = "_attachment";
+                multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0",1,idx,prefix);
+            }
+            $(prefix+"_file").val(123)
+            //var idx1 = $("#workBaseDataList tr").length +1;
+        }
     </script>
 </head>
 <body>
@@ -511,7 +571,19 @@
                 <c:forEach items="${concealProjectInfo.projectContentData.projectBasedDataList}" var="projectBasedData" varStatus="idx">
                     <tr>
                         <td class="hide">
-                            <input type="hidden" id="workBaseDataList${idx.index}_id" value="${projectBasedData.id}" class="clientId">
+                            <input id="workBaseDataList${idx.index}_id"      name="projectReportData.projectBasedDataList[${idx.index}].id"     type="hidden" value="${projectBasedData.id}"  class="clientId">
+                            <input id="workBaseDataList${idx.index}_file" type="file" name="projectReportData.projectBasedDataList[${idx.index}].file" multiple="multiple" style="display: none;" onChange="if(this.value)insertAccording(this.value,${idx.index},'#workBaseDataList${idx.index}');"/>
+                            <input id="workBaseDataList${idx.index}_number"	 name="projectReportData.projectBasedDataList[${idx.index}].number" type="hidden" value="${projectBasedData.number}"/>
+                            <input id="workBaseDataList${idx.index}_name" 	 name="projectReportData.projectBasedDataList[${idx.index}].name"   type="hidden" value="${projectBasedData.name}"/>
+                            <input id="workBaseDataList${idx.index}_type"	 name="projectReportData.projectBasedDataList[${idx.index}].type"   type="hidden" value="${projectBasedData.type}"/>
+                            <input id="workBaseDataList${idx.index}_flag"	 name="projectReportData.projectBasedDataList[${idx.index}].flag"   type="hidden" value="132"/>
+                            <input id="workBaseDataList${idx.index}_chooseCondition"	 name="projectReportData.projectBasedDataList[${idx.index}].chooseCondition"   type="hidden" value="${projectBasedData.chooseCondition}"/>
+
+                            <input id="workBaseDataList${idx.index}_fileType"	 name="projectReportData.projectBasedDataList[${idx.index}].fileType"   type="hidden" value=""/>
+                            <input id="workBaseDataList${idx.index}_fileName"	 name="projectReportData.projectBasedDataList[${idx.index}].fileName"   type="hidden" value=""/>
+                            <input id="workBaseDataList${idx.index}_fileUrl"	 name="projectReportData.projectBasedDataList[${idx.index}].fileUrl"   type="hidden" value=""/>
+                            <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
+                            <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                         </td>
                         <td style="text-align:center;">
                                 ${projectBasedData.number}
@@ -538,6 +610,50 @@
             </table>
                 </div>
             </div>
+            <script type="text/template" id="workBaseDataTplFirst">//<!--
+                <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">
+                        </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}}','{{row.uploadUser.id}}')"   class="op-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i> 添加附件</a>
+                        </div>
+                    </td>
+                </tr>//-->
+            </script>
             <script type="text/template" id="workBaseDataTpl">//<!--
                 <tr id="budgetList{{idx}}">
                     <td class="hide">
@@ -568,6 +684,7 @@
             </script>
             <script type="text/javascript">
                 var workBaseDataTpl = $("#workBaseDataTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                var workBaseDataTplFirst = $("#workBaseDataTplFirst").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workBaseDataRowIdx = ${fn:length(concealProjectInfo.projectReportData.projectBasedDataList)};
                 function setValuee(obj){
                     for(var i=0;i<obj.length;i++){

src/main/webapp/webpage/modules/projectrecord/distributionSettlement/distributionSettlementList.jsp

@@ -271,7 +271,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=distribution&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'date', align:'center', title: '创建日期',width:100,templet: function(d){

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

@@ -273,7 +273,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=design&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     /*{field: 'sendMoney', align:'center', title: '送审金额',templet: function(d){

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

@@ -55,11 +55,19 @@
                     }
                 }
 
-                /*var idArr = $("#workBaseDataList tr:visible .clientId").length;
-                if(idArr == 0){
-                    layer.msg('请添加工程进度款所需依据性文件', {icon: 5});
-                    return false;
-                }*/
+                var length = document.getElementById("workBaseDataList");
+                var rows = length.rows.length;
+                var idList = [];
+                for (var i=0;i<rows;i++){
+                    var chooseCondition = $("#workBaseDataList"+i+"_chooseCondition").val();
+                    if(chooseCondition==1){
+                        var fileUrl = $("#workBaseDataList"+i+"_fileUrl").val();
+                        if(fileUrl == null || fileUrl == ''){
+                            layer.msg('请上传依据性资料必填文件', {icon: 5});
+                            return false;
+                        }
+                    }
+                }
 
                 beforeSubmit();
                 $("#inputForm").submit();
@@ -193,6 +201,34 @@
         function changeContentDetail(obj) {
             $("#contentDetail").empty();
             var val = "420";
+
+            var modify = $("#modify").val();
+            if("modify" != modify){
+                $("#workBaseDataList").empty();
+                $.ajax({
+                    type:'post',
+                    url:'${ctx}/project/projectImplementEarly/projectBasedDataList',
+                    data:{
+                        "typeId":val
+                    },
+                    success:function(data){
+                        console.log(data);
+                        if(data.projectBasedDataList.length > 0){
+                            var data = data.projectBasedDataList;
+                            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,workBaseDataTplFirst,data[i]);
+                                    workBaseDataRowIdx=workBaseDataRowIdx+1;
+                                }
+                            }
+                        }
+                    }
+                })
+
+            }
+
+
             contentDetailTypeShow(val);
             $("#contentDetailTypeDiv").show();
             $("#projectContentDataSign").val(val);
@@ -419,6 +455,30 @@
             }
 
         }
+
+        //依据性文件点击事件
+        function accordingBtn(obj, prefix,userId){
+            $(prefix+"_file").click();
+        }
+        //依据性文件上传文件方法
+        function insertAccording(tValue,idx,prefix) {
+            var files = $(prefix+"_file")[0].files;
+            for(var i=0;i<files.length;i++) {
+                var file = files[i];
+                var attachmentId = "";
+                var attachmentFlag = "132";
+                console.log(file);
+                var timestamp = new Date().getTime();
+
+                var storeAs = "attachment-file/basedData/" + timestamp + "/" + file['name'];
+                var uploadPath = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/" + storeAs;
+                /*将这段字符串存到数据库即可*/
+                var divId = "_attachment";
+                multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0",1,idx,prefix);
+            }
+            $(prefix+"_file").val(123)
+            //var idx1 = $("#workBaseDataList tr").length +1;
+        }
     </script>
 </head>
 <body>
@@ -512,7 +572,19 @@
                         <c:forEach items="${concealProjectInfo.projectContentData.projectBasedDataList}" var="projectBasedData" varStatus="idx">
                             <tr>
                                 <td class="hide">
-                                    <input type="hidden" id="workBaseDataList${idx.index}_id" value="${projectBasedData.id}" class="clientId">
+                                    <input id="workBaseDataList${idx.index}_id"      name="projectReportData.projectBasedDataList[${idx.index}].id"     type="hidden" value="${projectBasedData.id}"  class="clientId">
+                                    <input id="workBaseDataList${idx.index}_file" type="file" name="projectReportData.projectBasedDataList[${idx.index}].file" multiple="multiple" style="display: none;" onChange="if(this.value)insertAccording(this.value,${idx.index},'#workBaseDataList${idx.index}');"/>
+                                    <input id="workBaseDataList${idx.index}_number"	 name="projectReportData.projectBasedDataList[${idx.index}].number" type="hidden" value="${projectBasedData.number}"/>
+                                    <input id="workBaseDataList${idx.index}_name" 	 name="projectReportData.projectBasedDataList[${idx.index}].name"   type="hidden" value="${projectBasedData.name}"/>
+                                    <input id="workBaseDataList${idx.index}_type"	 name="projectReportData.projectBasedDataList[${idx.index}].type"   type="hidden" value="${projectBasedData.type}"/>
+                                    <input id="workBaseDataList${idx.index}_flag"	 name="projectReportData.projectBasedDataList[${idx.index}].flag"   type="hidden" value="132"/>
+                                    <input id="workBaseDataList${idx.index}_chooseCondition"	 name="projectReportData.projectBasedDataList[${idx.index}].chooseCondition"   type="hidden" value="${projectBasedData.chooseCondition}"/>
+
+                                    <input id="workBaseDataList${idx.index}_fileType"	 name="projectReportData.projectBasedDataList[${idx.index}].fileType"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileName"	 name="projectReportData.projectBasedDataList[${idx.index}].fileName"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileUrl"	 name="projectReportData.projectBasedDataList[${idx.index}].fileUrl"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                                 </td>
                                 <td style="text-align:center;">
                                         ${projectBasedData.number}
@@ -539,6 +611,50 @@
                     </table>
                 </div>
             </div>
+            <script type="text/template" id="workBaseDataTplFirst">//<!--
+                <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">
+                        </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}}','{{row.uploadUser.id}}')"   class="op-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i> 添加附件</a>
+                        </div>
+                    </td>
+                </tr>//-->
+            </script>
             <script type="text/template" id="workBaseDataTpl">//<!--
                 <tr id="budgetList{{idx}}">
                     <td class="hide">
@@ -569,6 +685,7 @@
             </script>
             <script type="text/javascript">
                 var workBaseDataTpl = $("#workBaseDataTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                var workBaseDataTplFirst = $("#workBaseDataTplFirst").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workBaseDataRowIdx = ${fn:length(concealProjectInfo.projectReportData.projectBasedDataList)};
                 function setValuee(obj){
                     for(var i=0;i<obj.length;i++){

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

@@ -310,7 +310,7 @@
 							}else if(d.condition ==2){
 								return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
 							}else{
-								return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+								return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=interim&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
 							}
 						}},
 					{field: 'date', align:'center', title: '创建日期',width:100,templet: function(d){

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

@@ -287,7 +287,7 @@
                             }else if(d.condition ==2){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/project/constructionContract/view?id=" + d.contractId +"','95%', '95%')\">" + d.contractName + "</a>";
                             }else{
-                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"#\" onclick=\"openDialogView('查看工作内容详情', '${ctx}/projectcontentinfo/projectcontentinfo/form?view=contentView&condition=visa&dictType=${dictType}&id="+d.contentPId+"&parentIds=${parentIds}&infoId="+d.id+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'date', align:'center', title: '签证日期',width:100,templet: function(d){

src/main/webapp/webpage/modules/projectrecord/visa/projectVisaForm.jsp

@@ -51,10 +51,18 @@
                     }
                 }
 
-                var idArr = $("#workBaseDataList tr:visible .clientId").length;
-                if(idArr == 0){
-                    layer.msg('请添加一条依据性文件', {icon: 5});
-                    return false;
+                var length = document.getElementById("workBaseDataList");
+                var rows = length.rows.length;
+                var idList = [];
+                for (var i=0;i<rows;i++){
+                    var chooseCondition = $("#workBaseDataList"+i+"_chooseCondition").val();
+                    if(chooseCondition==1){
+                        var fileUrl = $("#workBaseDataList"+i+"_fileUrl").val();
+                        if(fileUrl == null || fileUrl == ''){
+                            layer.msg('请上传依据性资料必填文件', {icon: 5});
+                            return false;
+                        }
+                    }
                 }
                 beforeSubmit();
                 $("#inputForm").submit();
@@ -187,7 +195,35 @@
 
         function changeContentDetail(obj) {
             $("#contentDetail").empty();
-            var val = "410";
+            var val = "45";
+
+            var modify = $("#modify").val();
+            if("modify" != modify){
+                $("#workBaseDataList").empty();
+                $.ajax({
+                    type:'post',
+                    url:'${ctx}/project/projectImplementEarly/projectBasedDataList',
+                    data:{
+                        "typeId":val
+                    },
+                    success:function(data){
+                        console.log(data);
+                        if(data.projectBasedDataList.length > 0){
+                            var data = data.projectBasedDataList;
+                            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,workBaseDataTplFirst,data[i]);
+                                    workBaseDataRowIdx=workBaseDataRowIdx+1;
+                                }
+                            }
+                        }
+                    }
+                })
+
+            }
+
+
             contentDetailTypeShow(val);
             $("#contentDetailTypeDiv").show();
             $("#projectContentDataSign").val(val);
@@ -414,6 +450,30 @@
             }
 
         }
+
+        //依据性文件点击事件
+        function accordingBtn(obj, prefix,userId){
+            $(prefix+"_file").click();
+        }
+        //依据性文件上传文件方法
+        function insertAccording(tValue,idx,prefix) {
+            var files = $(prefix+"_file")[0].files;
+            for(var i=0;i<files.length;i++) {
+                var file = files[i];
+                var attachmentId = "";
+                var attachmentFlag = "132";
+                console.log(file);
+                var timestamp = new Date().getTime();
+
+                var storeAs = "attachment-file/basedData/" + timestamp + "/" + file['name'];
+                var uploadPath = "http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/" + storeAs;
+                /*将这段字符串存到数据库即可*/
+                var divId = "_attachment";
+                multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0",1,idx,prefix);
+            }
+            $(prefix+"_file").val(123)
+            //var idx1 = $("#workBaseDataList tr").length +1;
+        }
     </script>
 </head>
 <body>
@@ -500,7 +560,19 @@
                         <c:forEach items="${concealProjectInfo.projectContentData.projectBasedDataList}" var="projectBasedData" varStatus="idx">
                             <tr>
                                 <td class="hide">
-                                    <input type="hidden" id="workBaseDataList${idx.index}_id" value="${projectBasedData.id}" class="clientId">
+                                    <input id="workBaseDataList${idx.index}_id"      name="projectReportData.projectBasedDataList[${idx.index}].id"     type="hidden" value="${projectBasedData.id}"  class="clientId">
+                                    <input id="workBaseDataList${idx.index}_file" type="file" name="projectReportData.projectBasedDataList[${idx.index}].file" multiple="multiple" style="display: none;" onChange="if(this.value)insertAccording(this.value,${idx.index},'#workBaseDataList${idx.index}');"/>
+                                    <input id="workBaseDataList${idx.index}_number"	 name="projectReportData.projectBasedDataList[${idx.index}].number" type="hidden" value="${projectBasedData.number}"/>
+                                    <input id="workBaseDataList${idx.index}_name" 	 name="projectReportData.projectBasedDataList[${idx.index}].name"   type="hidden" value="${projectBasedData.name}"/>
+                                    <input id="workBaseDataList${idx.index}_type"	 name="projectReportData.projectBasedDataList[${idx.index}].type"   type="hidden" value="${projectBasedData.type}"/>
+                                    <input id="workBaseDataList${idx.index}_flag"	 name="projectReportData.projectBasedDataList[${idx.index}].flag"   type="hidden" value="132"/>
+                                    <input id="workBaseDataList${idx.index}_chooseCondition"	 name="projectReportData.projectBasedDataList[${idx.index}].chooseCondition"   type="hidden" value="${projectBasedData.chooseCondition}"/>
+
+                                    <input id="workBaseDataList${idx.index}_fileType"	 name="projectReportData.projectBasedDataList[${idx.index}].fileType"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileName"	 name="projectReportData.projectBasedDataList[${idx.index}].fileName"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileUrl"	 name="projectReportData.projectBasedDataList[${idx.index}].fileUrl"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
+                                    <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                                 </td>
                                 <td style="text-align:center;">
                                         ${projectBasedData.number}
@@ -527,6 +599,50 @@
                     </table>
                 </div>
             </div>
+            <script type="text/template" id="workBaseDataTplFirst">//<!--
+                <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">
+                        </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}}','{{row.uploadUser.id}}')"   class="op-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i> 添加附件</a>
+                        </div>
+                    </td>
+                </tr>//-->
+            </script>
             <script type="text/template" id="workBaseDataTpl">//<!--
                 <tr id="budgetList{{idx}}">
                     <td class="hide">
@@ -557,14 +673,11 @@
             </script>
             <script type="text/javascript">
                 var workBaseDataTpl = $("#workBaseDataTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+                var workBaseDataTplFirst = $("#workBaseDataTplFirst").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workBaseDataRowIdx = ${fn:length(concealProjectInfo.projectReportData.projectBasedDataList)};
                 function setValuee(obj){
                     for(var i=0;i<obj.length;i++){
                         var idArr = $("#workBaseDataList tr:visible .clientId");
-                        if(idArr.length == 1){
-                            layer.msg('只能选择或新增一条依据性资料', {icon: 5});
-                            return;
-                        }
                         if(obj[i].id!=''&&!hasInArr(obj[i].id,idArr)){
                             addRowBaseData("#workBaseDataList",workBaseDataRowIdx,workBaseDataTpl,obj[i]);
                             workBaseDataRowIdx=workBaseDataRowIdx+1;

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

@@ -668,7 +668,7 @@
 
                             <input id="workBaseDataList${idx.index}_fileType"	 name="projectReportData.projectBasedDataList[${idx.index}].fileType"   type="hidden" value=""/>
                             <input id="workBaseDataList${idx.index}_fileName"	 name="projectReportData.projectBasedDataList[${idx.index}].fileName"   type="hidden" value=""/>
-                            <input id="workBaseDataList${idx.index}_fileUrl"	 name="projectReportData.projectBasedDataList[${idx.index}].fileUrl"   type="hidden" value=""/>
+                            <input id="workBaseDataList${idx.index}_fileUrl"	 name="projectReportData.projectBasedDataList[${idx.index}].fileUrl"   type="hidden" value="${projectBasedData.fileUrl}"/>
                             <input id="workBaseDataList${idx.index}_fileAttachmentFlag"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentFlag"   type="hidden" value=""/>
                             <input id="workBaseDataList${idx.index}_fileAttachmentId"	 name="projectReportData.projectBasedDataList[${idx.index}].fileAttachmentId"   type="hidden" value=""/>
                         </td>

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

@@ -1181,11 +1181,11 @@
             case '42':
                 return "${ctx}/workcontent/workContentPricemanage/form";
             case '43':
-                return "${ctx}/workcontent/workContentAltermanage/form";
+                return "${ctx}/project/projectDesignChange/visaList";
             case '45':
-                return "${ctx}/workcontent/workContentVisamanage/form";
+                return "${ctx}/project/projectVisa/visaList";
             case '46':
-                return "${ctx}/workcontent/workContentClaim/form";
+                return "${ctx}/project/projectClaim/visaList";
             case '47':
                 return "${ctx}/workcontent/workContentFundplan/form";
             case '48':
@@ -1251,14 +1251,15 @@
             case '42':
                 $("#contentDetail").load("${ctx}/workcontent/workContentPricemanage/form",param2);
                 break;
+
             case '43':
-                $("#contentDetail").load("${ctx}/workcontent/workContentAltermanage/form",param2);
+                $("#contentDetail").load("${ctx}/project/projectDesignChange/visaList",param2);
                 break;
             case '45':
-                $("#contentDetail").load("${ctx}/workcontent/workContentVisamanage/form",param2);
+                $("#contentDetail").load("${ctx}/project/projectVisa/visaList",param2);
                 break;
             case '46':
-                $("#contentDetail").load("${ctx}/workcontent/workContentClaim/form",param2);
+                $("#contentDetail").load("${ctx}/project/projectClaim/visaList",param2);
                 break;
             case '47':
                 $("#contentDetail").load("${ctx}/workcontent/workContentFundplan/form",param2);
@@ -1332,14 +1333,15 @@
             case '42':
                 $("#contentDetail").load("${ctx}/workcontent/workContentPricemanage/form",param2);
                 break;
+
             case '43':
-                $("#contentDetail").load("${ctx}/workcontent/workContentAltermanage/form",param2);
+                $("#contentDetail").load("${ctx}/project/projectDesignChange/visaList",param2);
                 break;
             case '45':
-                $("#contentDetail").load("${ctx}/workcontent/workContentVisamanage/form",param2);
+                $("#contentDetail").load("${ctx}/project/projectVisa/visaList",param2);
                 break;
             case '46':
-                $("#contentDetail").load("${ctx}/workcontent/workContentClaim/form",param2);
+                $("#contentDetail").load("${ctx}/project/projectClaim/visaList",param2);
                 break;
             case '47':
                 $("#contentDetail").load("${ctx}/workcontent/workContentFundplan/form",param2);