全过程管理功能修改

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

@@ -326,6 +326,7 @@ public class ProjectEarlyReviewController extends BaseController {
         model.addAttribute("reviewStandard", projectReportData.getReviewStandard());
         model.addAttribute("projectId", projectcontentinfo.getProject().getId());
         model.addAttribute("reportType", projectcontentinfo.getReportType());
+        model.addAttribute("projectContentDataType", projectContentData.getType());
         if (projectcontentinfo.getView().equals("reportView")){
             return "modules/projectcontentinfo/reportView";
         }else if (projectcontentinfo.getView().equals("reportChange")) {

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsController.java

@@ -388,17 +388,18 @@ public class ProjectRecordsController extends BaseController {
 	public WorkContractInfo queryContractInfo(WorkContractInfo  contractInfo){
 		WorkContractInfo workContractInfo = contractInfoService.get(contractInfo.getId());
 		if(workContractInfo==null){
-		    return workContractInfo;
-        }
+			return workContractInfo;
+		}
+		workContractInfo.setContractType(DictUtils.getMainDictLabel(String.valueOf(workContractInfo.getContractTypeDoc()),"contract_info_type",""));
 		workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()),"construction_project_type",""));
 		if(workContractInfo.getWorkClientInfoList()!=null&&!workContractInfo.getWorkClientInfoList().isEmpty()){
-            StringBuilder workClinetInfoIds = new StringBuilder();
-            for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()) {
-                workClinetInfoIds.append(workClientInfo.getId()).append(",");
+			StringBuilder workClinetInfoIds = new StringBuilder();
+			for (WorkClientInfo workClientInfo : workContractInfo.getWorkClientInfoList()) {
+				workClinetInfoIds.append(workClientInfo.getId()).append(",");
 			}
-            workClinetInfoIds.deleteCharAt(workClinetInfoIds.length()-1);
-            workContractInfo.setWorkClinetInfoIds(workClinetInfoIds.toString());
-        }
+			workClinetInfoIds.deleteCharAt(workClinetInfoIds.length()-1);
+			workContractInfo.setWorkClinetInfoIds(workClinetInfoIds.toString());
+		}
 		return  workContractInfo;
 	}
 

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

@@ -42,7 +42,7 @@ public class WorkScheduleController extends BaseController {
 
 	@Autowired
 	private WorkScheduleService workScheduleService;
-	
+
 	@ModelAttribute
 	public WorkScheduleInfo get(@RequestParam(required=false) String id) {
 		WorkScheduleInfo entity = null;
@@ -54,7 +54,7 @@ public class WorkScheduleController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 工程费用列表页面
 	 */
@@ -142,7 +142,7 @@ public class WorkScheduleController extends BaseController {
 		}
 		return responseEntity;
     }
-	
+
 	/**
 	 * 下载导入设计概算编制审核调整数据模板
 	 */
@@ -164,5 +164,5 @@ public class WorkScheduleController extends BaseController {
 		}*/
 		return "redirect:"+Global.getAdminPath()+"/workSchedule/workSchedule/?repage";
     }
-	
-}
+
+}

src/main/webapp/webpage/modules/projectrecord/implementEarly/projectImplementEarlyList.jsp

@@ -423,7 +423,7 @@
 						return [
 							'<div class=\"layui-btn-group\">'+
 							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=early&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green > 编辑</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="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}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.id+'&id='+d.contentPId+'&type=8&condition=record" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
 							+'</div>'
 						].join('');
@@ -594,4 +594,4 @@
 	}
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/projectrecord/projectRecordsAudit.jsp

@@ -177,9 +177,9 @@
 				</div>
 				<div id="div3">
 					<div class="layui-item layui-col-sm6 lw6">
-						<label class="layui-form-label">工程分类：</label>
+						<label class="layui-form-label">项目类型：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
 						</div>
 					</div>
 				</div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -201,7 +201,7 @@
                     formatNum($("#contractPrice"));
                     $("#contractClientName").val(data.client.name);
                     $("#contractClientId").val(data.client.id);
-                    $("#constructionProjectType").val(data.constructionProjectTypeStr);
+                    $("#constructionProjectType").val(data.contractType);
                     $("#linkmanId").val(data.workClinetInfoIds);
                     //清理之前的联系人
                     var newClientId  = data.client.id;
@@ -1149,7 +1149,7 @@
                    </div>
                    <div id="divv3">
                        <div class="layui-item layui-col-sm6 lw7">
-                           <label class="layui-form-label">工程分类：</label>
+                           <label class="layui-form-label">合同分类：</label>
                            <div class="layui-input-block">
                                <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
                            </div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsModify.jsp

@@ -100,7 +100,7 @@
                     formatNum($("#contractPrice"));
                     $("#contractClientName").val(data.client.name);
                     $("#contractClientId").val(data.client.id);
-                    $("#constructionProjectType").val(data.constructionProjectTypeStr);
+                    $("#constructionProjectType").val(data.contractType);
                     $("#linkmanId").val(data.workClinetInfoIds);
                 }
             })
@@ -376,9 +376,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">工程分类：</label>
+                    <label class="layui-form-label">合同类型：</label>
                     <div class="layui-input-block">
-                        <input  htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+                        <input  htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
                     </div>
                 </div>
             </div>

src/main/webapp/webpage/modules/projectrecord/projectRecordsView.jsp

@@ -101,9 +101,9 @@
 				</div>
 				<div id="divv3">
 					<div class="layui-item layui-col-sm6 lw6">
-						<label class="layui-form-label">工程分类：</label>
+						<label class="layui-form-label">合同类型：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
 						</div>
 					</div>
 				</div>
@@ -746,4 +746,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>

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

@@ -172,7 +172,100 @@
 			$("#according_btn").click(function () {
 				$("#according_file").click();
 			});
+
+			$.ajax({
+				type:"post",
+				url:'${ctx}/projectcontentinfo/projectcontentinfo/getAchievementTypeList',
+				data:{"achievementParentId":achievementParentId,type:1},
+				dataType:"json",
+				success:function(data){
+					if(data.success) {
+						$('#achievementType').html('<option value="">请选择成果类型</option>')
+						var list = eval(data.body.list);
+						dataList=list;
+						for(var i in list){
+							$('#achievementType').append(new Option(dataList[i].label, dataList[i].value));
+						}
+
+						layui.form.render("select");
+					}else {
+						top.layer.msg("获取数据失败！", {icon: 0});
+					}
+				}
+			})
         });
+		$(function() {
+			var editVal = '${projectcontentinfo.edit}';
+			if('edit'==editVal){
+				parent.parent.refreshTrees();
+			}
+
+			if($("#createDate").val()==null || $("#createDate").val()==''){
+				$("#createDate").val(getNowFormatDate());
+			}
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+			changeContentDetail("${projectContentDataType}");
+			var tp = "${projectcontentinfo.dictType}";
+			var tp2 = "${projectcontentinfo.projectContentData.id}"
+			if((tp!=null && tp!='')||(tp2!=null && tp2!='')){
+				$(document.getElementById("projectContentData.type")).attr("disabled","disabled");
+			}
+			initControlData("1");
+		});
+		function getNowFormatDate() {
+			var date = new Date();
+			var seperator1 = "-";
+			var month = date.getMonth() + 1;
+			var strDate = date.getDate();
+			month = (month < 10)?"0"+month:month;
+			strDate = (strDate < 10)?"0"+strDate:strDate;
+			var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate;
+			return currentdate;
+		}
+		/**
+		 * 删除临时数据
+		 */
+		function initControlData(obj,othis,del,tableId){
+			if(del == "del"){
+				proId = tableId;
+			}else{
+				proId = "";
+			}
+			$.ajax({
+				type:'post',
+				url:'${ctx}/projectcontroltable/projectControlTable/delControlData',
+				data:{
+					"projectId":"${projectcontentinfo.project.id}",
+					"projectContentId":proId,
+					"flag":del
+				},
+				success:function(data){
+					if(obj != "1"){
+						if(data.flag){
+							//$(othis).parent().parent().parent().remove();
+							parent.layer.msg("数据删除成功",{icon:1})
+							$(othis).remove()
+						}else{
+							parent.layer.msg("数据删除失败",{icon:2})
+						}
+					}
+				}
+			})
+		}
 		function accordingBtn(obj, prefix,userId){
 			//var id = $(prefix+"_id").val();
 			$(prefix+"_file").click();
@@ -245,7 +338,7 @@
 									$("#projectReportDataType").val(result.contentType.typeName)
 									$("#achievementParentIdHidden").val(result.contentType.typeId);
 									$("#projectReportDataTypeHidden").val(result.contentType.typeId);
-									achievementTypeFun();
+									//achievementTypeFun();
 								}else {
 									layer.msg("获取失败", {icon: 5});
 								}
@@ -416,7 +509,339 @@
                 }
             })
         }
+		function changeContentDetail(obj) {
+			contentDetailTypeShow(obj);
+			$("#contentDetailTypeDiv").show();
+			$("#projectContentDataSign").val(obj);
+			var param2 = {'contentId':"${projectcontentinfo.projectContentData.id}",'projectId':"${projectcontentinfo.project.id}",view:"view"};
+			detailFlag=1;
+			switch (obj){
+				case '13':
+				case '22':
+					$("#contentDetail").load("${ctx}/workPreliminary/workPreliminaryDesignEstimate/list",param2);
+					break;
+				case '25':
+					$("#contentDetail").load("${ctx}/workcontentinvestmentcost/workContentInvestmentCost/list",param2);
+					break;
+				case '31':
+					$("#contentDetail").load("${ctx}/workcontent/workContentContprogram/form",param2);
+					break;
+				case '32':
+					$("#contentDetail").load("${ctx}/workcontent/workContentBiddingplan/form",param2);
+					break;
+				case '34':
+				case '23':
+					$("#contentDetail").load("${ctx}/workcontent/workContentCtrlprice/form",param2);
+					break;
+				case '41':
+					$("#contentDetail").load("${ctx}/workcontent/workContentContractinfo/form",param2);
+					break;
+				case '42':
+					$("#contentDetail").load("${ctx}/workcontent/workContentPricemanage/form",param2);
+					break;
+				case '43':
+					$("#contentDetail").load("${ctx}/project/projectDesignChange/visaList",param2);
+					break;
+				case '45':
+					$("#contentDetail").load("${ctx}/project/projectVisa/visaList",param2);
+					break;
+				case '46':
+					$("#contentDetail").load("${ctx}/project/projectClaim/visaList",param2);
+					break;
+				case '47':
+					$("#contentDetail").load("${ctx}/workcontent/workContentFundplan/form",param2);
+					break;
+				case '48':
+					$("#contentDetail").load("${ctx}/workcontent/workContentProjectprice/form",param2);
+					break;
+				case '49':
+					$("#contentDetail").load("${ctx}/workcontent/workContentPriceadjust/form",param2);
+					break;
+				case '52':
+					$("#contentDetail").load("${ctx}/workcontent/workContentBudget/form",param2);
+					break;
+				case '53':
+					$("#contentDetail").load("${ctx}/workcontent/workContentDocument/form",param2);
+					break;
+					/*case '400':
+                        $("#contentDetail").load("${ctx}/workcontent/workContentContractSum/form",param2);
+                    break;*/
+				case '410':
+					$("#contentDetail").load("${ctx}/workConcealProject/workConcealProject/list",param2);
+					break;
+				case '411':
+					$("#contentDetail").load("${ctx}/fiveDirectionsAffirm/workFiveDirectionsAffirm/list",param2);
+					break;
+					/*新加代码*/
+				case '412':
+					$("#contentDetail").load("${ctx}/workcontentbranchaccount/workcontentBranchAccount/list",param2);
+					break;
+					/*新加代码*/
+				case '510':
+					$("#contentDetail").load("${ctx}/workContent/workContentCompleteAccount/list",param2);
+					break;
+				case '420':
+					$("#contentDetail").load("${ctx}/workSchedule/workSchedule/list",param2);
+					break;
+				case '421':
+					$("#contentDetail").load("${ctx}/workMaterialsPrice/workMaterialsPrice/list",param2);
+					break;
+				default:
+					detailFlag=0;
+					$("#contentDetail").html("");
+					break;
+			}
+		}
+		function getDetailsNum(){
+			var list = [];
+			//获取当前多选选中的值
+			var selectArr = contentDetailType.getValue();
+			for (var i in selectArr){
+				list.push(selectArr[i].value);
+			}
+			$("#contentDetail").val("");
+			console.log(list);
+			var val = $("#projectContentDataSign").val();
+			var param2 = {'contentId':"${projectcontentinfo.projectContentData.id}",'projectId':"${projectcontentinfo.project.id}",'sign':list.toString(),'achievementParentId':val};
+			detailFlag=1;
+			switch (val){
+				case '22':
+					$("#contentDetail").load("${ctx}/workPreliminary/workPreliminaryDesignEstimate/list",param2);
+					break;
+				case '13':
+				case '25':
+					$("#contentDetail").load("${ctx}/workcontentinvestmentcost/workContentInvestmentCost/list",param2);
+					break;
+				case '31':
+					$("#contentDetail").load("${ctx}/workcontent/workContentContprogram/form",param2);
+					break;
+				case '32':
+					$("#contentDetail").load("${ctx}/workcontent/workContentBiddingplan/form",param2);
+					break;
+				case '23':
+				case '34':
+					$("#contentDetail").load("${ctx}/workcontent/workContentCtrlprice/form",param2);
+					break;
+				case '41':
+					$("#contentDetail").load("${ctx}/workcontent/workContentContractinfo/form",param2);
+					break;
+				case '42':
+					$("#contentDetail").load("${ctx}/workcontent/workContentPricemanage/form",param2);
+					break;
+
+				case '43':
+					$("#contentDetail").load("${ctx}/project/projectDesignChange/visaList",param2);
+					break;
+				case '45':
+					$("#contentDetail").load("${ctx}/project/projectVisa/visaList",param2);
+					break;
+				case '46':
+					$("#contentDetail").load("${ctx}/project/projectClaim/visaList",param2);
+					break;
+				case '47':
+					$("#contentDetail").load("${ctx}/workcontent/workContentFundplan/form",param2);
+					break;
+				case '48':
+					$("#contentDetail").load("${ctx}/workcontent/workContentProjectprice/form",param2);
+					break;
+				case '49':
+					$("#contentDetail").load("${ctx}/workcontent/workContentPriceadjust/form",param2);
+					break;
+				case '52':
+					$("#contentDetail").load("${ctx}/workcontent/workContentBudget/form",param2);
+					break;
+				case '53':
+					$("#contentDetail").load("${ctx}/workcontent/workContentDocument/form",param2);
+					break;
+					/*case '400':
+                        $("#contentDetail").load("${ctx}/workcontent/workContentContractSum/form",param2);
+                break;*/
+				case '410':
+					$("#contentDetail").load("${ctx}/workConcealProject/workConcealProject/list",param2);
+					break;
+				case '411':
+					$("#contentDetail").load("${ctx}/fiveDirectionsAffirm/workFiveDirectionsAffirm/list",param2);
+					break;
+				case '412':
+					$("#contentDetail").load("${ctx}/workcontentbranchaccount/workContentBranchAccount/list",param2);
+					break;
+				case '510':
+					$("#contentDetail").load("${ctx}/workContent/workContentCompleteAccount/list",param2);
+					break;
+				case '420':
+					$("#contentDetail").load("${ctx}/workSchedule/workSchedule/list",param2);
+					break;
+				case '421':
+					$("#contentDetail").load("${ctx}/workMaterialsPrice/workMaterialsPrice/list",param2);
+					break;
+				default:
+					detailFlag=0;
+					$("#contentDetail").html("");
+					break;
+			}
 
+		}
+
+		function modifyGetDetailsNum(list){
+			console.log(list);
+			var val = $("#projectContentDataSign").val();
+			var param2 = {'contentId':"${projectcontentinfo.projectContentData.id}",'projectId':"${projectcontentinfo.project.id}",'sign':list.toString(),'achievementParentId':val,'view':'view'};
+			detailFlag=1;
+			switch (val){
+				case '22':
+					$("#contentDetail").load("${ctx}/workPreliminary/workPreliminaryDesignEstimate/list",param2);
+					break;
+				case '13':
+				case '25':
+					$("#contentDetail").load("${ctx}/workcontentinvestmentcost/workContentInvestmentCost/list",param2);
+					break;
+				case '31':
+					$("#contentDetail").load("${ctx}/workcontent/workContentContprogram/form",param2);
+					break;
+				case '32':
+					$("#contentDetail").load("${ctx}/workcontent/workContentBiddingplan/form",param2);
+					break;
+				case '23':
+				case '34':
+					$("#contentDetail").load("${ctx}/workcontent/workContentCtrlprice/form",param2);
+					break;
+				case '41':
+					$("#contentDetail").load("${ctx}/workcontent/workContentContractinfo/form",param2);
+					break;
+				case '42':
+					$("#contentDetail").load("${ctx}/workcontent/workContentPricemanage/form",param2);
+					break;
+
+				case '43':
+					$("#contentDetail").load("${ctx}/project/projectDesignChange/visaList",param2);
+					break;
+				case '45':
+					$("#contentDetail").load("${ctx}/project/projectVisa/visaList",param2);
+					break;
+				case '46':
+					$("#contentDetail").load("${ctx}/project/projectClaim/visaList",param2);
+					break;
+				case '47':
+					$("#contentDetail").load("${ctx}/workcontent/workContentFundplan/form",param2);
+					break;
+				case '48':
+					$("#contentDetail").load("${ctx}/workcontent/workContentProjectprice/form",param2);
+					break;
+				case '49':
+					$("#contentDetail").load("${ctx}/workcontent/workContentPriceadjust/form",param2);
+					break;
+				case '52':
+					$("#contentDetail").load("${ctx}/workcontent/workContentBudget/form",param2);
+					break;
+				case '53':
+					$("#contentDetail").load("${ctx}/workcontent/workContentDocument/form",param2);
+					break;
+					/*case '400':
+                        $("#contentDetail").load("${ctx}/workcontent/workContentContractSum/form",param2);
+                break;*/
+				case '410':
+					$("#contentDetail").load("${ctx}/workConcealProject/workConcealProject/list",param2);
+					break;
+				case '411':
+					$("#contentDetail").load("${ctx}/fiveDirectionsAffirm/workFiveDirectionsAffirm/list",param2);
+					break;
+				case '412':
+					$("#contentDetail").load("${ctx}/workcontentbranchaccount/workcontentBranchAccount/list",param2);
+					break;
+				case '510':
+					$("#contentDetail").load("${ctx}/workContent/workContentCompleteAccount/list",param2);
+					break;
+				case '420':
+					$("#contentDetail").load("${ctx}/workSchedule/workSchedule/list",param2);
+					break;
+				case '421':
+					$("#contentDetail").load("${ctx}/workMaterialsPrice/workMaterialsPrice/list",param2);
+					break;
+				default:
+					detailFlag=0;
+					$("#contentDetail").html("");
+					break;
+			}
+
+		}
+		function contentDetailTypeShow(obj) {
+			var projectContentDataId = '${projectcontentinfo.projectContentData.id}';
+			$.ajax({
+				type:'post',
+				url:'${ctx}/projectcontentinfo/projectcontentinfo/getAchievementTypeList2',
+				data:{
+					"achievementParentId":obj,
+					"type":2
+				},
+				success:function(data){
+					if(data.success) {
+						if (null != obj && "" != obj) {
+							if(null !=projectContentDataId && ""!= projectContentDataId) {
+								$.ajax({
+									type: 'post',
+									url: getExistingDataOnPath(obj),
+									data: {
+										"contentId": "${projectcontentinfo.projectContentData.id}"
+									},
+									success: function (tableTypeList) {
+										var dataList = data.body.list;
+										var newDataList = [];
+										var holdDataList = data.body.list;
+										if (0 != dataList.length) {
+											for (i in holdDataList) {
+												newDataList.push(holdDataList[i])
+											}
+										}
+										if (0 != newDataList.length && 0 !=tableTypeList.length){
+											for (i in newDataList) {
+												for (j in tableTypeList) {
+													if (newDataList[i].value == tableTypeList[j]) {
+														var newData = {
+															"name": newDataList[i].name,
+															"value": newDataList[i].value,
+															"selected": true
+														}
+														holdDataList.splice(i,1,newData);
+													}
+												}
+											}
+											xmSelect.render({
+												el: '#contentDetailType',
+												language: 'zn',
+												data: holdDataList
+											})
+											modifyGetDetailsNum(tableTypeList);
+											$("#dataBodyList").val(holdDataList);
+										}else{
+											xmSelect.render({
+												el: '#contentDetailType',
+												language: 'zn',
+												data: dataList
+											})
+											$("#dataBodyList").val(holdDataList);
+										}
+									}
+								})
+							}else{
+								xmSelect.render({
+									el: '#contentDetailType',
+									language: 'zn',
+									data: data.body.list
+								})
+								$("#dataBodyList").val(data.body.list);
+							}
+						}else {
+							xmSelect.render({
+								el: '#contentDetailType',
+								language: 'zn',
+								data: data.body.list
+							})
+							$("#dataBodyList").val(data.body.list);
+						}
+					}
+				}
+			})
+		}
 	</script>
 
 </head>
@@ -544,7 +969,13 @@
 				</div>
 			</div>
 		</div>
-			<div class="form-group layui-row first lw12">
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>内容详情</h2></div>
+				<div style="padding: 0 15px;">
+					<div id="contentDetail"></div>
+				</div>
+			</div>
+			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>项目信息</h2></div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">送审价(元)：</label>
@@ -594,7 +1025,7 @@
 							<form:input id="installFee" path="projectReportData.installFee" htmlEscape="false"  class="form-control layui-input number"/>
 						</div>
 					</div>
-				</div>
+				</div>--%>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>依据性资料明细</h2></div>
 				<%--<div class="layui-item nav-btns">
@@ -1159,7 +1590,7 @@
 </div>
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script>
-    layui.use(['form', 'layedit', 'laydate'], function(){
+    layui.use(['form', 'layedit', 'laydate','layer', 'jquery'], function(){
         var form = layui.form
             ,layer = layui.layer
             ,layedit = layui.layedit

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

@@ -590,12 +590,12 @@
                                value="<fmt:formatDate value="${projectcontentinfo.projectReportData.reportDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6">
+                <%--<div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">签章类型：</label>
                     <div class="layui-input-block">
                         <input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${projectcontentinfo.projectReportData.reportType}"/>
                     </div>
-                </div>
+                </div>--%>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">归档状态：</label>
                     <div class="layui-input-block">
@@ -1479,4 +1479,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/sys/gridinvoiceproject.jsp

@@ -61,6 +61,10 @@
 					$('#moresee i').removeClass("glyphicon glyphicon-menu-down").addClass("glyphicon glyphicon-menu-up");
 				}
 			});
+
+			$("#contentTable tr td").each(function(){
+				$(this).attr("title",$(this).text());
+			});
 		});
 
 		function getSelectedItem(){
@@ -177,12 +181,12 @@
 							<th width="50px"></th>
 							<c:forEach items="${labelNames}" var="projectName"  varStatus="status">
 								<th>项目名称</th>
-								<th>项目编号</th>
-								<th>项目报告号</th>
-								<th>登记人</th>
-								<th>责任人</th>
-								<th>委托方</th>
-								<th>是否开票</th>
+								<th width="180px">项目编号</th>
+								<th width="180px">项目报告号</th>
+								<th width="80px">登记人</th>
+								<th width="80px">责任人</th>
+								<th width="250px">委托方</th>
+								<th width="80px">是否开票</th>
 							</c:forEach>
 						</tr>
 					</thead>

src/main/webapp/webpage/modules/workcontent/workContentCompleteAccountListView.jsp

@@ -143,6 +143,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function completeSubmit() {
@@ -152,6 +155,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function completeExamine() {
@@ -161,6 +167,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function completeAdd() {
@@ -170,6 +179,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function completeReduce() {
@@ -179,6 +191,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     if(document.readyState=="complete"){
@@ -198,4 +213,4 @@
         document.getElementById('completeAdd').innerHTML=completeAdd;
         document.getElementById('completeReduce').innerHTML=completeReduce;
     }
-</script>
+</script>

src/main/webapp/webpage/modules/workcontent/workContentCtrlpriceListView.jsp

@@ -3,7 +3,7 @@
 
 <div class="form-group layui-row lw12">
     <div class="layui-item layui-col-sm12">
-        <label class="layui-form-label"><span class="require-item">*</span>清单类型:</label>
+        <label class="layui-form-label">清单类型:</label>
         <div class="layui-input-block">
             <input htmlEscape="false" readonly="true" class="form-control layui-input"
                    <c:if test="${ctrlpricelist[0].inventoryType == '01'}">value="工程量清单"</c:if>
@@ -192,4 +192,4 @@
         document.getElementById('highestBidAdjust').innerHTML=highestBidAdjust;
 
     }
-</script>
+</script>

src/main/webapp/webpage/modules/workcontent/workContentInvestmentCostListView.jsp

@@ -201,6 +201,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function examineBeforeCost() {
@@ -210,6 +213,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function examineAfterArchitectureCost() {
@@ -219,6 +225,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function examineAfterInstallCost() {
@@ -228,6 +237,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function examineAfterRestsCost() {
@@ -237,6 +249,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function examineCount() {
@@ -246,6 +261,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function examineAdjustUnit() {
@@ -255,6 +273,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function amount() {
@@ -264,6 +285,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function money() {
@@ -273,6 +297,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     if(document.readyState=="complete"){
@@ -304,4 +331,4 @@
         document.getElementById('amount').innerHTML=amount;
         document.getElementById('money').innerHTML=money;
     }
-</script>
+</script>

src/main/webapp/webpage/modules/workcontent/workMaterialsPriceList.jsp

@@ -12,7 +12,12 @@
             beforeTotalPaymentMoney=0;
         }
         var total=(parseFloat(beforeTotalPaymentMoney) / parseFloat(beforeCumulativeCompletionMoney)).toFixed(2);
-        $("#workScheduleList"+index+"_beforePayRatio").val(total);
+        if(!isNaN(total)){
+            $("#workScheduleList"+index+"_beforePayRatio").val(total);
+        }else{
+            $("#workScheduleList"+index+"_beforePayRatio").val();
+        }
+
 
         if(!isNumber(val))return;
     }
@@ -198,4 +203,4 @@
             return '';
         }
     </script>
-</form>
+</form>

src/main/webapp/webpage/modules/workcontent/workPreliminaryDesignEstimateListView.jsp

@@ -189,6 +189,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function jiananAfterArchitectureCost() {
@@ -198,6 +201,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function jiananAfterInstallCost() {
@@ -207,6 +213,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function jiananAfterOtherCost() {
@@ -216,6 +225,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function jiananAfterTotalCost() {
@@ -225,6 +237,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
 
@@ -235,6 +250,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function otherAfterArchitectureCost() {
@@ -244,6 +262,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function otherAfterClearCost() {
@@ -253,6 +274,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function otherAfterOtherCost() {
@@ -262,6 +286,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     function otherAfterTotalCost() {
@@ -271,6 +298,9 @@
                 totalSum += parseFloat($(this).text());
             });
         });
+        if(isNaN(totalSum)){
+            totalSum = "";
+        }
         return totalSum;
     }
     if(document.readyState=="complete"){
@@ -310,4 +340,4 @@
         document.getElementById('otherAfterOtherCost').innerHTML=otherAfterOtherCost;
         document.getElementById('otherAfterTotalCost').innerHTML=otherAfterTotalCost;
     }
-</script>
+</script>

src/main/webapp/webpage/modules/workcontent/workScheduleList.jsp

@@ -12,7 +12,11 @@
             beforeTotalPaymentMoney=0;
         }
         var total=(parseFloat(beforeTotalPaymentMoney) / parseFloat(beforeCumulativeCompletionMoney)).toFixed(2);
-        $("#workScheduleList"+index+"_beforePayRatio").val(total);
+        if(!isNaN(total)){
+            $("#workScheduleList"+index+"_beforePayRatio").val(total);
+        }else{
+            $("#workScheduleList"+index+"_beforePayRatio").val();
+        }
 
         if(!isNumber(val))return;
     }