修改

src/main/java/com/jeeplus/modules/sg/balancedlibrary/reportPerson/entity/ReportPerson.java

@@ -0,0 +1,36 @@
+package com.jeeplus.modules.sg.balancedlibrary.reportPerson.entity;
+
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.core.persistence.DataEntity;
+
+/**
+ * 提报人
+ * @author enford
+ * @version 1.0
+ */
+public class ReportPerson extends DataEntity<ReportPerson> {
+    /**
+     * 提报人
+     */
+    private String reportPerson;
+    /**
+     * 提报部门
+     */
+    private String reportDepartment;
+
+    public String getReportPerson() {
+        return reportPerson;
+    }
+
+    public void setReportPerson(String reportPerson) {
+        this.reportPerson = reportPerson;
+    }
+
+    public String getReportDepartment() {
+        return reportDepartment;
+    }
+
+    public void setReportDepartment(String reportDepartment) {
+        this.reportDepartment = reportDepartment;
+    }
+}

src/main/java/com/jeeplus/modules/sg/balancedlibrary/reportPerson/mapper/ReportPersonMapper.java

@@ -0,0 +1,28 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.balancedlibrary.reportPerson.mapper;
+
+import com.jeeplus.core.persistence.BaseMapper;
+import com.jeeplus.core.persistence.annotation.MyBatisMapper;
+import com.jeeplus.modules.sg.balancedlibrary.liKuResourcePool.entity.LiKuResourcePool;
+import com.jeeplus.modules.sg.balancedlibrary.replaceMaterial.entity.ReplaceMaterial;
+import com.jeeplus.modules.sg.balancedlibrary.reportPerson.entity.ReportPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 提报人MAPPER接口
+ * @author enford
+ * @version 1.0
+ */
+@MyBatisMapper
+public interface ReportPersonMapper extends BaseMapper<ReportPerson> {
+    /**
+     * 批量插入替换物料信息
+     * @param list 插入信息
+     * */
+    void insertList(@Param("list") List<ReportPerson> list);
+
+}

src/main/java/com/jeeplus/modules/sg/balancedlibrary/reportPerson/mapper/xml/ReportPersonMapper.xml

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.modules.sg.balancedlibrary.reportPerson.mapper.ReportPersonMapper">
+	<sql id="replaceColumns">
+		a.id AS "id",
+-- 		a.create_by AS "createBy.id",
+-- 		a.create_date AS "createDate",
+-- 		a.update_by AS "updateBy.id",
+-- 		a.update_date AS "updateDate",
+-- 		a.del_flag AS "delFlag",
+		a.report_person AS "reportPerson",
+		a.report_department AS "reportDepartment"
+	</sql>
+
+	<sql id="leftJoins">
+		LEFT JOIN sys_office office ON office.id = a.office_id
+		LEFT JOIN sys_user tuser ON tuser.id = a.user_id
+	</sql>
+
+
+	<select id="get" resultType="ReportPerson" >
+		SELECT
+			<include refid="replaceColumns"/>
+		FROM bla_report_person a
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="ReportPerson" >
+		SELECT
+			<include refid="replaceColumns"/>
+		FROM bla_report_person a
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+			<if test="reportPerson != null and reportPerson != ''">
+				AND a.report_person like  concat('%',#{reportPerson},'%')
+			</if>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="findAllList" resultType="ReportPerson" >
+		SELECT
+			a.report_person AS "reportPerson",
+			b.label AS "reportDepartment"
+		FROM bla_report_person a
+		left join (select value,label from sys_dict_value where dict_type_id=
+		(select id from sys_dict_type where type='report_department')) b
+		on a.report_department = b.value
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+			${dataScope}
+		</where>
+	</select>
+
+	<insert id="insert">
+		INSERT INTO bla_report_person(
+			 id,
+			 create_by,
+			 create_date,
+			 update_by,
+			 update_date,
+			 del_flag,
+			 report_person,
+			 report_department
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{delFlag},
+			#{reportPerson},
+		    #{reportDepartment}
+		)
+	</insert>
+	<insert id="insertList">
+		replace into bla_report_person(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			del_flag,
+			report_person,
+			report_department
+		)VALUES
+		<foreach collection="list" item="item" index="index" separator=",">
+			(
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{delFlag},
+			#{reportPerson},
+			#{reportDepartment}
+			)
+		</foreach>
+	</insert>
+
+	<update id="update">
+		UPDATE bla_report_person SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			report_person = #{reportPerson},
+			report_department = #{reportDepartment}
+		WHERE id = #{id}
+	</update>
+
+
+	<!--物理删除-->
+	<update id="delete">
+		DELETE FROM bla_report_person
+		WHERE id = #{id}
+	</update>
+
+	<!--逻辑删除-->
+	<update id="deleteByLogic">
+		UPDATE bla_report_person SET
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+
+
+</mapper>

src/main/java/com/jeeplus/modules/sg/balancedlibrary/reportPerson/service/ReportPersonService.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.balancedlibrary.reportPerson.service;
+
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.balancedlibrary.liKuResourcePool.entity.LiKuResourcePool;
+import com.jeeplus.modules.sg.balancedlibrary.liKuResourcePool.mapper.LiKuResourcePoolMapper;
+import com.jeeplus.modules.sg.balancedlibrary.replaceMaterial.entity.ReplaceMaterial;
+import com.jeeplus.modules.sg.balancedlibrary.replaceMaterial.mapper.ReplaceMaterialMapper;
+import com.jeeplus.modules.sg.balancedlibrary.reportPerson.entity.ReportPerson;
+import com.jeeplus.modules.sg.balancedlibrary.reportPerson.mapper.ReportPersonMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 提报人
+ * @author enford
+ * @version 1.0
+ */
+@Service
+@Transactional(readOnly = true)
+public class ReportPersonService extends CrudService<ReportPersonMapper, ReportPerson> {
+
+	@Override
+	public ReportPerson get(String id) {
+		return super.get(id);
+	}
+	
+	@Override
+	public List<ReportPerson> findList(ReportPerson entity) {
+		return super.findList(entity);
+	}
+	
+	@Override
+	public Page<ReportPerson> findPage(Page<ReportPerson> page, ReportPerson entity) {
+		return super.findPage(page, entity);
+	}
+	
+	@Override
+	@Transactional(readOnly = false)
+	public void save(ReportPerson entity) {
+		super.save(entity);
+	}
+	
+	@Override
+	@Transactional(readOnly = false)
+	public void delete(ReportPerson entity) {
+		super.delete(entity);
+	}
+
+	@Transactional(readOnly = false)
+	public void insertList(List<ReportPerson> list) {
+		mapper.insertList(list);
+	}
+
+}

src/main/java/com/jeeplus/modules/sg/balancedlibrary/reportPerson/web/ReportPersonController.java

@@ -0,0 +1,159 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.sg.balancedlibrary.reportPerson.web;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Date;
+
+import com.jeeplus.modules.sg.balancedlibrary.reportPerson.entity.ReportPerson;
+import com.jeeplus.modules.sg.balancedlibrary.reportPerson.service.ReportPersonService;
+import com.jeeplus.modules.sys.entity.User;
+
+import com.google.common.collect.Lists;
+import com.jeeplus.common.json.AjaxJson;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ExportExcel;
+import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.core.persistence.Page;
+import com.jeeplus.core.web.BaseController;
+import com.jeeplus.modules.sg.balancedlibrary.liKuResourcePool.entity.LiKuResourcePool;
+import com.jeeplus.modules.sg.balancedlibrary.liKuResourcePool.service.LiKuResourcePoolService;
+import com.jeeplus.modules.sg.balancedlibrary.replaceMaterial.entity.ReplaceMaterial;
+import com.jeeplus.modules.sg.balancedlibrary.replaceMaterial.service.ReplaceMaterialService;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.DataFormat;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.ConstraintViolationException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 提报人Controller
+ * @author enford
+ * @version 1.0
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/reportPerson")
+public class ReportPersonController extends BaseController {
+
+	@Autowired
+	private ReportPersonService service;
+	
+	@ModelAttribute
+	public ReportPerson get(@RequestParam(required=false) String id) {
+		ReportPerson entity = null;
+		if (StringUtils.isNotBlank(id)){
+			entity = service.get(id);
+		}
+		if (entity == null){
+			entity = new ReportPerson();
+		}
+		return entity;
+	}
+	
+	/**
+	 * 提报人列表页面
+	 */
+	@RequiresPermissions("sg:balancedlibrary:reportPerson:list")
+	@RequestMapping(value = "list")
+	public String list(ReportPerson entity, Model model) {
+		model.addAttribute("entity", entity);
+		return "modules/sg/balancedlibrary/reportPerson/reportPersonList";
+	}
+	
+	/**
+	 * 提报人列表数据
+	 */
+	@ResponseBody
+	@RequiresPermissions("sg:balancedlibrary:reportPerson:list")
+	@RequestMapping(value = "data")
+	public Map<String, Object> data(ReportPerson entity, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Page<ReportPerson> page = service.findPage(new Page<ReportPerson>(request, response), entity);
+		return getBootstrapData(page);
+	}
+
+	/**
+	 * 查看，增加，编辑提报人表单页面
+	 */
+	@RequiresPermissions(value={"sg:balancedlibrary:reportPerson:view","sg:balancedlibrary:reportPerson:add","sg:balancedlibrary:reportPerson:edit"},logical=Logical.OR)
+	@RequestMapping(value = "form")
+	public String form(ReportPerson entity, Model model) {
+		model.addAttribute("entity", entity);
+		return "modules/sg/balancedlibrary/reportPerson/reportPersonForm";
+	}
+
+	/**
+	 * 保存提报人
+	 */
+	@ResponseBody
+	@RequiresPermissions(value={"sg:balancedlibrary:reportPerson:add","sg:balancedlibrary:reportPerson:edit"},logical=Logical.OR)
+	@RequestMapping(value = "save")
+	public AjaxJson save(ReportPerson entity, Model model) throws Exception{
+		AjaxJson j = new AjaxJson();
+		/**
+		 * 后台hibernate-validation插件校验
+		 */
+		String errMsg = beanValidator(entity);
+		if (StringUtils.isNotBlank(errMsg)){
+			j.setSuccess(false);
+			j.setMsg(errMsg);
+			return j;
+		}
+		//新增或编辑表单保存
+		service.save(entity);
+		j.setSuccess(true);
+		j.setMsg("保存提报人成功");
+		return j;
+	}
+	
+	/**
+	 * 删除提报人
+	 */
+	@ResponseBody
+	@RequiresPermissions("sg:balancedlibrary:reportPerson:del")
+	@RequestMapping(value = "delete")
+	public AjaxJson delete(ReportPerson entity) {
+		AjaxJson j = new AjaxJson();
+		service.delete(entity);
+		j.setMsg("删除提报人成功");
+		return j;
+	}
+	
+	/**
+	 * 批量删除提报人
+	 */
+	@ResponseBody
+	@RequiresPermissions("sg:balancedlibrary:reportPerson:del")
+	@RequestMapping(value = "deleteAll")
+	public AjaxJson deleteAll(String ids) {
+		AjaxJson j = new AjaxJson();
+		String idArray[] =ids.split(",");
+		for(String id : idArray){
+			service.delete(service.get(id));
+		}
+		j.setMsg("删除提报人成功");
+		return j;
+	}
+	
+
+
+}

src/main/webapp/webpage/modules/sg/balancedlibrary/materialQuota/materialQuotaList.js

@@ -0,0 +1,284 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	$('#leave1Table').bootstrapTable({
+		 
+		  //请求方法
+               method: 'post',
+               //类型json
+               dataType: "json",
+               contentType: "application/x-www-form-urlencoded",
+               //显示检索按钮
+	           showSearch: true,
+               //显示刷新按钮
+               showRefresh: true,
+               //显示切换手机试图按钮
+               showToggle: true,
+               //显示 内容列下拉框
+    	       showColumns: true,
+    	       //显示到处按钮
+    	       showExport: true,
+    	       //显示切换分页按钮
+    	       showPaginationSwitch: true,
+    	       //最低显示2行
+    	       minimumCountColumns: 2,
+               //是否显示行间隔色
+               striped: true,
+               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
+               cache: false,    
+               //是否显示分页（*）  
+               pagination: true,   
+                //排序方式 
+               sortOrder: "asc",  
+               //初始化加载第一页，默认第一页
+               pageNumber:1,   
+               //每页的记录行数（*）   
+               pageSize: 10,  
+               //可供选择的每页的行数（*）    
+               pageList: [10, 25, 50, 100],
+               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+               url: "${ctx}/materialQuota/data",
+               //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+               //queryParamsType:'',   
+               ////查询参数,每次调用是会带上这个参数，可自定义                         
+               queryParams : function(params) {
+               	var searchParam = $("#searchForm").serializeJSON();
+               	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+               	searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+               	searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+                   return searchParam;
+               },
+               //分页方式：client客户端分页，server服务端分页（*）
+               sidePagination: "server",
+               contextMenuTrigger:"right",//pc端 按右键弹出菜单
+               contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
+               contextMenu: '#context-menu',
+               onContextMenuItem: function(row, $el){
+                   if($el.data("item") == "edit"){
+                   		edit(row.id);
+                   }else if($el.data("item") == "view"){
+                       view(row.id);
+                   } else if($el.data("item") == "delete"){
+                        jp.confirm('确认要删除该物资限额记录吗？', function(){
+                       	jp.loading();
+                       	jp.get("${ctx}/materialQuota/delete?id="+row.id, function(data){
+                   	  		if(data.success){
+                   	  			$('#leave1Table').bootstrapTable('refresh');
+                   	  			jp.success(data.msg);
+                   	  		}else{
+                   	  			jp.error(data.msg);
+                   	  		}
+                   	  	})
+                   	   
+                   	});
+                      
+                   } 
+               },
+              
+               onClickRow: function(row, $el){
+               },
+               	onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+               columns: [{
+		        checkbox: true
+		       
+		    },{
+				   field: 'materialCode',
+				   title: '物料编码',
+				   sortable: true,
+				   sortName: 'materialCode'
+
+			   }
+			,{
+		        field: 'materialDesc',
+		        title: '物料描述',
+		        sortable: true,
+		        sortName: 'materialDesc'
+		       
+		    }
+			,{
+		        field: 'materialBigClass',
+		        title: '物料大类',
+		        sortable: true,
+		        sortName: 'materialBigClass'
+		       
+		    }
+                   ,{
+                       field: 'materialMedClass',
+                       title: '物料中类',
+                       sortable: true,
+                       sortName: 'materialMedClass'
+
+                   }
+                   ,{
+                       field: 'materialLittleClass',
+                       title: '物料小类',
+                       sortable: true,
+                       sortName: 'materialLittleClass'
+
+                   }
+                   ,{
+                       field: 'unit',
+                       title: '单位',
+                       sortable: true,
+                       sortName: 'unit'
+
+                   }
+                   ,{
+                       field: 'quota',
+                       title: '最高限额',
+                       sortable: true,
+                       sortName: 'quota'
+
+                   }
+
+
+		     ]
+		
+		});
+		
+		  
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+		 
+		  $('#leave1Table').bootstrapTable("toggleView");
+		}
+	  
+	  $('#leave1Table').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+                'check-all.bs.table uncheck-all.bs.table', function () {
+            $('#remove').prop('disabled', ! $('#leave1Table').bootstrapTable('getSelections').length);
+            $('#view,#edit').prop('disabled', $('#leave1Table').bootstrapTable('getSelections').length!=1);
+        });
+
+	  /**
+	   * 导入物资限额基础信息表
+	   * */
+	$("#btnImport").click(function(){
+		jp.open({
+			type: 2,
+			area: [500, 200],
+			auto: true,
+			title:"导入数据",
+			content: "${ctx}/tag/importExcel" ,
+			btn: ['下载模板','确定', '关闭'],
+				btn1: function(index, layero){
+				  jp.downloadFile('${ctx}/materialQuota/import/template');
+			  },
+			btn2: function(index, layero){
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					iframeWin.contentWindow.importExcel('${ctx}/materialQuota/import', function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							refresh();
+						}else{
+							jp.error(data.msg);
+						}
+						jp.close(index);
+					});//调用保存事件
+					return false;
+			  },
+
+			  btn3: function(index){
+				//  jp.close(index);
+			   }
+		});
+	});
+
+    /**
+     * 导入物资需求表
+     * */
+    $("#importMaterial").click(function(){
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title:"导入数据",
+            content: "${ctx}/tag/importExcel" ,
+            btn: ['下载模板','确定', '关闭'],
+            btn1: function(index, layero){
+                jp.downloadFile('${ctx}/MaterialReportDetails/import/templateNew');
+            },
+            btn2: function(index, layero){
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/MaterialReportDetails/importVerify', function (data) {
+                    if(data.success){
+                        jp.success(data.msg);
+                        jp.downloadFile('${ctx}/MaterialReportDetails/exportVerify','finalAccount');//给个name是为了能够在某些条件下下载两个文件	refresh();
+
+                        refresh();
+                    }else{
+                        jp.error(data.msg);
+                    }
+                    jp.close(index);
+                });//调用保存事件
+                return false;
+            },
+
+            btn3: function(index){
+                //  jp.close(index);
+            }
+        });
+    });
+
+
+		
+	 $("#export").click(function(){//导出Excel文件
+			jp.downloadFile('${ctx}/materialQuota/export');
+	  });
+
+		    
+	  $("#search").click("click", function() {// 绑定查询按扭
+		  $('#leave1Table').bootstrapTable('refresh');
+		});
+	 
+	 $("#reset").click("click", function() {// 绑定查询按扭
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $("#searchForm  .select-item").html("");
+		  $('#leave1Table').bootstrapTable('refresh');
+		});
+		
+		$('#beginBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		
+	});
+		
+  function getIdSelections() {
+        return $.map($("#leave1Table").bootstrapTable('getSelections'), function (row) {
+            return row.id;
+        });
+    }
+  
+  function deleteAll(){
+
+		jp.confirm('确认要删除该物资限额记录吗？', function(){
+			jp.loading();  	
+			jp.get("${ctx}/materialQuota/deleteAll?ids=" + getIdSelections(), function(data){
+         	  		if(data.success){
+         	  			$('#leave1Table').bootstrapTable('refresh');
+         	  			jp.success(data.msg);
+         	  		}else{
+         	  			jp.error(data.msg);
+         	  		}
+         	  	})
+          	   
+		})
+  }
+
+    //刷新列表
+  function refresh(){
+  	$('#leave1Table').bootstrapTable('refresh');
+  }
+  
+
+
+
+</script>

src/main/webapp/webpage/modules/sg/balancedlibrary/materialQuota/materialQuotaList.jsp

@@ -0,0 +1,77 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>物资限额管理</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="materialQuotaList.js" %>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">物资限额列表</h3>
+	</div>
+	<div class="panel-body">
+	
+	<!-- 搜索 -->
+	<div id="search-collapse" class="collapse">
+		<div class="accordion-inner">
+			<form:form id="searchForm" modelAttribute="entity" 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>
+				<form:input path="materialCode" htmlEscape="false" maxlength="257"  class=" form-control"/>
+			</div>
+		 <div class="col-xs-12 col-sm-6 col-md-4">
+			<div style="margin-top:26px">
+			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+			  <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+			 </div>
+	    </div>	
+	</form:form>
+	</div>
+	</div>
+	
+	<!-- 工具栏 -->
+	<div id="toolbar">
+		<shiro:hasPermission name="sg:balancedlibrary:materialQuota:del">
+			<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
+				<i class="glyphicon glyphicon-remove"></i> 删除
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="sg:balancedlibrary:materialQuota:import">
+			<button id="btnImport" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导入物料限额
+			</button>
+		</shiro:hasPermission>
+
+		<shiro:hasPermission name="sg:balancedlibrary:materialQuota:export">
+			<button id="export" class="btn btn-warning">
+				<i class="fa fa-file-excel-o"></i> 导出
+			</button>
+		 </shiro:hasPermission>
+		<shiro:hasPermission name="sg:balancedlibrary:materialQuota:import">
+			<button id="importMaterial" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导入物资需求
+			</button>
+		</shiro:hasPermission>
+	</div>
+		
+	<!-- 表格 -->
+	<table id="leave1Table"   data-toolbar="#toolbar"></table>
+
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+        <shiro:hasPermission name="sg:balancedlibrary:materialQuota:del">
+        <li data-item="delete"><a>删除</a></li>
+        </shiro:hasPermission>
+        <li data-item="action1"><a>取消</a></li>
+    </ul>  
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/balancedlibrary/preferredMaterials/preferredMaterialsList.js

@@ -0,0 +1,277 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	$('#leave1Table').bootstrapTable({
+		 
+		  //请求方法
+               method: 'post',
+               //类型json
+               dataType: "json",
+               contentType: "application/x-www-form-urlencoded",
+               //显示检索按钮
+	           showSearch: true,
+               //显示刷新按钮
+               showRefresh: true,
+               //显示切换手机试图按钮
+               showToggle: true,
+               //显示 内容列下拉框
+    	       showColumns: true,
+    	       //显示到处按钮
+    	       showExport: true,
+    	       //显示切换分页按钮
+    	       showPaginationSwitch: true,
+    	       //最低显示2行
+    	       minimumCountColumns: 2,
+               //是否显示行间隔色
+               striped: true,
+               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
+               cache: false,    
+               //是否显示分页（*）  
+               pagination: true,   
+                //排序方式 
+               sortOrder: "asc",  
+               //初始化加载第一页，默认第一页
+               pageNumber:1,   
+               //每页的记录行数（*）   
+               pageSize: 10,  
+               //可供选择的每页的行数（*）    
+               pageList: [10, 25, 50, 100],
+               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+               url: "${ctx}/preferredMaterials/data",
+               //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+               //queryParamsType:'',   
+               ////查询参数,每次调用是会带上这个参数，可自定义                         
+               queryParams : function(params) {
+               	var searchParam = $("#searchForm").serializeJSON();
+               	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+               	searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+               	searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+                   return searchParam;
+               },
+               //分页方式：client客户端分页，server服务端分页（*）
+               sidePagination: "server",
+               contextMenuTrigger:"right",//pc端 按右键弹出菜单
+               contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
+               contextMenu: '#context-menu',
+               onContextMenuItem: function(row, $el){
+                   if($el.data("item") == "edit"){
+                   		edit(row.id);
+                   }else if($el.data("item") == "view"){
+                       view(row.id);
+                   } else if($el.data("item") == "delete"){
+                        jp.confirm('确认要删除该优选物资记录吗？', function(){
+                       	jp.loading();
+                       	jp.get("${ctx}/preferredMaterials/delete?id="+row.id, function(data){
+                   	  		if(data.success){
+                   	  			$('#leave1Table').bootstrapTable('refresh');
+                   	  			jp.success(data.msg);
+                   	  		}else{
+                   	  			jp.error(data.msg);
+                   	  		}
+                   	  	})
+                   	   
+                   	});
+                      
+                   } 
+               },
+              
+               onClickRow: function(row, $el){
+               },
+               	onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+               columns: [{
+		        checkbox: true
+		       
+		    },{
+				   field: 'materialCode',
+				   title: '物料编码',
+				   sortable: true,
+				   sortName: 'materialCode'
+
+			   }
+			,{
+		        field: 'materialDesc',
+		        title: '物料描述',
+		        sortable: true,
+		        sortName: 'materialDesc'
+		       
+		    }
+			,{
+		        field: 'extendCode',
+		        title: '扩展编码',
+		        sortable: true,
+		        sortName: 'extendCode'
+		       
+		    }
+                   ,{
+                       field: 'extendDesc',
+                       title: '扩展描述',
+                       sortable: true,
+                       sortName: 'extendDesc'
+
+                   }
+                   ,{
+                       field: 'thirdClassList',
+                       title: '三级清单物料',
+                       sortable: true,
+                       sortName: 'thirdClassList'
+
+                   }
+                   ,{
+                       field: 'subclassDesc',
+                       title: '小类描述',
+                       sortable: true,
+                       sortName: 'subclassDesc'
+
+                   }
+
+
+		     ]
+		
+		});
+		
+		  
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+		 
+		  $('#leave1Table').bootstrapTable("toggleView");
+		}
+	  
+	  $('#leave1Table').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+                'check-all.bs.table uncheck-all.bs.table', function () {
+            $('#remove').prop('disabled', ! $('#leave1Table').bootstrapTable('getSelections').length);
+            $('#view,#edit').prop('disabled', $('#leave1Table').bootstrapTable('getSelections').length!=1);
+        });
+
+	  /**
+	   * 导出利库资源池基础信息表
+	   * */
+	$("#btnImport").click(function(){
+		jp.open({
+			type: 2,
+			area: [500, 200],
+			auto: true,
+			title:"导入数据",
+			content: "${ctx}/tag/importExcel" ,
+			btn: ['下载模板','确定', '关闭'],
+				btn1: function(index, layero){
+				  jp.downloadFile('${ctx}/preferredMaterials/import/template');
+			  },
+			btn2: function(index, layero){
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					iframeWin.contentWindow.importExcel('${ctx}/preferredMaterials/import', function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							refresh();
+						}else{
+							jp.error(data.msg);
+						}
+						jp.close(index);
+					});//调用保存事件
+					return false;
+			  },
+
+			  btn3: function(index){
+				//  jp.close(index);
+			   }
+		});
+	});
+
+
+    /**
+     * 导入物资需求表
+     * */
+    $("#importMaterial").click(function(){
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title:"导入数据",
+            content: "${ctx}/tag/importExcel" ,
+            btn: ['下载模板','确定', '关闭'],
+            btn1: function(index, layero){
+                jp.downloadFile('${ctx}/MaterialReportDetails/import/templateNew');
+            },
+            btn2: function(index, layero){
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/MaterialReportDetails/importVerify', function (data) {
+                    if(data.success){
+                        jp.success(data.msg);
+                        jp.downloadFile('${ctx}/MaterialReportDetails/exportVerify','finalAccount');//给个name是为了能够在某些条件下下载两个文件	refresh();
+
+                        refresh();
+                    }else{
+                        jp.error(data.msg);
+                    }
+                    jp.close(index);
+                });//调用保存事件
+                return false;
+            },
+
+            btn3: function(index){
+                //  jp.close(index);
+            }
+        });
+    });
+
+		
+	 $("#export").click(function(){//导出Excel文件
+			jp.downloadFile('${ctx}/preferredMaterials/export');
+	  });
+
+		    
+	  $("#search").click("click", function() {// 绑定查询按扭
+		  $('#leave1Table').bootstrapTable('refresh');
+		});
+	 
+	 $("#reset").click("click", function() {// 绑定查询按扭
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $("#searchForm  .select-item").html("");
+		  $('#leave1Table').bootstrapTable('refresh');
+		});
+		
+		$('#beginBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		
+	});
+		
+  function getIdSelections() {
+        return $.map($("#leave1Table").bootstrapTable('getSelections'), function (row) {
+            return row.id;
+        });
+    }
+  
+  function deleteAll(){
+
+		jp.confirm('确认要删除该优选物资记录吗？', function(){
+			jp.loading();  	
+			jp.get("${ctx}/preferredMaterials/deleteAll?ids=" + getIdSelections(), function(data){
+         	  		if(data.success){
+         	  			$('#leave1Table').bootstrapTable('refresh');
+         	  			jp.success(data.msg);
+         	  		}else{
+         	  			jp.error(data.msg);
+         	  		}
+         	  	})
+          	   
+		})
+  }
+
+    //刷新列表
+  function refresh(){
+  	$('#leave1Table').bootstrapTable('refresh');
+  }
+  
+
+
+
+</script>

src/main/webapp/webpage/modules/sg/balancedlibrary/preferredMaterials/preferredMaterialsList.jsp

@@ -0,0 +1,78 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>标准物资管理</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="preferredMaterialsList.js" %>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">优选物资列表</h3>
+	</div>
+	<div class="panel-body">
+	
+	<!-- 搜索 -->
+	<div id="search-collapse" class="collapse">
+		<div class="accordion-inner">
+			<form:form id="searchForm" modelAttribute="entity" 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>
+				<form:input path="materialCode" htmlEscape="false" maxlength="257"  class=" form-control"/>
+			</div>
+		 <div class="col-xs-12 col-sm-6 col-md-4">
+			<div style="margin-top:26px">
+			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+			  <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+			 </div>
+	    </div>	
+	</form:form>
+	</div>
+	</div>
+	
+	<!-- 工具栏 -->
+	<div id="toolbar">
+		<shiro:hasPermission name="sg:balancedlibrary:preferredMaterials:del">
+			<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
+				<i class="glyphicon glyphicon-remove"></i> 删除
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="sg:balancedlibrary:preferredMaterials:import">
+			<button id="btnImport" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导入优选物资
+			</button>
+		</shiro:hasPermission>
+
+		<shiro:hasPermission name="sg:balancedlibrary:preferredMaterials:export">
+			<button id="export" class="btn btn-warning">
+				<i class="fa fa-file-excel-o"></i> 导出
+			</button>
+		 </shiro:hasPermission>
+
+		<shiro:hasPermission name="sg:balancedlibrary:preferredMaterials:import">
+			<button id="importMaterial" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导入物资需求
+			</button>
+		</shiro:hasPermission>
+	</div>
+		
+	<!-- 表格 -->
+	<table id="leave1Table"   data-toolbar="#toolbar"></table>
+
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+        <shiro:hasPermission name="sg:balancedlibrary:preferredMaterials:del">
+        <li data-item="delete"><a>删除</a></li>
+        </shiro:hasPermission>
+        <li data-item="action1"><a>取消</a></li>
+    </ul>  
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/balancedlibrary/reportPerson/reportPersonForm.jsp

@@ -0,0 +1,63 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>物料替换</title>
+	<meta name="decorator" content="ani"/>
+	<script type="text/javascript">
+
+		$(document).ready(function() {
+
+	        $('#beginDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+	        $('#endDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+		});
+		function save() {
+            var isValidate = jp.validateForm('#inputForm');//校验表单
+            if(!isValidate){
+                return false;
+			}else{
+                jp.loading();
+                jp.post("${ctx}/reportPerson/save",$('#inputForm').serialize(),function(data){
+                    if(data.success){
+                        jp.getParent().refresh();
+                        var dialogIndex = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                        parent.layer.close(dialogIndex);
+                        jp.success(data.msg)
+
+                    }else{
+                        jp.error(data.msg);
+                    }
+                })
+			}
+
+        }
+	</script>
+</head>
+<body class="bg-white">
+		<form:form id="inputForm" modelAttribute="entity" class="form-horizontal">
+		<form:hidden path="id"/>	
+		<table class="table table-bordered">
+		   <tbody>
+				<tr>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>提报人：</label></td>
+					<td class="width-35">
+						<form:input path="reportPerson" htmlEscape="false" rows="4"    class="form-control required"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>提报部门：</label></td>
+					<td class="width-35">
+						<form:select path="reportDepartment" class="form-control">
+							<form:options items="${fns:getDictList('report_department')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</td>
+				</tr>
+		 	</tbody>
+		</table>
+	</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/balancedlibrary/reportPerson/reportPersonList.js

@@ -0,0 +1,229 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	$('#leave1Table').bootstrapTable({
+		 
+		  //请求方法
+               method: 'post',
+               //类型json
+               dataType: "json",
+               contentType: "application/x-www-form-urlencoded",
+               //显示检索按钮
+	           showSearch: true,
+               //显示刷新按钮
+               showRefresh: true,
+               //显示切换手机试图按钮
+               showToggle: true,
+               //显示 内容列下拉框
+    	       showColumns: true,
+    	       //显示到处按钮
+    	       showExport: true,
+    	       //显示切换分页按钮
+    	       showPaginationSwitch: true,
+    	       //最低显示2行
+    	       minimumCountColumns: 2,
+               //是否显示行间隔色
+               striped: true,
+               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
+               cache: false,    
+               //是否显示分页（*）  
+               pagination: true,   
+                //排序方式 
+               sortOrder: "asc",  
+               //初始化加载第一页，默认第一页
+               pageNumber:1,   
+               //每页的记录行数（*）   
+               pageSize: 10,  
+               //可供选择的每页的行数（*）    
+               pageList: [10, 25, 50, 100],
+               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+               url: "${ctx}/reportPerson/data",
+               //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+               //queryParamsType:'',   
+               ////查询参数,每次调用是会带上这个参数，可自定义                         
+               queryParams : function(params) {
+               	var searchParam = $("#searchForm").serializeJSON();
+               	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+               	searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+               	searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+                   return searchParam;
+               },
+               //分页方式：client客户端分页，server服务端分页（*）
+               sidePagination: "server",
+               contextMenuTrigger:"right",//pc端 按右键弹出菜单
+               contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
+               contextMenu: '#context-menu',
+               onContextMenuItem: function(row, $el){
+                   if($el.data("item") == "edit"){
+                   		edit(row.id);
+                   }else if($el.data("item") == "view"){
+                       view(row.id);
+                   } else if($el.data("item") == "delete"){
+                        jp.confirm('确认要删除该提报人吗？', function(){
+                       	jp.loading();
+                       	jp.get("${ctx}/test/one/dialog/leave1/delete?id="+row.id, function(data){
+                   	  		if(data.success){
+                   	  			$('#leave1Table').bootstrapTable('refresh');
+                   	  			jp.success(data.msg);
+                   	  		}else{
+                   	  			jp.error(data.msg);
+                   	  		}
+                   	  	})
+                   	   
+                   	});
+                      
+                   } 
+               },
+              
+               onClickRow: function(row, $el){
+               },
+               	onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+               columns: [{
+		        checkbox: true
+		       
+		    }
+			,{
+		        field: 'reportPerson',
+		        title: '提报人',
+		        sortable: true,
+		        sortName: 'reportPerson'
+		       
+		    }
+			,{
+		        field: 'reportDepartment',
+		        title: '提报人部门',
+		        sortable: true,
+                formatter:function(value, row , index){
+		        	return jp.getDictLabel(${fns:toJson(fns:getDictList('report_department'))}, value, "-");
+		        }
+		       
+		    }
+		     ]
+		
+		});
+		
+		  
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+		 
+		  $('#leave1Table').bootstrapTable("toggleView");
+		}
+	  
+	  $('#leave1Table').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+                'check-all.bs.table uncheck-all.bs.table', function () {
+            $('#remove').prop('disabled', ! $('#leave1Table').bootstrapTable('getSelections').length);
+            $('#view,#edit').prop('disabled', $('#leave1Table').bootstrapTable('getSelections').length!=1);
+        });
+		  
+		// $("#btnImport").click(function(){
+		// 	jp.open({
+		// 	    type: 2,
+      //           area: [500, 200],
+      //           auto: true,
+		// 	    title:"导入数据",
+		// 	    content: "${ctx}/tag/importExcel" ,
+		// 	    btn: ['下载模板','确定', '关闭'],
+		// 		    btn1: function(index, layero){
+		// 			  jp.downloadFile('${ctx}/replaceMaterial/import/template');
+		// 		  },
+		// 	    btn2: function(index, layero){
+		// 		        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+		// 				iframeWin.contentWindow.importExcel('${ctx}/replaceMaterial/import', function (data) {
+		// 					if(data.success){
+		// 						jp.success(data.msg);
+		// 						refresh();
+		// 					}else{
+		// 						jp.error(data.msg);
+		// 					}
+      //                       jp.close(index);
+		// 				});//调用保存事件
+		// 				return false;
+		// 		  },
+     //
+		// 		  btn3: function(index){
+		// 			//  jp.close(index);
+	 //    	       }
+		// 	});
+		// });
+		//
+		//
+	 // $("#export").click(function(){//导出Excel文件
+		// 	jp.downloadFile('${ctx}/replaceMaterial/export');
+	 //  });
+
+		    
+	  $("#search").click("click", function() {// 绑定查询按扭
+		  $('#leave1Table').bootstrapTable('refresh');
+		});
+	 
+	 $("#reset").click("click", function() {// 绑定查询按扭
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $("#searchForm  .select-item").html("");
+		  $('#leave1Table').bootstrapTable('refresh');
+		});
+		
+		$('#beginBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		
+	});
+		
+  function getIdSelections() {
+        return $.map($("#leave1Table").bootstrapTable('getSelections'), function (row) {
+            return row.id
+        });
+    }
+  
+  function deleteAll(){
+
+		jp.confirm('确认要删除提报人吗？', function(){
+			jp.loading();  	
+			jp.get("${ctx}/reportPerson/deleteAll?ids=" + getIdSelections(), function(data){
+         	  		if(data.success){
+         	  			$('#leave1Table').bootstrapTable('refresh');
+         	  			jp.success(data.msg);
+         	  		}else{
+         	  			jp.error(data.msg);
+         	  		}
+         	  	})
+          	   
+		})
+  }
+
+    //刷新列表
+  function refresh(){
+  	$('#leave1Table').bootstrapTable('refresh');
+  }
+  
+   function add(){
+	  jp.openSaveDialog('新增物料替换', "${ctx}/reportPerson/form",'800px', '500px');
+  }
+
+
+  
+   function edit(id){//没有权限时，不显示确定按钮
+       if(id == undefined){
+	      id = getIdSelections();
+	}
+	jp.openSaveDialog('编辑物料替换', "${ctx}/reportPerson/form?id=" + id, '800px', '500px');
+  }
+  
+ function view(id){//没有权限时，不显示确定按钮
+      if(id == undefined){
+             id = getIdSelections();
+      }
+        jp.openViewDialog('查看物料替换', "${ctx}/test/one/dialog/leave1/form?id=" + id, '800px', '500px');
+ }
+
+
+
+</script>

src/main/webapp/webpage/modules/sg/balancedlibrary/reportPerson/reportPersonList.jsp

@@ -0,0 +1,81 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>提报人管理</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="reportPersonList.js" %>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">提报人列表</h3>
+	</div>
+	<div class="panel-body">
+	
+	<!-- 搜索 -->
+	<div id="search-collapse" class="collapse">
+		<div class="accordion-inner">
+			<form:form id="searchForm" modelAttribute="entity" 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>
+				<form:input path="reportPerson" htmlEscape="false" maxlength="257"  class=" form-control"/>
+			</div>
+		 <div class="col-xs-12 col-sm-6 col-md-4">
+			<div style="margin-top:26px">
+			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+			  <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+			 </div>
+	    </div>	
+	</form:form>
+	</div>
+	</div>
+	
+	<!-- 工具栏 -->
+	<div id="toolbar">
+		<shiro:hasPermission name="sg:balancedlibrary:reportPerson:add">
+			<button id="add" class="btn btn-primary" onclick="add()">
+				<i class="glyphicon glyphicon-plus"></i> 新建
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="sg:balancedlibrary:reportPerson:edit">
+			<button id="edit" class="btn btn-success" disabled onclick="edit()">
+				<i class="glyphicon glyphicon-edit"></i> 修改
+			</button>
+		</shiro:hasPermission>
+			<shiro:hasPermission name="sg:balancedlibrary:reportPerson:del">
+				<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
+	            	<i class="glyphicon glyphicon-remove"></i> 删除
+	        	</button>
+			</shiro:hasPermission>
+			<%--<shiro:hasPermission name="sg:balancedlibrary:ReplaceMaterial:import">--%>
+				<%--<button id="btnImport" class="btn btn-info">--%>
+					<%--<i class="fa fa-folder-open-o"></i> 导入--%>
+				<%--</button>--%>
+			<%--</shiro:hasPermission>--%>
+			<%--<shiro:hasPermission name="sg:balancedlibrary:ReplaceMaterial:export">--%>
+				<%--<button id="export" class="btn btn-warning">--%>
+					<%--<i class="fa fa-file-excel-o"></i> 导出--%>
+				<%--</button>--%>
+			 <%--</shiro:hasPermission>--%>
+		    </div>
+		
+	<!-- 表格 -->
+	<table id="leave1Table"   data-toolbar="#toolbar"></table>
+
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+        <shiro:hasPermission name="sg:balancedlibrary:reportPerson:del">
+        <li data-item="delete"><a>删除</a></li>
+        </shiro:hasPermission>
+        <li data-item="action1"><a>取消</a></li>
+    </ul>  
+	</div>
+	</div>
+	</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/balancedlibrary/standardMaterials/standardMaterialsList.js

@@ -0,0 +1,255 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	$('#leave1Table').bootstrapTable({
+		 
+		  //请求方法
+               method: 'post',
+               //类型json
+               dataType: "json",
+               contentType: "application/x-www-form-urlencoded",
+               //显示检索按钮
+	           showSearch: true,
+               //显示刷新按钮
+               showRefresh: true,
+               //显示切换手机试图按钮
+               showToggle: true,
+               //显示 内容列下拉框
+    	       showColumns: true,
+    	       //显示到处按钮
+    	       showExport: true,
+    	       //显示切换分页按钮
+    	       showPaginationSwitch: true,
+    	       //最低显示2行
+    	       minimumCountColumns: 2,
+               //是否显示行间隔色
+               striped: true,
+               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
+               cache: false,    
+               //是否显示分页（*）  
+               pagination: true,   
+                //排序方式 
+               sortOrder: "asc",  
+               //初始化加载第一页，默认第一页
+               pageNumber:1,   
+               //每页的记录行数（*）   
+               pageSize: 10,  
+               //可供选择的每页的行数（*）    
+               pageList: [10, 25, 50, 100],
+               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+               url: "${ctx}/standardMaterials/data",
+               //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+               //queryParamsType:'',   
+               ////查询参数,每次调用是会带上这个参数，可自定义                         
+               queryParams : function(params) {
+               	var searchParam = $("#searchForm").serializeJSON();
+               	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
+               	searchParam.pageSize = params.limit === undefined? -1 : params.limit;
+               	searchParam.orderBy = params.sort === undefined? "" : params.sort+ " "+  params.order;
+                   return searchParam;
+               },
+               //分页方式：client客户端分页，server服务端分页（*）
+               sidePagination: "server",
+               contextMenuTrigger:"right",//pc端 按右键弹出菜单
+               contextMenuTriggerMobile:"press",//手机端 弹出菜单，click：单击， press：长按。
+               contextMenu: '#context-menu',
+               onContextMenuItem: function(row, $el){
+                   if($el.data("item") == "edit"){
+                   		edit(row.id);
+                   }else if($el.data("item") == "view"){
+                       view(row.id);
+                   } else if($el.data("item") == "delete"){
+                        jp.confirm('确认要删除该标准物资记录吗？', function(){
+                       	jp.loading();
+                       	jp.get("${ctx}/standardMaterials/delete?id="+row.id, function(data){
+                   	  		if(data.success){
+                   	  			$('#leave1Table').bootstrapTable('refresh');
+                   	  			jp.success(data.msg);
+                   	  		}else{
+                   	  			jp.error(data.msg);
+                   	  		}
+                   	  	})
+                   	   
+                   	});
+                      
+                   } 
+               },
+              
+               onClickRow: function(row, $el){
+               },
+               	onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+               columns: [{
+		        checkbox: true
+		       
+		    },{
+				   field: 'materialCode',
+				   title: '物料编码',
+				   sortable: true,
+				   sortName: 'materialCode'
+
+			   }
+			,{
+		        field: 'materialDesc',
+		        title: '物料描述',
+		        sortable: true,
+		        sortName: 'materialDesc'
+		       
+		    }
+			,{
+		        field: 'purchaseStandardId',
+		        title: '采购标准标识',
+		        sortable: true,
+		        sortName: 'purchaseStandardId'
+		       
+		    }
+
+
+		     ]
+		
+		});
+		
+		  
+	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+		 
+		  $('#leave1Table').bootstrapTable("toggleView");
+		}
+	  
+	  $('#leave1Table').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+                'check-all.bs.table uncheck-all.bs.table', function () {
+            $('#remove').prop('disabled', ! $('#leave1Table').bootstrapTable('getSelections').length);
+            $('#view,#edit').prop('disabled', $('#leave1Table').bootstrapTable('getSelections').length!=1);
+        });
+
+	  /**
+	   * 导出利库资源池基础信息表
+	   * */
+	$("#btnImport").click(function(){
+		jp.open({
+			type: 2,
+			area: [500, 200],
+			auto: true,
+			title:"导入数据",
+			content: "${ctx}/tag/importExcel" ,
+			btn: ['下载模板','确定', '关闭'],
+				btn1: function(index, layero){
+				  jp.downloadFile('${ctx}/standardMaterials/import/template');
+			  },
+			btn2: function(index, layero){
+					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					iframeWin.contentWindow.importExcel('${ctx}/standardMaterials/import', function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							refresh();
+						}else{
+							jp.error(data.msg);
+						}
+						jp.close(index);
+					});//调用保存事件
+					return false;
+			  },
+
+			  btn3: function(index){
+				//  jp.close(index);
+			   }
+		});
+	});
+
+
+    /**
+     * 导入物资需求表
+     * */
+    $("#importMaterial").click(function(){
+        jp.open({
+            type: 2,
+            area: [500, 200],
+            auto: true,
+            title:"导入数据",
+            content: "${ctx}/tag/importExcel" ,
+            btn: ['下载模板','确定', '关闭'],
+            btn1: function(index, layero){
+                jp.downloadFile('${ctx}/MaterialReportDetails/import/templateNew');
+            },
+            btn2: function(index, layero){
+                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                iframeWin.contentWindow.importExcel('${ctx}/MaterialReportDetails/importVerify', function (data) {
+                    if(data.success){
+                        jp.success(data.msg);
+                        jp.downloadFile('${ctx}/MaterialReportDetails/exportVerify','finalAccount');//给个name是为了能够在某些条件下下载两个文件	refresh();
+
+                        refresh();
+                    }else{
+                        jp.error(data.msg);
+                    }
+                    jp.close(index);
+                });//调用保存事件
+                return false;
+            },
+
+            btn3: function(index){
+                //  jp.close(index);
+            }
+        });
+    });
+		
+	 $("#export").click(function(){//导出Excel文件
+			jp.downloadFile('${ctx}/standardMaterials/export');
+	  });
+
+		    
+	  $("#search").click("click", function() {// 绑定查询按扭
+		  $('#leave1Table').bootstrapTable('refresh');
+		});
+	 
+	 $("#reset").click("click", function() {// 绑定查询按扭
+		  $("#searchForm  input").val("");
+		  $("#searchForm  select").val("");
+		  $("#searchForm  .select-item").html("");
+		  $('#leave1Table').bootstrapTable('refresh');
+		});
+		
+		$('#beginBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endBeginDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		$('#endDate').datetimepicker({
+			 format: "YYYY-MM-DD HH:mm:ss"
+		});
+		
+	});
+		
+  function getIdSelections() {
+        return $.map($("#leave1Table").bootstrapTable('getSelections'), function (row) {
+            return row.id;
+        });
+    }
+  
+  function deleteAll(){
+
+		jp.confirm('确认要删除该标准物资记录吗？', function(){
+			jp.loading();  	
+			jp.get("${ctx}/standardMaterials/deleteAll?ids=" + getIdSelections(), function(data){
+         	  		if(data.success){
+         	  			$('#leave1Table').bootstrapTable('refresh');
+         	  			jp.success(data.msg);
+         	  		}else{
+         	  			jp.error(data.msg);
+         	  		}
+         	  	})
+          	   
+		})
+  }
+
+    //刷新列表
+  function refresh(){
+  	$('#leave1Table').bootstrapTable('refresh');
+  }
+  
+
+
+
+</script>

src/main/webapp/webpage/modules/sg/balancedlibrary/standardMaterials/standardMaterialsList.jsp

@@ -0,0 +1,77 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>标准物资管理</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="decorator" content="ani"/>
+	<%@ include file="/webpage/include/bootstraptable.jsp"%>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<%@include file="standardMaterialsList.js" %>
+</head>
+<body>
+	<div class="wrapper wrapper-content">
+	<div class="panel panel-primary">
+	<div class="panel-heading">
+		<h3 class="panel-title">标准物资列表</h3>
+	</div>
+	<div class="panel-body">
+	
+	<!-- 搜索 -->
+	<div id="search-collapse" class="collapse">
+		<div class="accordion-inner">
+			<form:form id="searchForm" modelAttribute="entity" 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>
+				<form:input path="materialCode" htmlEscape="false" maxlength="257"  class=" form-control"/>
+			</div>
+		 <div class="col-xs-12 col-sm-6 col-md-4">
+			<div style="margin-top:26px">
+			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
+			  <a  id="reset" class="btn btn-primary btn-rounded  btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
+			 </div>
+	    </div>	
+	</form:form>
+	</div>
+	</div>
+	
+	<!-- 工具栏 -->
+	<div id="toolbar">
+		<shiro:hasPermission name="sg:balancedlibrary:standardMaterials:del">
+			<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
+				<i class="glyphicon glyphicon-remove"></i> 删除
+			</button>
+		</shiro:hasPermission>
+		<shiro:hasPermission name="sg:balancedlibrary:standardMaterials:import">
+			<button id="btnImport" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导入标准物资
+			</button>
+		</shiro:hasPermission>
+
+		<shiro:hasPermission name="sg:balancedlibrary:standardMaterials:export">
+			<button id="export" class="btn btn-warning">
+				<i class="fa fa-file-excel-o"></i> 导出
+			</button>
+		 </shiro:hasPermission>
+		<shiro:hasPermission name="sg:balancedlibrary:standardMaterials:import">
+			<button id="importMaterial" class="btn btn-info">
+				<i class="fa fa-folder-open-o"></i> 导入物资需求
+			</button>
+		</shiro:hasPermission>
+	</div>
+		
+	<!-- 表格 -->
+	<table id="leave1Table"   data-toolbar="#toolbar"></table>
+
+    <!-- context menu -->
+    <ul id="context-menu" class="dropdown-menu">
+        <shiro:hasPermission name="sg:balancedlibrary:standardMaterials:del">
+        <li data-item="delete"><a>删除</a></li>
+        </shiro:hasPermission>
+        <li data-item="action1"><a>取消</a></li>
+    </ul>  
+	</div>
+	</div>
+	</div>
+</body>
+</html>