Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectConstruction/entity/ConstructionContract.java

@@ -55,6 +55,10 @@ public class ConstructionContract extends DataEntity<ConstructionContract> {
 	private Date startDate;		// 开始日期
 	private Date endDate;		// 结束日期
     List<WorkContentContractTerm> termList;
+    private String trueAmtStr;
+    private String payAmtStr;
+    private String titularAmtStr;
+    private String stopAmtStr;
 
     private String createName; //操作人名称
 
@@ -334,4 +338,36 @@ public class ConstructionContract extends DataEntity<ConstructionContract> {
 	public void setWorkAttachments(List<WorkClientAttachment> workAttachments) {
 		this.workAttachments = workAttachments;
 	}
+
+	public String getTrueAmtStr() {
+		return trueAmtStr;
+	}
+
+	public void setTrueAmtStr(String trueAmtStr) {
+		this.trueAmtStr = trueAmtStr;
+	}
+
+	public String getPayAmtStr() {
+		return payAmtStr;
+	}
+
+	public void setPayAmtStr(String payAmtStr) {
+		this.payAmtStr = payAmtStr;
+	}
+
+	public String getTitularAmtStr() {
+		return titularAmtStr;
+	}
+
+	public void setTitularAmtStr(String titularAmtStr) {
+		this.titularAmtStr = titularAmtStr;
+	}
+
+	public String getStopAmtStr() {
+		return stopAmtStr;
+	}
+
+	public void setStopAmtStr(String stopAmtStr) {
+		this.stopAmtStr = stopAmtStr;
+	}
 }

src/main/java/com/jeeplus/modules/projectConstruction/web/ContractController.java

@@ -300,10 +300,20 @@ public class ContractController extends BaseController {
     /*@RequiresPermissions(value={"project:constructionContract:add","project:constructionContract:edit"})*/
     @RequestMapping(value = "save")
     public String save(ConstructionContract constructionContract, Model model, RedirectAttributes redirectAttributes) {
+        constructionContract.setTrueAmt(shiftDouble(constructionContract.getTrueAmtStr()));
+        constructionContract.setPayAmt(shiftDouble(constructionContract.getPayAmtStr()));
+        constructionContract.setTitularAmt(shiftDouble(constructionContract.getTitularAmtStr()));
+        constructionContract.setStopAmt(shiftDouble(constructionContract.getStopAmtStr()));
         contractService.insertContract(constructionContract);
         return "redirect:"+Global.getAdminPath()+"/project/constructionContract/?repage";
     }
 
+    private static Double shiftDouble(String moneyStr){
+        moneyStr = moneyStr.replaceAll(",","");
+        Double money = Double.parseDouble(moneyStr);
+        return money;
+    }
+
     @RequestMapping("selectcontent")
     public String gridSelect(ProjectImplementEarly projectRecords, String searchLabel ,HttpServletRequest request, HttpServletResponse response, Model model) throws UnsupportedEncodingException {
         model.addAttribute("obj", projectRecords);

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

@@ -90,9 +90,12 @@ public class WorkFiveDirectionsAffirmController extends BaseController {
 	}
 
 	public static String getNowDate(Date currentTime) {
-		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-		String dateString = formatter.format(currentTime);
-		return dateString;
+		if(null != currentTime){
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+			String dateString = formatter.format(currentTime);
+			return dateString;
+		}
+		return null;
 	}
 
 

src/main/webapp/webpage/modules/projectConstruction/projectConstructionForm.jsp

@@ -312,13 +312,13 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label ">目标成本(元)：</label>
                     <div class="layui-input-block">
-                        <input name="titularAmt" htmlEscape="false"  value="${constructionContract.titularAmt}" class="form-control layui-input number"/>
+                        <input name="titularAmtStr" htmlEscape="false" value="<fmt:formatNumber value="${constructionContract.titularAmt}" pattern="#,##0.00#"/>" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>有效合同金额(元)：</label>
                     <div class="layui-input-block">
-                        <input name="trueAmt" htmlEscape="false"  value="${constructionContract.trueAmt}" class="form-control layui-input number required"/>
+                        <input name="trueAmtStr" htmlEscape="false" value="<fmt:formatNumber value="${constructionContract.trueAmt}" pattern="#,##0.00#"/>" class="form-control layui-input number required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -350,7 +350,7 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">止付金额：</label>
                     <div class="layui-input-block">
-                        <input name="stopAmt" htmlEscape="false"  value="${constructionContract.stopAmt}"  class="form-control layui-input  number"/>
+                        <input name="stopAmtStr" htmlEscape="false"  value="<fmt:formatNumber value="${constructionContract.stopAmt}" pattern="#,##0.00#"/>"  class="form-control layui-input  number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -374,7 +374,7 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>支付金额：</label>
                     <div class="layui-input-block">
-                        <input name="payAmt" htmlEscape="false"  value="${constructionContract.payAmt}" class="form-control layui-input required number"/>
+                        <input name="payAmtStr" htmlEscape="false"  value="<fmt:formatNumber value="${constructionContract.payAmt}" pattern="#,##0.00#"/>" class="form-control layui-input required number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/projectrecord/armorForMaterials/armorForMaterialsForm.jsp

@@ -34,6 +34,28 @@
         var detailFlag =0;
         function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
+
+
+
+                var length = document.getElementById("fiveDirectionsAffirmList");
+                if(null != length){
+                    var rows = length.rows.length;
+                    for (var i=1;i<=rows;i++){
+                        var costPart = $("#fiveDirectionsAffirmList"+i+"_ownerPurchasingRequisitionNum").val();
+                        var ownerMaterialCode = $("#fiveDirectionsAffirmList"+i+"_ownerMaterialCode").val();
+                        var ownerMaterialDescription = $("#fiveDirectionsAffirmList"+i+"_ownerMaterialDescription").val();
+                        var ownerUnits = $("#fiveDirectionsAffirmList"+i+"_ownerUnits").val();
+                        var ownerTenderNum = $("#fiveDirectionsAffirmList"+i+"_ownerTenderNum").val();
+                        var designMaterialName = $("#fiveDirectionsAffirmList"+i+"_designMaterialName").val();
+                        var designDrawingAmount = $("#fiveDirectionsAffirmList"+i+"_designDrawingAmount").val();
+                        if(null == costPart ||'' == costPart || null == ownerMaterialCode || ''==ownerMaterialCode || null == ownerMaterialDescription || '' == ownerMaterialDescription || null == ownerUnits || '' == ownerUnits || null == ownerTenderNum || '' == ownerTenderNum || null == designMaterialName || '' == designMaterialName || null == designDrawingAmount || '' == designDrawingAmount){
+                            layer.msg('请填写完甲供物资确认单', {icon: 5});
+                            return false;
+                        }
+                    }
+                }
+
+
                 beforeSubmit();
                 $("#inputForm").submit();
                 return true;
@@ -419,7 +441,7 @@
                     </div>
                 </div>--%>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>隐蔽工程量名称：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>甲供物资审核名称：</label>
                     <div class="layui-input-block">
                         <form:input path="projectContentData.name" value="${concealProjectInfo.contract.contractName}" htmlEscape="false" class="form-control required layui-input"/>
                     </div>

src/main/webapp/webpage/modules/projectrecord/armorForMaterials/armorForMaterialsList.jsp

@@ -314,15 +314,22 @@
                     '',
                 ].join('');
             } else if(d.condition ==2) {
-                return [
-                    '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增甲供物资信息\', \'${ctx}/project/armorForMaterials/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('');
+                if(1 == d.operationSign) {
+                    return [
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增甲供物资信息\', \'${ctx}/project/armorForMaterials/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{
+                    return[''].join('');
+                }
             } else if (d.condition ==3){
-                return [
-                    '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改甲供物资信息\', \'${ctx}/project/armorForMaterials/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/armorForMaterials/deleteConcealProject?id='+d.id+'" onclick="return confirmx(\'确认要删除该甲供物资信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
-                ].join('');
-
+                if(1 == d.operationSign) {
+                    return [
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改甲供物资信息\', \'${ctx}/project/armorForMaterials/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/armorForMaterials/deleteConcealProject?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 [
                     '',

src/main/webapp/webpage/modules/projectrecord/armorForMaterials/armorForMaterialsView.jsp

@@ -418,7 +418,7 @@
                     </div>
                 </div>--%>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>隐蔽工程量名称：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>甲供物资审核名称：</label>
                     <div class="layui-input-block">
                         <form:input path="projectContentData.name" readonly="true" value="${concealProjectInfo.contract.contractName}" htmlEscape="false" class="form-control required layui-input"/>
                     </div>

src/main/webapp/webpage/modules/projectrecord/concealProject/concealProjectList.jsp

@@ -315,15 +315,22 @@
                     '',
                 ].join('');
             } else if(d.condition ==2) {
-                return [
-                    '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增隐蔽工程量\', \'${ctx}/project/concealProject/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('');
+                if(1 == d.operationSign) {
+                    return [
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增隐蔽工程量\', \'${ctx}/project/concealProject/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{
+                    return[''].join('');
+                }
             } else if (d.condition ==3){
-                return [
-                    '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/project/concealProject/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/concealProject/deleteConcealProject?id='+d.id+'" onclick="return confirmx(\'确认要删除该隐蔽工程量信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
-                ].join('');
-
+                if(1 == d.operationSign) {
+                    return [
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/project/concealProject/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/concealProject/deleteConcealProject?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 [
                     '',

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

@@ -34,6 +34,37 @@
         var detailFlag =0;
         function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
+
+
+                var length = document.getElementById("workSiteLevel");
+                if(null != length){
+                    var rows = length.rows.length;
+                    for (var i=1;i<=rows;i++){
+                        var costPart = $("#workSiteLevel"+i+"_costPart").val();
+                        var workAmount = $("#workSiteLevel"+i+"_workAmount").val();
+                        var workConcealProjectSerialNum = $("#workSiteLevel"+i+"_workConcealProjectSerialNum").val();
+                        if('' == costPart || ''==workAmount || '' == workConcealProjectSerialNum){
+                            layer.msg('请填写完场平工程量确认单', {icon: 5});
+                            return false;
+                        }
+                    }
+                }
+
+                var length = document.getElementById("workConcealProject");
+                if(null != length){
+                    var rows = length.rows.length;
+                    for (var i=1;i<=rows;i++){
+                        var costPart = $("#workConcealProject"+i+"_costPart").val();
+                        var workAmount = $("#workConcealProject"+i+"_workAmount").val();
+                        var workConcealProjectSerialNum = $("#workConcealProject"+i+"_workConcealProjectSerialNum").val();
+                        if('' == costPart || ''==workAmount || '' == workConcealProjectSerialNum){
+                            layer.msg('请填写完隐蔽工程量确认单', {icon: 5});
+                            return false;
+                        }
+                    }
+                }
+
+
                 beforeSubmit();
                 $("#inputForm").submit();
                 return true;

src/main/webapp/webpage/modules/projectrecord/contractMaterial/materialList.jsp

@@ -314,15 +314,22 @@
                     '',
                 ].join('');
             } else if(d.condition ==2) {
-                return [
-                    '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/contractMaterial/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('');
+                if(1 == d.operationSign) {
+                    return [
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/contractMaterial/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{
+                    return[''].join('');
+                }
             } else if (d.condition ==3){
-                return [
-                    '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改暂定材料信息\', \'${ctx}/project/contractMaterial/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/contractMaterial/deleteConcealProject?id='+d.id+'" onclick="return confirmx(\'确认要删除该暂定材料吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
-                ].join('');
-
+                if(1 == d.operationSign) {
+                    return [
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改暂定材料信息\', \'${ctx}/project/contractMaterial/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/contractMaterial/deleteConcealProject?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 [
                     '',

src/main/webapp/webpage/modules/projectrecord/contractMaterial/workMaterialForm.jsp

@@ -34,6 +34,24 @@
         var detailFlag =0;
         function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
+
+
+                var length = document.getElementById("workScheduleList");
+                if(null != length){
+                    var rows = length.rows.length;
+                    for (var i=1;i<=rows;i++){
+                        var materialsName = $("#workScheduleList"+i+"_materialsName").val();
+                        var specificationName = $("#workScheduleList"+i+"_specificationName").val();
+                        var partUsed = $("#workScheduleList"+i+"_partUsed").val();
+                        var materialPrice = $("#workScheduleList"+i+"_materialPrice").val();
+                        var nuclearPrice = $("#workScheduleList"+i+"_nuclearPrice").val();
+                        if('' == materialsName || ''==specificationName || '' == partUsed || '' == materialPrice || '' == nuclearPrice){
+                            layer.msg('请填写完暂定材料价审核单', {icon: 5});
+                            return false;
+                        }
+                    }
+                }
+
                 beforeSubmit();
                 $("#inputForm").submit();
                 return true;
@@ -418,7 +436,7 @@
                     </div>
                 </div>--%>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>隐蔽工程量名称：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>暂定材料价名称：</label>
                     <div class="layui-input-block">
                         <form:input path="projectContentData.name" value="${materialProjectInfo.contract.contractName}" htmlEscape="false" class="form-control required layui-input"/>
                     </div>

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

@@ -34,6 +34,26 @@
         var detailFlag =0;
         function doSubmit(){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
+
+
+                var length = document.getElementById("investmentCostList");
+                if(null != length){
+                    var rows = length.rows.length;
+                    for (var i=1;i<=rows;i++){
+                        var accountName = $("#investmentCostList"+i+"_accountName").val();
+                        var contractAccount = $("#investmentCostList"+i+"_contractAccount").val();
+                        var submitAccount = $("#investmentCostList"+i+"_submitAccount").val();
+                        var setAccount = $("#investmentCostList"+i+"_setAccount").val();
+                        var businessAdd = $("#investmentCostList"+i+"_businessAdd").val();
+                        var businessReduce = $("#investmentCostList"+i+"_businessReduce").val();
+                        var businessRate = $("#investmentCostList"+i+"_businessRate").val();
+                        if('' == accountName || ''==contractAccount || '' == submitAccount || '' == setAccount || '' == businessAdd || '' == businessReduce || '' == businessRate){
+                            layer.msg('请填写完分布结算审核单', {icon: 5});
+                            return false;
+                        }
+                    }
+                }
+
                 beforeSubmit();
                 $("#inputForm").submit();
                 return true;
@@ -419,7 +439,7 @@
                     </div>
                 </div>--%>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>隐蔽工程量名称：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>分布结算审核名称：</label>
                     <div class="layui-input-block">
                         <form:input path="projectContentData.name" value="${concealProjectInfo.contract.contractName}" htmlEscape="false" class="form-control required layui-input"/>
                     </div>

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

@@ -314,15 +314,22 @@
                     '',
                 ].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>',
-                ].join('');
+                if(1 == d.operationSign) {
+                    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>',
+                    ].join('');
+                }else{
+                    return[''].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>',
-                ].join('');
-
+                if(1 == d.operationSign) {
+                    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>',
+                    ].join('');
+                }else{
+                    return[''].join('');
+                }
             }else{
                 return [
                     '',

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

@@ -418,7 +418,7 @@
                     </div>
                 </div>--%>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>隐蔽工程量名称：</label>
+                    <label class="layui-form-label double-line"><span class="require-item">*</span>分布结算审核名称：</label>
                     <div class="layui-input-block">
                         <form:input path="projectContentData.name" readonly="true" value="${concealProjectInfo.contract.contractName}" htmlEscape="false" class="form-control required layui-input"/>
                     </div>

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

@@ -631,7 +631,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>