实施阶段 复核后 原文件无法修改

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

@@ -186,6 +186,7 @@ public class ProjectClaimController extends BaseController {
                             contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());
+                            contentData.setStatus(data.getStatus());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
                             contentData.setCreateDate(data.getCreateDate());

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

@@ -334,6 +334,7 @@ public class ProjectDesignController extends BaseController {
                             contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setId(data.getId());
                             contentData.setContractName(data.getProjectName());
+                            contentData.setStatus(data.getStatus());
                             contentData.setCnumber(contract.getCnumber());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());

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

@@ -354,6 +354,7 @@ public class ProjectVisaController extends BaseController {
                             contentData.setId(data.getId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());
+                            contentData.setStatus(data.getStatus());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
                             contentData.setCreateDate(data.getCreateDate());

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

@@ -195,6 +195,7 @@ public class DistributionSettlementController extends BaseController {
                             contentData.setProjectTypeId(data.getProjectTypeId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());
+                            contentData.setStatus(data.getStatus());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
                             contentData.setCreateDate(data.getCreateDate());

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

@@ -174,6 +174,7 @@ public class ProjectInterimPaymentController extends BaseController {
                             contentData.setId(data.getId());
                             contentData.setContractName(data.getProjectName());
                             contentData.setCnumber(contract.getCnumber());
+                            contentData.setStatus(data.getStatus());
                             //contentData.setNumber(data.getNumber());
                             contentData.setProjectId(record.getId());
                             contentData.setCreateDate(data.getCreateDate());

src/main/java/com/jeeplus/modules/workcontent/web/WorkScheduleController.java

@@ -89,7 +89,7 @@ public class WorkScheduleController extends BaseController {
 	/**
 	 * 根据projectId获取项目中所有的工程进度款数据信息
 	 */
-	@RequestMapping(value = {"listByProjectId", ""})
+	@RequestMapping(value = {"listByProjectId"})
 	public String listByProjectId(WorkScheduleInfo workScheduleInfo,String view, HttpServletRequest request, Model model) {
 		String sign = request.getParameter("sign");
 		List<String> signList = new ArrayList();

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

@@ -312,7 +312,7 @@
 		a.project_id as "pid", a.name as "projectName", "" as projectId,
 		"0" as projectStatus,su.name as "projectRegistrant" ,
 		pt.type_name as projectLeader,pt.id as projectTypeId,
-		ppt.type_name as clientName,ifnull(prd.status,'10') as status
+		ppt.type_name as clientName,ifnull(prd.status,'10') as status,ifnull(prd.name,'') as reportName
 		from project_content_data a
 		left join sys_user su on su.id = a.create_by
 		left join project_type pt on a.type = pt.type_id

src/main/webapp/webpage/modules/ProjectFollowReport/ProjectFollowReportList.jsp

@@ -295,7 +295,7 @@
 				cols: [[
 					{type: 'numbers', align:'center', title: '序号' ,width:80},
 					{field: 'projectId', width:250, title: '项目编号/施工合同编号'},
-					{field: 'projectName', align:'center', title: '项目名称/施工合同名称',templet:function(d){
+					{field: 'projectName', align:'center', title: '项目名称/咨询报告名称',templet:function(d){
 							if(0 == d.pid){
 								return "<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
 							}else{

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

@@ -343,10 +343,14 @@
                 }
             } else if (d.condition ==3){
                 if(1 == d.operationSign) {
-                    return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改索赔信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=claim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
-                    ].join('');
+                    if(d.status =="10"){
+                        return [
+                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改索赔信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=claim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                            '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                        ].join('');
+                    }else{
+                        return[''].join('');
+                    }
                 }else{
                     return[''].join('');
                 }

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

@@ -323,10 +323,14 @@
                 }
             } else if (d.condition ==3){
                 if(1 == d.operationSign) {
-                    return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改分布结算信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=distribution&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
-                    ].join('');
+                    if(d.status =="10"){
+                        return [
+                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改分布结算信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=distribution&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                            '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                        ].join('');
+                    }else{
+                        return[''].join('');
+                    }
                 }else{
                     return[''].join('');
                 }

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

@@ -345,10 +345,14 @@
                 }
             } else if (d.condition ==3){
                 if(1 == d.operationSign) {
-                    return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改设计变更信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=design&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-                        '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
-                    ].join('');
+                    if(d.status =="10"){
+                        return [
+                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改设计变更信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=design&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                            '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                        ].join('');
+                    }else{
+                        return[''].join('');
+                    }
                 }else{
                     return[''].join('');
                 }

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

@@ -416,11 +416,15 @@
 				}
 			} else if (d.condition ==3){
 				if(1 == d.operationSign) {
-					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工程进度款信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=interim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-						'<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
-						/*'<a href="${ctx}/project/projectInterimPayment/deleteInterimPayment?id='+d.id+'" onclick="return confirmx(\'确认要删除该甲供物资信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
-					].join('');
+					if(d.status =="10"){
+						return [
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工程进度款信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=interim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+							'<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+							/*'<a href="${ctx}/project/projectInterimPayment/deleteInterimPayment?id='+d.id+'" onclick="return confirmx(\'确认要删除该甲供物资信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
+						].join('');
+					}else{
+						return[''].join('');
+					}
 				}else{
 					return[''].join('');
 				}

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

@@ -340,10 +340,14 @@
                 }
             } else if (d.condition ==3){
                 if(1 == d.operationSign) {
+                    if(d.status =="10"){
                     return [
                         '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改签证信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=visa&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
                         '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
                     ].join('');
+                    } else {
+                        return[''].join('');
+                    }
                 }else{
                     return[''].join('');
                 }