分布结算审核

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

@@ -238,7 +238,7 @@ public class ArmorForMaterialsController extends BaseController {
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
 
         String str = armorForMaterialsService.saveData(concealProjectInfo);
-        addMessage(redirectAttributes, "保存隐蔽工程量内容信息"+(str.equals("true")?"成功":"失败"));
+        addMessage(redirectAttributes, "保存甲供物资内容信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/armorForMaterials/?repage";
     }
 

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

@@ -239,7 +239,7 @@ public class DistributionSettlementController extends BaseController {
     public String save(ConcealProjectInfo concealProjectInfo, RedirectAttributes redirectAttributes) throws Exception {
 
         String str = distributionSettlementService.saveData(concealProjectInfo);
-        addMessage(redirectAttributes, "保存分部结算内容信息"+(str.equals("true")?"成功":"失败"));
+        addMessage(redirectAttributes, "保存分布结算内容信息"+(str.equals("true")?"成功":"失败"));
         return "redirect:"+Global.getAdminPath()+"/project/distributionSettlement/?repage";
     }
 

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

@@ -265,13 +265,13 @@
                                 return "<font>"+d.cnumber+"</font>";
                             }
                         }},
-                    {field: 'contractName',align:'center', title: '项目名称/合同名称/分部结算信息名称',templet:function(d){
+                    {field: 'contractName',align:'center', title: '项目名称/合同名称/分布结算信息名称',templet:function(d){
                             if(d.condition ==1){
                                 return  "<a class=\"attention-info pid\" title=\"" + d.contractName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/project/projectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.contractName + "</a>";
                             }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=\"javascript:void(0)\" onclick=\"openDialogView('查看分部结算信息', '${ctx}/project/distributionSettlement/form?type=view&infoId="+d.id+"&contractId="+d.contractId+"&project.id="+d.projectId+"&contract.id="+d.pid+"','95%', '95%')\">" + d.contractName + "</a>";
+                                return "<a class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"openDialogView('查看分布结算信息', '${ctx}/project/distributionSettlement/form?type=view&infoId="+d.id+"&contractId="+d.contractId+"&project.id="+d.projectId+"&contract.id="+d.pid+"','95%', '95%')\">" + d.contractName + "</a>";
                             }
                         }},
                     {field: 'date', align:'center', title: '创建日期',width:100,templet: function(d){
@@ -315,12 +315,12 @@
                 ].join('');
             } else if(d.condition ==2) {
                 return [
-                    '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增分部结算信息\', \'${ctx}/project/distributionSettlement/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+                    '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增分布结算信息\', \'${ctx}/project/distributionSettlement/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
                 ].join('');
             } else if (d.condition ==3){
                 return [
-                    '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改分部结算信息\', \'${ctx}/project/distributionSettlement/form?infoId='+d.id+'&contractId='+d.contractId+'&project.id='+d.projectId+'&contract.id='+d.pid+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-                    '<a href="${ctx}/project/distributionSettlement/deleteConcealProject?id='+d.id+'" onclick="return confirmx(\'确认要删除该分部结算信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                    '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改分布结算信息\', \'${ctx}/project/distributionSettlement/form?infoId='+d.id+'&contractId='+d.contractId+'&project.id='+d.projectId+'&contract.id='+d.pid+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                    '<a href="${ctx}/project/distributionSettlement/deleteConcealProject?id='+d.id+'" onclick="return confirmx(\'确认要删除该分布结算信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
                 ].join('');
 
             }else{