前端页面修改物资上报

src/main/webapp/webpage/modules/sg/picking/activiti/materialReport.js

@@ -281,7 +281,9 @@
             })
             if (item == null || item == "") {
                 jp.error("请填写模块表");
-            } else {
+            } else if($("#reserveName").val() == null || $("#reserveName").val() == ""){
+                jp.error("项目名称不能为空");
+            }else{
                 jp.prompt("审核通过", function (message) {
                     jp.post("${ctx}/act/task/materialReport",
                         {
@@ -292,7 +294,7 @@
                             "procDefId": "${showList.act.procDefId}",
                             "selectNumber":item,
                             "flag": "yes",
-							"reserveName":$("#reserveName").val(),
+                            "reserveName":$("#reserveName").val(),
                             "comment": window.encodeURI(message)
                         },
                         function (data) {

src/main/webapp/webpage/modules/sg/picking/activiti/materialReport.jsp

@@ -35,75 +35,71 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">模块表展示</h3>
+		<h3 class="panel-title">在线开具设计材料清单</h3>
 	</div>
 		<div class="panel-body">
-			<div>
-				<ul class="nav nav-tabs">
-					<li role="presentation" id="click1" style="border-bottom: 0px;border-left: 1px solid rgb(221,221,221);border-right: 1px solid rgb(221,221,221);border-top: 1px solid rgb(221,221,221)"><a id="dq" href="javascript:void(0)">填写需要材料</a></li>
-					<%--<li role="presentation" id="click3" ><a id="mkqd" href="javascript:void(0)">查看模块清单</a></li>--%>
-					<%--<li role="presentation" id="click2" ><a id="qd" href="javascript:void(0)">查看领料清单</a></li>--%>
-				</ul>
+			<div  class="form form-horizontal well clearfix">
+				<div class="col-xs-12 col-sm-6 col-md-4">
+					<label class="label-item single-overflow pull-left" title="项目名称：">项目名称：</label>
+					<input type="text" id="reserveName" name="reserveName" class="form-control required">
+				</div>
 			</div>
 			<div>
-				<input type="text" id="reserveName" name="reserveName" class="">
+
 			</div>
-			<!-- 表格 -->
-			<div id="div1">
-				<table class="table table-view">
-					<tbody>
-					<%--<h3>项目：${projectNumber.requireName}&nbsp;发起第${projectNumber.theNumber}次开具领料清单</h3>--%>
-					<c:forEach items="${pickListList}" var="items" varStatus="status">
-						<c:if test="${status.count eq 1 || (status.count-1) % 1 eq 0}">
+			<table class="table table-view">
+				<tbody>
+				<%--<h3>项目：${projectNumber.requireName}&nbsp;发起第${projectNumber.theNumber}次开具领料清单</h3>--%>
+				<c:forEach items="${pickListList}" var="items" varStatus="status">
+					<c:if test="${status.count eq 1 || (status.count-1) % 1 eq 0}">
 						<tr>
+					</c:if>
+					<td colspan="4" class="list-lig-one">${items.name}</td>
+					<c:if test="${status.count % 1 eq 0 || status.count eq 1}">
+						</tr>
+					</c:if>
+
+					<c:forEach items="${items.mdTheClassList}" var="items" varStatus="status">
+						<c:if test="${status.count eq 1 || (status.count-1) % 1 eq 0}">
+							<tr>
 						</c:if>
-							<td colspan="4" class="list-lig-one">${items.name}</td>
+						<td colspan="4" class="list-lig-two">${items.name}</td>
 						<c:if test="${status.count % 1 eq 0 || status.count eq 1}">
-						</tr>
+							</tr>
 						</c:if>
 
-						<c:forEach items="${items.mdTheClassList}" var="items" varStatus="status">
-							<c:if test="${status.count eq 1 || (status.count-1) % 1 eq 0}">
+						<c:forEach items="${items.mdSmallClassList}" var="itemss" varStatus="status">
+							<c:if test="${status.count eq 1 || (status.count-1) % 4 eq 0}">
 								<tr>
 							</c:if>
-							<td colspan="4" class="list-lig-two">${items.name}</td>
-							<c:if test="${status.count % 1 eq 0 || status.count eq 1}">
+							<td style="text-align: center;vertical-align: middle">
+								<div class="well-class-body" style="float: left;">
+									<a href="javascript:jp.openViewDialog('模块清单','${ctx}/managementcenter/moduleacquisition/moduleListing/list?blockId=${itemss.id}', '800px', '500px');">
+											${itemss.name}
+									</a>
+								</div>
+								<div style="float: left;margin-left: 5px;margin: auto">
+									<input style="width:40px;" placeholder="0" type="number" min="0" name="need" id="${itemss.id}"/><span>&nbsp;${itemss.mdUnit}</span>
+										<%--											<span><img onclick="jp.showPic('${itemss.mdImg}')" src="${itemss.mdImg}" height="50px"></span>--%>
+									<c:if test="${not empty itemss.mdImg}">
+										<a id="imgButton" class="btn btn-success btn-xs waves-effect m-r-5" href="javascript:jp.openViewDialog('查看附件','${ctx}/picking/activiti/pickPic?id=${itemss.id}', '800px', '500px')">显示附件</a>
+									</c:if>
+								</div>
+							</td>
+							<c:if test="${status.count % 4 eq 0 || status.count eq 4}">
 								</tr>
 							</c:if>
-
-							<c:forEach items="${items.mdSmallClassList}" var="itemss" varStatus="status">
-								<c:if test="${status.count eq 1 || (status.count-1) % 4 eq 0}">
-									<tr>
-								</c:if>
-								<td style="text-align: center;vertical-align: middle">
-										<div class="well-class-body" style="float: left;">
-											<a href="javascript:jp.openViewDialog('模块清单','${ctx}/managementcenter/moduleacquisition/moduleListing/list?blockId=${itemss.id}', '800px', '500px');">
-												${itemss.name}
-											</a>
-										</div>
-										<div style="float: left;margin-left: 5px;margin: auto">
-											<input style="width:40px;" placeholder="0" type="number" min="0" name="need" id="${itemss.id}"/><span>&nbsp;${itemss.mdUnit}</span>
-<%--											<span><img onclick="jp.showPic('${itemss.mdImg}')" src="${itemss.mdImg}" height="50px"></span>--%>
-											<c:if test="${not empty itemss.mdImg}">
-												<a id="imgButton" class="btn btn-success btn-xs waves-effect m-r-5" href="javascript:jp.openViewDialog('查看附件','${ctx}/picking/activiti/pickPic?id=${itemss.id}', '800px', '500px')">显示附件</a>
-											</c:if>
-										</div>
-								</td>
-								<c:if test="${status.count % 4 eq 0 || status.count eq 4}">
-									</tr>
-								</c:if>
-							</c:forEach>
-
 						</c:forEach>
+
 					</c:forEach>
-					</tbody>
-				</table>
-				<div class="row">
-					<div class="col-sm-3"></div>
-					<div class="col-sm-6">
-						<div class="form-group text-center">
-							<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="确认提交" />&nbsp;
-						</div>
+				</c:forEach>
+				</tbody>
+			</table>
+			<div class="row">
+				<div class="col-sm-3"></div>
+				<div class="col-sm-6">
+					<div class="form-group text-center">
+						<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="确认提交" />&nbsp;
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/sg/picking/activiti/materialReportForm.jsp

@@ -24,23 +24,14 @@
 	<div class="wrapper wrapper-content">
 	<div class="panel panel-primary">
 	<div class="panel-heading">
-		<h3 class="panel-title">配网物资专职审核材料清单</h3>
+		<h3 class="panel-title">审核材料清单</h3>
 	</div>
 		<form:form id="inputForm" modelAttribute="act" class="form-horizontal">
 			<input type="hidden" id="procInsId" name="procInsId" value="${showList.act.procInsId}"/>
 			<input type="hidden" id="taskId" name="procInsId" value="${showList.act.taskId}"/>
 		</form:form>
 		<div class="panel-body">
-			<div>
-				<ul class="nav nav-tabs">
-					<li role="presentation" id="click2" style="border-bottom: 0px;border-left: 1px solid rgb(221,221,221);border-right: 1px solid rgb(221,221,221);border-top: 1px solid rgb(221,221,221)"><a id="qd" href="javascript:void(0)">审核材料清单</a></li>
-					<%--<li role="presentation" id="click3" ><a id="mkqd" href="javascript:void(0)">查看模块清单</a></li>--%>
-				</ul>
-			</div>
-			<div id="div2" style="display: block">
-				<!-- 工具栏 -->
-				<table id="informationTable"   data-toolbar="#toolbar" class="table"></table>
-			</div>
+			<table id="informationTable"   data-toolbar="#toolbar" class="table"></table>
 			<div class="row">
 				<div class="col-sm-3"></div>
 				<div class="col-sm-6">