Przeglądaj źródła

报告编号修改为项目组共同使用

user5 4 lat temu
rodzic
commit
529a41daf2

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

@@ -120,7 +120,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+"','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}','70%', '50%');\" class=\"op-btn op-btn-edit\"><i class=\"fa fa-edit\"></i> 添加阶段报告号</a>"
 				].join('');
 			}else{
 				return[

+ 5 - 4
src/main/webapp/webpage/modules/projectreportnum/projectReportNumStageForm.jsp

@@ -61,6 +61,7 @@
 	<div class="container view-form">
 		<form:form id="inputForm" modelAttribute="reportNum" action="${ctx}/projectreportnum/projectReportNum/saveReportNumOnStage" method="post" class="form-horizontal">
 			<input type="hidden" id="parentId" name="parentId" value="${reportNum.parentId}">
+			<input type="hidden" id="projectId" name="projectId" value="${reportNum.projectId}">
 		<sys:message content="${message}"/>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>阶段报告信息</h2></div>
@@ -73,7 +74,7 @@
 				<div class="layui-item layui-col-sm6" style="width:50%">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>选择阶段信息:</label>
 					<div class="layui-input-block">
-						<%--<form:select id="stageId" path="stageId"  htmlEscape="false" class="form-control simple-select required">
+						<form:select id="stageId" path="stageId"  htmlEscape="false" class="form-control simple-select required">
 							<form:option value=""></form:option>
 							<optgroup label="项目实施前期"/>
 							<form:options items="${fns:getContentTypeByProjectType('2')}" itemLabel="typeName" itemValue="typeId"></form:options>
@@ -81,8 +82,8 @@
 							<form:options items="${fns:getContentTypeByProjectType('3')}" itemLabel="typeName" itemValue="typeId"></form:options>
 							<optgroup label="项目竣工阶段"/>
 							<form:options items="${fns:getContentTypeByProjectType('5')}" itemLabel="typeName" itemValue="typeId"></form:options>
-						</form:select>--%>
-						<form:select id="stageId" path="stageId"  htmlEscape="false" class="form-control simple-select required">
+						</form:select>
+						<%--<form:select id="stageId" path="stageId"  htmlEscape="false" class="form-control simple-select required">
 							<form:option value=""></form:option>
 							<optgroup label="决策阶段"/>
 							<form:options items="${fns:getContentTypeList('1')}" itemLabel="typeName" itemValue="typeId"></form:options>
@@ -96,7 +97,7 @@
 							<form:options items="${fns:getContentTypeList('5')}" itemLabel="typeName" itemValue="typeId"></form:options>
 							<optgroup label="运营阶段"/>
 							<form:options items="${fns:getContentTypeList('6')}" itemLabel="typeName" itemValue="typeId"></form:options>
-						</form:select>
+						</form:select>--%>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6" style="width:50%">