发票报销功能项目多选修改

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceTwoController.java

@@ -1002,6 +1002,8 @@ public class WorkInvoiceTwoController extends BaseController {
 		HashMap<Object, Object> map = Maps.newHashMap();
 		String obj = request.getParameter("obj");
 		ProjectRecords projectRecords = projectRecordsService.getRuralInfo(obj);
+		map.put("projectName",projectRecords.getProjectName());//项目名称
+		map.put("id",projectRecords.getId());//项目id
 		map.put("areaId",projectRecords.getArea().getId());//项目地区id
 		map.put("areaName",projectRecords.getArea().getName());//项目地区名称
 		map.put("projectNum",projectRecords.getProjectId());//项目编号

src/main/webapp/WEB-INF/tags/sys/gridselectcallprojecttss.tag

@@ -41,15 +41,17 @@ function searchGrid${id}(){
 	    	 var details=item.split('_item_')[4];
 	    	 var projectFlag=item.split('_item_')[5];
 	    	 if (isProject==1){
-				 $("#${id}Id").val(item.split('_item_')[0]);
+				 var idArray= new Array(); //定义一数组
+				 idArray=item.split('_item_')[0].split(","); //字符分割
+				 $("#${id}Id").val(idArray[0]);
 				 $("#${id}Name").val(item.split('_item_')[1]);
 			 }else{
 				 $("#${id}Id").val("");
 			 }
 	    	 $("#projectFlag").val(projectFlag);
-	    	 console.log(projectFlag);
+	    	 console.log(item.split('_item_')[0]);
 			 top.layer.close(index);//关闭对话框。
-			setPNumber(item.split('_item_')[0],'${id}',isProject,details);
+			newSetPNumber(item.split('_item_')[0],'${id}',isProject,details);
 		  },
 		  cancel: function(index){
 	       }

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

@@ -68,17 +68,23 @@
 		});
 
 		function getSelectedItem(){
+			var array = new Array();
 			var isProject=$('input:radio[name="isProject"]:checked').val();
 			if (isProject==1){
 				var size = $("#contentTable tbody tr td input.i-checks:checked").size();
+				var sizeChecked = $("#contentTable tbody tr td input.i-checks:checked");
+
+				for (var i=0;i<size;i++){
+					array.push(sizeChecked[i].id);
+				}
 				if(size == 0 ){
 					top.layer.alert('请至少选择一条数据!', {icon: 0, title:'警告'});
 					return "-1";
 				}
-				if(size > 1 ){
-					top.layer.alert('只能选择一条数据!', {icon: 0, title:'警告'});
-					return "-1";
-				}
+				/*if(size > 1 ){
+                    top.layer.alert('只能选择一条数据!', {icon: 0, title:'警告'});
+                    return "-1";
+                }*/
 				$("#projectFlag").val(1);
 			}else{
 				$("#projectFlag").val(0);
@@ -88,7 +94,8 @@
 			var number = $("#contentTable tbody tr td input.i-checks:checkbox:checked").parent().parent().parent().find(".codenumber").html();
 			var details = $("#details").val();
 			var projectFlag = $("#projectFlag").val();
-			return id+"_item_"+label+"_item_"+number+"_item_"+isProject+"_item_"+details+"_item_"+projectFlag;
+			console.log(array.toString())
+			return array.toString()+"_item_"+label+"_item_"+number+"_item_"+isProject+"_item_"+details+"_item_"+projectFlag;
 		}
 		function page(n,s){
 			if(n) $("#pageNo").val(n);

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllForm.jsp

@@ -255,6 +255,93 @@
 
 		}
 
+		function newSetPNumber(obj,ids,isProject,details){
+			var idx=ids.split("_")[0]
+			var idArray= new Array(); //定义一数组
+			idArray=obj.split(","); //字符分割
+
+			if (isProject==1){
+				for (var k=0;k<idArray.length ;k++ )
+				{
+					$.ajax({
+						async:false,
+						type:'post',
+						url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getPNumber',
+						data:{
+							"obj":idArray[k]
+						},
+						success:function(data){
+							if(k>=1){
+								var row = workInvoiceProjectRelationListRowIdx;
+								addRow1('#workInvoiceProjectRelationList', workInvoiceProjectRelationListRowIdx, workInvoiceProjectRelationListTpl, data[k])
+								workInvoiceProjectRelationListRowIdx = workInvoiceProjectRelationListRowIdx + 1;
+								var d = JSON.parse(data);
+								var workContractName="#workInvoiceProjectRelationList"+row+"_workContractName";
+								var projectNum="#workInvoiceProjectRelationList"+row+"_projectNum";
+								var clientName="#workInvoiceProjectRelationList"+row+"_clientName";
+								var reportDataNum="#workInvoiceProjectRelationList"+row+"_reportDataNum";
+								var projectName="#workInvoiceProjectRelationList"+row+"_projectIdName";
+								var id="#workInvoiceProjectRelationList"+row+"_projectIdId";
+								$(id).val(d.id);
+								$(projectName).val(d.projectName);
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}else{
+								var d = JSON.parse(data);
+								var workContractName="#"+idx+"_workContractName";
+								var projectNum="#"+idx+"_projectNum";
+								var clientName="#"+idx+"_clientName";
+								var reportDataNum="#"+idx+"_reportDataNum";
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}
+						}
+					})
+				}
+			}else if (isProject==2){
+				var projectFlag = $("#projectFlag").val();
+				var workContractName="#"+idx+"_projectIdName";
+				var workContractNameStr="#"+idx+"_workContractName";
+				var contractId="#"+idx+"_contractId";
+				var detailsName="#"+idx+"_details";
+				$(workContractName).val(details);
+				$(detailsName).val(details);
+
+				var projectNum="#"+idx+"_projectNum";
+				var clientName="#"+idx+"_clientName";
+				var reportDataNum="#"+idx+"_reportDataNum";
+				$(projectNum).val("");
+				$(contractId).val("");
+				$(workContractNameStr).val("");
+				$(clientName).val("");
+				$(reportDataNum).val("");
+				var length=$("#workInvoiceProjectRelationList tr").length;
+				if(length>1){
+					var id=$("#workInvoiceProjectRelationList").find("tr").eq(0).find("input").eq(3).val();
+					if (id==undefined || id == ''){
+						parent.layer.msg("非项目,只能有一条非项目数据,请删除其余项目数据",{icon:6});
+						return false;
+					}
+				}
+
+			}
+
+		}
+
 
 		function setContractValue(obj,ids){
 			var idx=ids.split("_")[0]

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllModify.jsp

@@ -248,6 +248,93 @@
 			}
 		}
 
+		function newSetPNumber(obj,ids,isProject,details){
+			var idx=ids.split("_")[0]
+			var idArray= new Array(); //定义一数组
+			idArray=obj.split(","); //字符分割
+
+			if (isProject==1){
+				for (var k=0;k<idArray.length ;k++ )
+				{
+					$.ajax({
+						async:false,
+						type:'post',
+						url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getPNumber',
+						data:{
+							"obj":idArray[k]
+						},
+						success:function(data){
+							if(k>=1){
+								var row = workInvoiceProjectRelationListRowIdx;
+								addRow1('#workInvoiceProjectRelationList', workInvoiceProjectRelationListRowIdx, workInvoiceProjectRelationListTpl, data[k])
+								workInvoiceProjectRelationListRowIdx = workInvoiceProjectRelationListRowIdx + 1;
+								var d = JSON.parse(data);
+								var workContractName="#workInvoiceProjectRelationList"+row+"_workContractName";
+								var projectNum="#workInvoiceProjectRelationList"+row+"_projectNum";
+								var clientName="#workInvoiceProjectRelationList"+row+"_clientName";
+								var reportDataNum="#workInvoiceProjectRelationList"+row+"_reportDataNum";
+								var projectName="#workInvoiceProjectRelationList"+row+"_projectIdName";
+								var id="#workInvoiceProjectRelationList"+row+"_projectIdId";
+								$(id).val(d.id);
+								$(projectName).val(d.projectName);
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}else{
+								var d = JSON.parse(data);
+								var workContractName="#"+idx+"_workContractName";
+								var projectNum="#"+idx+"_projectNum";
+								var clientName="#"+idx+"_clientName";
+								var reportDataNum="#"+idx+"_reportDataNum";
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}
+						}
+					})
+				}
+			}else if (isProject==2){
+				var projectFlag = $("#projectFlag").val();
+				var workContractName="#"+idx+"_projectIdName";
+				var workContractNameStr="#"+idx+"_workContractName";
+				var contractId="#"+idx+"_contractId";
+				var detailsName="#"+idx+"_details";
+				$(workContractName).val(details);
+				$(detailsName).val(details);
+
+				var projectNum="#"+idx+"_projectNum";
+				var clientName="#"+idx+"_clientName";
+				var reportDataNum="#"+idx+"_reportDataNum";
+				$(projectNum).val("");
+				$(contractId).val("");
+				$(workContractNameStr).val("");
+				$(clientName).val("");
+				$(reportDataNum).val("");
+				var length=$("#workInvoiceProjectRelationList tr").length;
+				if(length>1){
+					var id=$("#workInvoiceProjectRelationList").find("tr").eq(0).find("input").eq(3).val();
+					if (id==undefined || id == ''){
+						parent.layer.msg("非项目,只能有一条非项目数据,请删除其余项目数据",{icon:6});
+						return false;
+					}
+				}
+
+			}
+
+		}
+
 		function setContractValue(obj,ids){
 			var idx=ids.split("_")[0]
 			var clientId = $("#contractClientId").val();

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoForm.jsp

@@ -250,6 +250,93 @@
 
 		}
 
+		function newSetPNumber(obj,ids,isProject,details){
+			var idx=ids.split("_")[0]
+			var idArray= new Array(); //定义一数组
+			idArray=obj.split(","); //字符分割
+
+			if (isProject==1){
+				for (var k=0;k<idArray.length ;k++ )
+				{
+					$.ajax({
+						async:false,
+						type:'post',
+						url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getPNumber',
+						data:{
+							"obj":idArray[k]
+						},
+						success:function(data){
+							if(k>=1){
+								var row = workInvoiceProjectRelationListRowIdx;
+								addRow1('#workInvoiceProjectRelationList', workInvoiceProjectRelationListRowIdx, workInvoiceProjectRelationListTpl, data[k])
+								workInvoiceProjectRelationListRowIdx = workInvoiceProjectRelationListRowIdx + 1;
+								var d = JSON.parse(data);
+								var workContractName="#workInvoiceProjectRelationList"+row+"_workContractName";
+								var projectNum="#workInvoiceProjectRelationList"+row+"_projectNum";
+								var clientName="#workInvoiceProjectRelationList"+row+"_clientName";
+								var reportDataNum="#workInvoiceProjectRelationList"+row+"_reportDataNum";
+								var projectName="#workInvoiceProjectRelationList"+row+"_projectIdName";
+								var id="#workInvoiceProjectRelationList"+row+"_projectIdId";
+								$(id).val(d.id);
+								$(projectName).val(d.projectName);
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}else{
+								var d = JSON.parse(data);
+								var workContractName="#"+idx+"_workContractName";
+								var projectNum="#"+idx+"_projectNum";
+								var clientName="#"+idx+"_clientName";
+								var reportDataNum="#"+idx+"_reportDataNum";
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}
+						}
+					})
+				}
+			}else if (isProject==2){
+				var projectFlag = $("#projectFlag").val();
+				var workContractName="#"+idx+"_projectIdName";
+				var workContractNameStr="#"+idx+"_workContractName";
+				var contractId="#"+idx+"_contractId";
+				var detailsName="#"+idx+"_details";
+				$(workContractName).val(details);
+				$(detailsName).val(details);
+
+				var projectNum="#"+idx+"_projectNum";
+				var clientName="#"+idx+"_clientName";
+				var reportDataNum="#"+idx+"_reportDataNum";
+				$(projectNum).val("");
+				$(contractId).val("");
+				$(workContractNameStr).val("");
+				$(clientName).val("");
+				$(reportDataNum).val("");
+				var length=$("#workInvoiceProjectRelationList tr").length;
+				if(length>1){
+					var id=$("#workInvoiceProjectRelationList").find("tr").eq(0).find("input").eq(3).val();
+					if (id==undefined || id == ''){
+						parent.layer.msg("非项目,只能有一条非项目数据,请删除其余项目数据",{icon:6});
+						return false;
+					}
+				}
+
+			}
+
+		}
+
 		function addRow(list, idx, tpl, row){
 			var idx1 = $("#workAccountList tr").length;
 			if(list == '#workAccountList' && idx1 < 100){

src/main/webapp/webpage/modules/workinvoice/workInvoiceForm.jsp

@@ -244,6 +244,92 @@
 			}
 
 		}
+		function newSetPNumber(obj,ids,isProject,details){
+			var idx=ids.split("_")[0]
+			var idArray= new Array(); //定义一数组
+			idArray=obj.split(","); //字符分割
+
+			if (isProject==1){
+				for (var k=0;k<idArray.length ;k++ )
+				{
+					$.ajax({
+						async:false,
+						type:'post',
+						url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getPNumber',
+						data:{
+							"obj":idArray[k]
+						},
+						success:function(data){
+							if(k>=1){
+								var row = workInvoiceProjectRelationListRowIdx;
+								addRow1('#workInvoiceProjectRelationList', workInvoiceProjectRelationListRowIdx, workInvoiceProjectRelationListTpl, data[k])
+								workInvoiceProjectRelationListRowIdx = workInvoiceProjectRelationListRowIdx + 1;
+								var d = JSON.parse(data);
+								var workContractName="#workInvoiceProjectRelationList"+row+"_workContractName";
+								var projectNum="#workInvoiceProjectRelationList"+row+"_projectNum";
+								var clientName="#workInvoiceProjectRelationList"+row+"_clientName";
+								var reportDataNum="#workInvoiceProjectRelationList"+row+"_reportDataNum";
+								var projectName="#workInvoiceProjectRelationList"+row+"_projectIdName";
+								var id="#workInvoiceProjectRelationList"+row+"_projectIdId";
+								$(id).val(d.id);
+								$(projectName).val(d.projectName);
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}else{
+								var d = JSON.parse(data);
+								var workContractName="#"+idx+"_workContractName";
+								var projectNum="#"+idx+"_projectNum";
+								var clientName="#"+idx+"_clientName";
+								var reportDataNum="#"+idx+"_reportDataNum";
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}
+						}
+					})
+				}
+			}else if (isProject==2){
+				var projectFlag = $("#projectFlag").val();
+				var workContractName="#"+idx+"_projectIdName";
+				var workContractNameStr="#"+idx+"_workContractName";
+				var contractId="#"+idx+"_contractId";
+				var detailsName="#"+idx+"_details";
+				$(workContractName).val(details);
+				$(detailsName).val(details);
+
+				var projectNum="#"+idx+"_projectNum";
+				var clientName="#"+idx+"_clientName";
+				var reportDataNum="#"+idx+"_reportDataNum";
+				$(projectNum).val("");
+				$(contractId).val("");
+				$(workContractNameStr).val("");
+				$(clientName).val("");
+				$(reportDataNum).val("");
+				var length=$("#workInvoiceProjectRelationList tr").length;
+				if(length>1){
+					var id=$("#workInvoiceProjectRelationList").find("tr").eq(0).find("input").eq(3).val();
+					if (id==undefined || id == ''){
+						parent.layer.msg("非项目,只能有一条非项目数据,请删除其余项目数据",{icon:6});
+						return false;
+					}
+				}
+
+			}
+
+		}
 
 
 		function addRow(list, idx, tpl, row){

src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -249,6 +249,93 @@
 			}
 		}
 
+		function newSetPNumber(obj,ids,isProject,details){
+			var idx=ids.split("_")[0]
+			var idArray= new Array(); //定义一数组
+			idArray=obj.split(","); //字符分割
+
+			if (isProject==1){
+				for (var k=0;k<idArray.length ;k++ )
+				{
+					$.ajax({
+						async:false,
+						type:'post',
+						url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getPNumber',
+						data:{
+							"obj":idArray[k]
+						},
+						success:function(data){
+							if(k>=1){
+								var row = workInvoiceProjectRelationListRowIdx;
+								addRow1('#workInvoiceProjectRelationList', workInvoiceProjectRelationListRowIdx, workInvoiceProjectRelationListTpl, data[k])
+								workInvoiceProjectRelationListRowIdx = workInvoiceProjectRelationListRowIdx + 1;
+								var d = JSON.parse(data);
+								var workContractName="#workInvoiceProjectRelationList"+row+"_workContractName";
+								var projectNum="#workInvoiceProjectRelationList"+row+"_projectNum";
+								var clientName="#workInvoiceProjectRelationList"+row+"_clientName";
+								var reportDataNum="#workInvoiceProjectRelationList"+row+"_reportDataNum";
+								var projectName="#workInvoiceProjectRelationList"+row+"_projectIdName";
+								var id="#workInvoiceProjectRelationList"+row+"_projectIdId";
+								$(id).val(d.id);
+								$(projectName).val(d.projectName);
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}else{
+								var d = JSON.parse(data);
+								var workContractName="#"+idx+"_workContractName";
+								var projectNum="#"+idx+"_projectNum";
+								var clientName="#"+idx+"_clientName";
+								var reportDataNum="#"+idx+"_reportDataNum";
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}
+						}
+					})
+				}
+			}else if (isProject==2){
+				var projectFlag = $("#projectFlag").val();
+				var workContractName="#"+idx+"_projectIdName";
+				var workContractNameStr="#"+idx+"_workContractName";
+				var contractId="#"+idx+"_contractId";
+				var detailsName="#"+idx+"_details";
+				$(workContractName).val(details);
+				$(detailsName).val(details);
+
+				var projectNum="#"+idx+"_projectNum";
+				var clientName="#"+idx+"_clientName";
+				var reportDataNum="#"+idx+"_reportDataNum";
+				$(projectNum).val("");
+				$(contractId).val("");
+				$(workContractNameStr).val("");
+				$(clientName).val("");
+				$(reportDataNum).val("");
+				var length=$("#workInvoiceProjectRelationList tr").length;
+				if(length>1){
+					var id=$("#workInvoiceProjectRelationList").find("tr").eq(0).find("input").eq(3).val();
+					if (id==undefined || id == ''){
+						parent.layer.msg("非项目,只能有一条非项目数据,请删除其余项目数据",{icon:6});
+						return false;
+					}
+				}
+
+			}
+
+		}
+
 		function setContractValue(obj,ids){
 			var idx=ids.split("_")[0]
 			var clientId = $("#contractClientId").val();

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoForm.jsp

@@ -255,6 +255,93 @@
 
         }
 
+		function newSetPNumber(obj,ids,isProject,details){
+			var idx=ids.split("_")[0]
+			var idArray= new Array(); //定义一数组
+			idArray=obj.split(","); //字符分割
+
+			if (isProject==1){
+				for (var k=0;k<idArray.length ;k++ )
+				{
+					$.ajax({
+						async:false,
+						type:'post',
+						url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getPNumber',
+						data:{
+							"obj":idArray[k]
+						},
+						success:function(data){
+							if(k>=1){
+								var row = workInvoiceProjectRelationListRowIdx;
+								addRow1('#workInvoiceProjectRelationList', workInvoiceProjectRelationListRowIdx, workInvoiceProjectRelationListTpl, data[k])
+								workInvoiceProjectRelationListRowIdx = workInvoiceProjectRelationListRowIdx + 1;
+								var d = JSON.parse(data);
+								var workContractName="#workInvoiceProjectRelationList"+row+"_workContractName";
+								var projectNum="#workInvoiceProjectRelationList"+row+"_projectNum";
+								var clientName="#workInvoiceProjectRelationList"+row+"_clientName";
+								var reportDataNum="#workInvoiceProjectRelationList"+row+"_reportDataNum";
+								var projectName="#workInvoiceProjectRelationList"+row+"_projectIdName";
+								var id="#workInvoiceProjectRelationList"+row+"_projectIdId";
+								$(id).val(d.id);
+								$(projectName).val(d.projectName);
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}else{
+								var d = JSON.parse(data);
+								var workContractName="#"+idx+"_workContractName";
+								var projectNum="#"+idx+"_projectNum";
+								var clientName="#"+idx+"_clientName";
+								var reportDataNum="#"+idx+"_reportDataNum";
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}
+						}
+					})
+				}
+			}else if (isProject==2){
+				var projectFlag = $("#projectFlag").val();
+				var workContractName="#"+idx+"_projectIdName";
+				var workContractNameStr="#"+idx+"_workContractName";
+				var contractId="#"+idx+"_contractId";
+				var detailsName="#"+idx+"_details";
+				$(workContractName).val(details);
+				$(detailsName).val(details);
+
+				var projectNum="#"+idx+"_projectNum";
+				var clientName="#"+idx+"_clientName";
+				var reportDataNum="#"+idx+"_reportDataNum";
+				$(projectNum).val("");
+				$(contractId).val("");
+				$(workContractNameStr).val("");
+				$(clientName).val("");
+				$(reportDataNum).val("");
+				var length=$("#workInvoiceProjectRelationList tr").length;
+				if(length>1){
+					var id=$("#workInvoiceProjectRelationList").find("tr").eq(0).find("input").eq(3).val();
+					if (id==undefined || id == ''){
+						parent.layer.msg("非项目,只能有一条非项目数据,请删除其余项目数据",{icon:6});
+						return false;
+					}
+				}
+
+			}
+
+		}
+
 		function setContractValue(obj,ids){
 			var idx=ids.split("_")[0]
 			var clientId = $("#contractClientId").val();

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoModify.jsp

@@ -248,6 +248,93 @@
 			}
 		}
 
+		function newSetPNumber(obj,ids,isProject,details){
+			var idx=ids.split("_")[0]
+			var idArray= new Array(); //定义一数组
+			idArray=obj.split(","); //字符分割
+
+			if (isProject==1){
+				for (var k=0;k<idArray.length ;k++ )
+				{
+					$.ajax({
+						async:false,
+						type:'post',
+						url:'${ctx}/workinvoiceTwo/workinvoiceTwo/getPNumber',
+						data:{
+							"obj":idArray[k]
+						},
+						success:function(data){
+							if(k>=1){
+								var row = workInvoiceProjectRelationListRowIdx;
+								addRow1('#workInvoiceProjectRelationList', workInvoiceProjectRelationListRowIdx, workInvoiceProjectRelationListTpl, data[k])
+								workInvoiceProjectRelationListRowIdx = workInvoiceProjectRelationListRowIdx + 1;
+								var d = JSON.parse(data);
+								var workContractName="#workInvoiceProjectRelationList"+row+"_workContractName";
+								var projectNum="#workInvoiceProjectRelationList"+row+"_projectNum";
+								var clientName="#workInvoiceProjectRelationList"+row+"_clientName";
+								var reportDataNum="#workInvoiceProjectRelationList"+row+"_reportDataNum";
+								var projectName="#workInvoiceProjectRelationList"+row+"_projectIdName";
+								var id="#workInvoiceProjectRelationList"+row+"_projectIdId";
+								$(id).val(d.id);
+								$(projectName).val(d.projectName);
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}else{
+								var d = JSON.parse(data);
+								var workContractName="#"+idx+"_workContractName";
+								var projectNum="#"+idx+"_projectNum";
+								var clientName="#"+idx+"_clientName";
+								var reportDataNum="#"+idx+"_reportDataNum";
+								$(workContractName).val(d.workContractName);
+								$(projectNum).val(d.projectNum);
+								$(clientName).val(d.clientName);
+								$(reportDataNum).val(d.reportDataNum);
+								var areaId = $("#areaId").val();
+								if(undefined ==areaId || null == areaId || '' == areaId){
+									$("#areaId").val(d.areaId);
+									$("#areaName").val(d.areaName);
+								}
+							}
+						}
+					})
+				}
+			}else if (isProject==2){
+				var projectFlag = $("#projectFlag").val();
+				var workContractName="#"+idx+"_projectIdName";
+				var workContractNameStr="#"+idx+"_workContractName";
+				var contractId="#"+idx+"_contractId";
+				var detailsName="#"+idx+"_details";
+				$(workContractName).val(details);
+				$(detailsName).val(details);
+
+				var projectNum="#"+idx+"_projectNum";
+				var clientName="#"+idx+"_clientName";
+				var reportDataNum="#"+idx+"_reportDataNum";
+				$(projectNum).val("");
+				$(contractId).val("");
+				$(workContractNameStr).val("");
+				$(clientName).val("");
+				$(reportDataNum).val("");
+				var length=$("#workInvoiceProjectRelationList tr").length;
+				if(length>1){
+					var id=$("#workInvoiceProjectRelationList").find("tr").eq(0).find("input").eq(3).val();
+					if (id==undefined || id == ''){
+						parent.layer.msg("非项目,只能有一条非项目数据,请删除其余项目数据",{icon:6});
+						return false;
+					}
+				}
+
+			}
+
+		}
+
 		function setContractValue(obj,ids){
 			var idx=ids.split("_")[0]
 			var clientId = $("#contractClientId").val();