施工项目经理-领料流程-填写需要的材料：小类有对应的图片，在小类名称后显示按钮，点击显示图片

修改系统页面，防止出现在分辨率高的情况下，用户栏会出现多行的情况

src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/MdSmallClass.java

@@ -7,6 +7,8 @@ public class MdSmallClass extends ActEntity<MdSmallClass> {
    private String name;
    //单位
    private String mdUnit;
+   //图片信息
+   private String mdImg;
 
    public String getMdUnit() {
       return mdUnit;
@@ -23,5 +25,13 @@ public class MdSmallClass extends ActEntity<MdSmallClass> {
    public void setName(String name) {
       this.name = name;
    }
+
+   public String getMdImg() {
+      return mdImg;
+   }
+
+   public void setMdImg(String mdImg) {
+      this.mdImg = mdImg;
+   }
 }
 

src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/PickList.java

@@ -8,19 +8,9 @@ public class PickList extends DataEntity<PickList> {
 
     //大类信息
     private String name;
-    //图片信息
-    private String mdImg;
     //中类信息
     private List<MdTheClass> mdTheClassList;
 
-    public String getMdImg() {
-        return mdImg;
-    }
-
-    public void setMdImg(String mdImg) {
-        this.mdImg = mdImg;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/com/jeeplus/modules/sg/picking/activiti/service/PickIngService.java

@@ -3,8 +3,10 @@
  */
 package com.jeeplus.modules.sg.picking.activiti.service;
 
+import com.jeeplus.common.config.Global;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.managementcenter.activiti.entity.UploadImages;
 import com.jeeplus.modules.sg.managementcenter.activiti.utils.MyActiviUtils;
 import com.jeeplus.modules.sg.picking.activiti.entity.*;
 import com.jeeplus.modules.sg.picking.activiti.mapper.PickIngMapper;
@@ -14,6 +16,8 @@ import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
+import java.security.cert.LDAPCertStoreParameters;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,6 +31,9 @@ import java.util.List;
 public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	@Autowired
 	private PickIngMapper pickIngMapper;
+	@Autowired
+	private HttpServletRequest request;
+
 
 	@Override
 	public Page<PickIng> findPage(Page<PickIng> page, PickIng entity) {
@@ -39,7 +46,7 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 	 * 去除重复，记录大类
 	 * 根据大类查询它的中类放入list并记录
 	 * */
-	public List<PickList> newAllList(PickIng entity,String s) {
+	public List<PickList> newAllList(PickIng entity, String s) {
 		DictValue dic = MyActiviUtils.findDic();
 		entity.setVersion(dic.getValue());
 		//查询除所有数据
@@ -60,7 +67,6 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 				//创建返回对象
 				PickList pickList = new PickList();
 				pickList.setName(pickIng.getMdBigClass());
-				pickList.setMdImg(pickIng.getMdImg());
 				returnList.add(pickList);
 			}
 		}
@@ -104,6 +110,11 @@ public class PickIngService extends CrudService<PickIngMapper, PickIng> {
 						mdSmallClass.setName(pc.getMdSmallClass());
 						mdSmallClass.setId(pc.getId());
 						mdSmallClass.setMdUnit(pc.getMdUnit());
+						if (Global.SYS_TYPE.equals("2")) {
+							mdSmallClass.setMdImg("http://" + request.getServerName() + pc.getMdImg());
+						} else {
+							mdSmallClass.setMdImg(pc.getMdImg());
+						}
 						mdSmallClassList.add(mdSmallClass);
 					}
 					md.setMdSmallClassList(mdSmallClassList);

src/main/java/com/jeeplus/modules/sg/picking/activiti/web/PickIngController.java

@@ -132,7 +132,7 @@ public class PickIngController extends BaseController {
     }
 
 
-    //    manager
+/*    //    manager
     @ResponseBody
     @RequestMapping(value = "constructionData")
     public Map<String, Object> constructionData(ShowList showList, String procInsId, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -220,7 +220,7 @@ public class PickIngController extends BaseController {
             Page<ShowList> page = showListService.findPage(new Page<ShowList>(request, response), showList);
             return getBootstrapData(page);
         }
-    }
+    }*/
 
     /**
      * 领料流程发起

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

@@ -64,7 +64,7 @@
 								<tr>
 							</c:if>
 							<td colspan="4" class="list-lig-two">${items.name}</td>
-							<c:if test="${status.count % 1 eq 0 || status.count eq 5}">
+							<c:if test="${status.count % 1 eq 0 || status.count eq 1}">
 								</tr>
 							</c:if>
 
@@ -80,6 +80,10 @@
 										</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.showPic('${itemss.mdImg}')">显示图片</a>
+											</c:if>
 										</div>
 								</td>
 								<c:if test="${status.count % 4 eq 0 || status.count eq 4}">

src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp

@@ -48,7 +48,7 @@
 			<ul id="o1" class="nav navbar-toolbar nav-tabs  navbar-left" style="width: calc( 100% - 680px)" role="tablist">
 			<t:jpMenu  menu="${fns:getTopMenu()}" position="top"></t:jpMenu>
 		</ul>
-		<ul class="nav navbar-nav pull-right navbar-right">
+		<ul class="nav navbar-nav pull-right navbar-right" style="margin: 0px">
 				<li>
 					<a href="${ctx}/home"  class="J_menuItem"><i class="fa fa-home" style="font-size:14px;"></i></a>
 				</li>