2 Komitmen 4d9f687eb5 ... d03fb927ef

Pembuat SHA1 Pesan Tanggal
  user7 d03fb927ef Merge remote-tracking branch 'origin/master' 4 tahun lalu
  user7 251047c35e 生成报告号 4 tahun lalu

+ 1 - 1
src/main/webapp/webpage/modules/projectreportnum/projectReportNumList.jsp

@@ -125,7 +125,7 @@
 		function complain(d){//操作中显示的内容
 			if(0 == d.pid){
 				return [
-					"<a href=\"javascript:void(0)\" onclick=\"reportNumOnStage('阶段报告号新增','${ctx}/projectreportnum/projectReportNum/getProjectReportNumStageForm?num="+d.num+"&reportType=${reportType}&parentId="+d.id+"','70%', '50%');\" class=\"op-btn op-btn-edit\"><i class=\"fa fa-edit\"></i> 添加阶段报告号</a>"
+					"<a href=\"javascript:void(0)\" onclick=\"reportNumOnStage('阶段报告号新增','${ctx}/projectreportnum/projectReportNum/getProjectReportNumStageForm?num="+d.num+"&reportType=${reportType}&projectId=${projectId}&parentId="+d.id+"','70%', '50%');\" class=\"op-btn op-btn-edit\"><i class=\"fa fa-edit\"></i> 添加阶段报告号</a>"
 				].join('');
 			}else{
 				if(d.count ==1){

+ 3 - 1
src/main/webapp/webpage/modules/projectreportnum/projectReportNumSel.jsp

@@ -108,6 +108,8 @@
 					{checkbox: true,width:80},
 					{field:'index',align:'center',width:120, title: '序号'},
 					{field:'num',align:'center',  title: '报告号'},
+					{field:'num',align:'center',  title: '阶段'},
+					{field:'num',align:'center',  title: '工作内容'},
 					{templet: complain, title: '操作',width:130}
 				]],
 				done: function () {
@@ -120,7 +122,7 @@
 		function complain(d){//操作中显示的内容
 			if(0 == d.pid){
 				return [
-					"<a href=\"javascript:void(0)\" onclick=\"reportNumOnStage('阶段报告号新增','${ctx}/projectreportnum/projectReportNum/getProjectReportNumStageForm?num="+d.num+"&parentId="+d.id+"&reportType=${reportType}','70%', '50%');\" class=\"op-btn op-btn-edit\"><i class=\"fa fa-edit\"></i> 添加阶段报告号</a>"
+					"<a href=\"javascript:void(0)\" onclick=\"reportNumOnStage('阶段报告号新增','${ctx}/projectreportnum/projectReportNum/getProjectReportNumStageForm?num="+d.num+"&parentId="+d.id+"projectId=${projectId}&reportType=${reportType}','70%', '50%');\" class=\"op-btn op-btn-edit\"><i class=\"fa fa-edit\"></i> 添加阶段报告号</a>"
 				].join('');
 			}else{
 				return[