Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/entity/ModuleVersion.java

@@ -7,7 +7,7 @@ import java.util.Date;
 
 public class ModuleVersion extends DataEntity<ModuleVersion>{
    private String version;//版本号
-   private Date updateDate;//版本生成时间
+   private String versionName;//版本名称
 
     public String getVersion() {
         return version;
@@ -17,14 +17,11 @@ public class ModuleVersion extends DataEntity<ModuleVersion>{
         this.version = version;
     }
 
-    @Override
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    public Date getUpdateDate() {
-        return updateDate;
+    public String getVersionName() {
+        return versionName;
     }
 
-    @Override
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
+    public void setVersionName(String versionName) {
+        this.versionName = versionName;
     }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/mapper/xml/ModuleBlockMapper.xml

@@ -192,7 +192,7 @@
 	</select>
 
 	<select id="findAllVersion" resultType="ModuleVersion">
-		select md_version AS version ,update_date AS updateDate from md_module_block
+		select md_version AS version from md_module_block
 		<where>
 			del_flag = '0'
 		</where>

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/service/ModuleBlockService.java

@@ -74,9 +74,13 @@ public class ModuleBlockService extends CrudService<ModuleBlockMapper,ModuleBloc
 		获得所有版本号
 	 */
 	public Page<ModuleVersion> findPage(Page<ModuleVersion> page, ModuleVersion moduleVersion) {
+		List<ModuleVersion> allVersion = moduleBlockMapper.findAllVersion(moduleVersion);
+		for (ModuleVersion moduleVersion1:allVersion){
+			moduleVersion1.setVersionName("版本"+moduleVersion1.getVersion());
+		}
 		dataRuleFilter(moduleVersion);
 		moduleVersion.setPage(page);
-		page.setList(moduleBlockMapper.findAllVersion(moduleVersion));
+		page.setList(allVersion);
 		return page;
 	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/web/ModuleBlockWeb.java

@@ -113,7 +113,7 @@ public class ModuleBlockWeb extends BaseController {
 	 * 保存
 	 */
 	@ResponseBody
-//	@RequiresPermissions(value={"managementcenter:moduleacquisition:add","managementcenter:moduleacquisition:edit"},logical=Logical.OR)
+	@RequiresPermissions(value={"managementcenter:moduleacquisition:add","managementcenter:moduleacquisition:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
 	public AjaxJson save(ModuleBlock moduleBlock, Model model,HttpServletRequest request) throws Exception{
 		HttpSession session = request.getSession();

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/moduleBlockList.js

@@ -26,7 +26,7 @@ $(document).ready(function() {
                //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
                cache: false,    
                //是否显示分页（*）  
-               pagination: true,   
+               pagination: true,
                 //排序方式 
                sortOrder: "asc",  
                //初始化加载第一页，默认第一页
@@ -189,7 +189,12 @@ $(document).ready(function() {
                 var iframeWin = layero.find('iframe')[0]; //得到弹出的窗口对象，执行窗口内iframe页的方法：iframeWin.method();
                 iframeWin.contentWindow.save();//调用保存事件，在 弹出页内，需要定义save方法。处理保存事件。
 				var i = iframeWin.contentWindow.getIdSelections();
-                jp.downloadFile("${ctx}/managementcenter/moduleacquisition/insertVersion?mdVersion="+i);
+				if (null!=i&&i!=""){
+                    jp.downloadFile("${ctx}/managementcenter/moduleacquisition/insertVersion?mdVersion="+i);
+				}else {
+					jp.error("您还没选择版本");
+				}
+
             },
             cancel: function(index){
             }

src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/moduleVersionList.js

@@ -14,7 +14,7 @@ $(document).ready(function() {
                //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
                cache: false,    
                //是否显示分页（*）  
-               pagination: true,   
+               pagination: false,
                 //排序方式 
                sortOrder: "asc",  
                //初始化加载第一页，默认第一页
@@ -59,9 +59,8 @@ $(document).ready(function() {
             }
 
                    ,{
-                       field: 'updateDate',
-                       title: '版本生成时间',
-
+                       field: 'versionName',
+                       title: '版本名称',
                    }
 
 		     ]

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

@@ -105,7 +105,15 @@ $(document).ready(function() {
 	$("#search").click("click", function() {
 		  $('#informationTable').bootstrapTable('refresh');
 		});
-
+    $("#click1").click("click", function() {
+        // alert("1");
+        $("#click2").attr("style","");
+        $("#click1").attr("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)");
+    });
+    $("#click2").click("click",function () {
+        $("#click1").attr("style","");
+        $("#click2").attr("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)");
+    });
 	// 绑定查询重置按扭
 	 $("#reset").click("click", function() {
 		  $("#searchForm  input").val("");
@@ -136,7 +144,6 @@ $(document).ready(function() {
 					}
 			});
 		});
-
 	$("#agree").click(function () {
 		var item = "";
 		$('input[name="need"]').each(function(){
@@ -192,5 +199,14 @@ $(document).ready(function() {
 		}));
 	}
 })
+// $(document).ready(function (){
+//     $("li").each(function(index){
+//         $(this).click(function(){
+//             alert(index)
+//             $("li").removeClass("style");//删除当前元素的样式
+//             $("li").eq(index).attr("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)");//添加当前元素的样式
+//         });
+//     });
+// });
 
 </script>

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

@@ -11,6 +11,24 @@
 		#div1{
 			margin-top: 10px;
 		}
+		.well-class-body{
+			width: 160px;
+			word-wrap: break-word;
+			word-break: break-all;
+			/*text-align: right;*/
+			margin: 2px;
+		}
+		.list-lig-one{
+			color: #0C0C0C;
+			/*text-align: center;*/
+			font-size: 17px;
+			background-color: whitesmoke;
+		}
+		.list-lig-two{
+			/*background-color: #6495ED;*/
+			color: #333333;
+			font-size: 14px;
+		}
 	</style>
 </head>
 <body>
@@ -22,42 +40,54 @@
 		<div class="panel-body">
 			<div>
 				<ul class="nav nav-tabs">
-					<li role="presentation"><a id="dq" href="javascript:void(0)">填写需要材料</a></li>
-					<li role="presentation"><a id="qd" href="javascript:void(0)">查看领料清单</a></li>
+					<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="click2" ><a id="qd" href="javascript:void(0)">查看领料清单</a></li>
 				</ul>
 			</div>
 			<!-- 表格 -->
 			<div id="div1">
 				<table class="table table-view">
-					<thead>
+					<tbody>
 					<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">${items.name}</td>
+							<td colspan="4" class="list-lig-one">${items.name}</td>
 						<c:if test="${status.count % 1 eq 0 || status.count eq 5}">
 						</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"><a href="${items.id}">${items.name}</a></td>
+							<td colspan="4" class="list-lig-two">${items.name}</td>
 							<c:if test="${status.count % 1 eq 0 || status.count eq 5}">
 								</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>${itemss.name}:&nbsp;&nbsp;<input placeholder="0" type="number" min="0" name="need" id="${itemss.id}"/>&nbsp;${itemss.mdUnit}</td>
+								<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;">
+											<input style="width:40px;" placeholder="0" type="number" min="0" name="need" id="${itemss.id}"/><span>&nbsp;${itemss.mdUnit}</span>
+										</div>
+								</td>
 								<c:if test="${status.count % 4 eq 0 || status.count eq 4}">
 									</tr>
 								</c:if>
 							</c:forEach>
+
 						</c:forEach>
 					</c:forEach>
-					</thead>
+					</tbody>
 				</table>
 				<div class="row">
 					<div class="col-sm-3"></div>