项目管理列表页展示完成，查询完成，导入欠供物资完成，导入综合信息完成，更加项目定义号查看下属物料情况完成

src/main/java/com/jeeplus/modules/test/information/entity/Information.java

@@ -1,22 +1,12 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.test.information.entity;
+package com.jeeplus.modules.sg.information.entity;
 
-import com.jeeplus.modules.sys.entity.User;
-import javax.validation.constraints.NotNull;
-import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.sys.entity.Area;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import java.util.List;
-import com.google.common.collect.Lists;
 
 import com.jeeplus.core.persistence.DataEntity;
-import com.jeeplus.common.utils.excel.annotation.ExcelField;
-import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataChild11;
-import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataChild12;
-import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataChild13;
 
 /**
  * 项目信息Entity

src/main/java/com/jeeplus/modules/test/information/mapper/InformationMapper.java

@@ -1,12 +1,11 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.test.information.mapper;
+package com.jeeplus.modules.sg.information.mapper;
 
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
-import com.jeeplus.modules.test.information.entity.Information;
-import org.apache.ibatis.annotations.Param;
+import com.jeeplus.modules.sg.information.entity.Information;
 
 import java.util.List;
 

src/main/java/com/jeeplus/modules/test/information/mapper/xml/InformationMapper.xml

@@ -1,6 +1,6 @@
 <?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.test.information.mapper.InformationMapper">
+<mapper namespace="com.jeeplus.modules.sg.information.mapper.InformationMapper">
 
     <sql id="informationColumns">
 		project_Id,
@@ -10,17 +10,17 @@
 		second_Units,
 		first_Units
 	</sql>
-    <select id="findAllInformationList" resultType="com.jeeplus.modules.test.information.entity.Information">
+    <select id="findAllInformationList" resultType="com.jeeplus.modules.sg.information.entity.Information">
 		select project_id,project_name from project_information
 	</select>
 
-    <update id="updateInformationDate" parameterType="com.jeeplus.modules.test.information.entity.Information">
+    <update id="updateInformationDate" parameterType="com.jeeplus.modules.sg.information.entity.Information">
 		update project_information set
 		approvalDate = #{approvalDate}
 		where project_Id = #{projectId} and project_Name = #{projectName}
 	</update>
 
-    <select id="findInformationByID" resultType="com.jeeplus.modules.test.information.entity.Information">
+    <select id="findInformationByID" resultType="com.jeeplus.modules.sg.information.entity.Information">
 		select * from project_information where project_Id = #{projectId} and project_Name = #{projectName}
 	</select>
 
@@ -79,7 +79,6 @@
 			project_Id,
 			project_Name,
 			department,
-			approvalDate,
 			second_Units,
 			first_Units,
 			create_by,
@@ -92,7 +91,6 @@
 			#{projectId},
 			#{projectName},
 			#{department},
-			#{approvalDate},
 			#{secondUnits},
 			#{firstUnits},
 			#{createBy.id},
@@ -105,7 +103,6 @@
 			project_Id = #{projectId},
 			project_Name = #{projectName},
 			department = #{department},
-			approvalDate = #{approvalDate},
 			second_Units = #{secondUnits},
 			first_Units = #{firstUnits},
 			create_by = #{createBy.id},

src/main/java/com/jeeplus/modules/test/information/service/InformationService.java

@@ -1,29 +1,18 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.test.information.service;
+package com.jeeplus.modules.sg.information.service;
 
 import java.util.List;
 
-import com.jeeplus.modules.test.information.entity.Information;
-import com.jeeplus.modules.test.information.mapper.InformationMapper;
+import com.jeeplus.modules.sg.information.entity.Information;
+import com.jeeplus.modules.sg.information.mapper.InformationMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.service.CrudService;
-import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataMain1;
-import com.jeeplus.modules.test.onetomany.dialog.mapper.TestDataMain1Mapper;
-import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataChild11;
-import com.jeeplus.modules.test.onetomany.dialog.mapper.TestDataChild11Mapper;
-import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataChild12;
-import com.jeeplus.modules.test.onetomany.dialog.mapper.TestDataChild12Mapper;
-import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataChild13;
-import com.jeeplus.modules.test.onetomany.dialog.mapper.TestDataChild13Mapper;
-
-import javax.annotation.Resource;
 
 /**
  * 项目管理Service

src/main/java/com/jeeplus/modules/test/information/web/InformationController.java

@@ -1,48 +1,36 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.test.information.web;
+package com.jeeplus.modules.sg.information.web;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
 
-import com.jeeplus.modules.test.information.entity.Information;
-import com.jeeplus.modules.test.information.material.entity.Material;
-import com.jeeplus.modules.test.information.material.service.MaterialService;
-import com.jeeplus.modules.test.information.service.InformationService;
-import com.sun.tools.javac.util.Convert;
-import io.swagger.models.auth.In;
-import net.sourceforge.jtds.jdbc.DateTime;
+
+import com.jeeplus.modules.sg.information.entity.Information;
+import com.jeeplus.modules.sg.information.service.InformationService;
+import com.jeeplus.modules.sg.material.entity.Material;
+import com.jeeplus.modules.sg.material.service.MaterialService;
 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.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.google.common.collect.Lists;
-import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.config.Global;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
-import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataMain1;
-import com.jeeplus.modules.test.onetomany.dialog.service.TestDataMain1Service;
 
 /**
  * 项目管理列表Controller
@@ -50,12 +38,11 @@ import com.jeeplus.modules.test.onetomany.dialog.service.TestDataMain1Service;
  * @version
  */
 @Controller
-@RequestMapping(value = "${adminPath}/test/information/information")
+@RequestMapping(value = "${adminPath}/sg/information/information")
 public class InformationController extends BaseController {
 
 	@Autowired
 	private InformationService informationService;
-
 	@Autowired
 	private MaterialService materialService;
 	
@@ -78,7 +65,7 @@ public class InformationController extends BaseController {
 	@RequestMapping(value = {"list", ""})
 	public String list(Information information, Model model) {
 		model.addAttribute("informationList", information);
-		return "modules/test/information/informationList";
+		return "modules/sg/information/informationList";
 	}
 	
 		/**
@@ -95,7 +82,7 @@ public class InformationController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(Information information, Model model) {
 		model.addAttribute("Information", information);
-		return "modules/test/information/informationForm";
+		return "modules/sg/information/informationForm";
 	}
 
 

src/main/java/com/jeeplus/modules/test/information/material/entity/Material.java

@@ -1,7 +1,7 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.test.information.material.entity;
+package com.jeeplus.modules.sg.material.entity;
 
 import com.jeeplus.core.persistence.DataEntity;
 

src/main/java/com/jeeplus/modules/test/information/material/mapper/MaterialMapper.java

@@ -1,12 +1,11 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.test.information.material.mapper;
+package com.jeeplus.modules.sg.material.mapper;
 
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
-import com.jeeplus.modules.test.information.entity.Information;
-import com.jeeplus.modules.test.information.material.entity.Material;
+import com.jeeplus.modules.sg.material.entity.Material;
 
 /**
  * 项目管理MAPPER接口
@@ -16,4 +15,6 @@ import com.jeeplus.modules.test.information.material.entity.Material;
 @MyBatisMapper
 public interface MaterialMapper extends BaseMapper<Material> {
     Material findByMaterialId(Material material);
+
+    Integer updateInfo(Material material);
 }

src/main/java/com/jeeplus/modules/test/information/material/mapper/xml/MaterialMapper.xml

@@ -1,6 +1,6 @@
 <?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.test.information.material.mapper.MaterialMapper">
+<mapper namespace="com.jeeplus.modules.sg.material.mapper.MaterialMapper">
     
 	<sql id="materialColumns">
 		project_id,
@@ -21,13 +21,16 @@
 		info
 	</sql>
 
-	<select id="findByMaterialId" resultType="com.jeeplus.modules.test.information.material.entity.Material">
+	<select id="findByMaterialId" resultType="com.jeeplus.modules.sg.material.entity.Material">
 		SELECT
 		<include refid="materialColumns"/>
 		FROM material_information
 		where project_Id = #{projectId} and infor_id = #{inforId} and material_name = #{materialName}
 	</select>
-	
+
+	<update id="updateInfo" parameterType="com.jeeplus.modules.sg.material.entity.Material">
+		update material_information set status = #{status},info = #{info} where id = #{id};
+	</update>
 	<select id="findList" resultType="Material" >
 		SELECT 
 			<include refid="materialColumns"/>
@@ -112,16 +115,18 @@
 		)on duplicate key update
 			id = #{id},
 			project_Id = #{projectId},
-			infor_id = #{infor_id},
-			material_name = #{material_name},
-			outbound_amount = #{outbound_amount},
-			authorized_amount = #{authorized_amount},
+			infor_id = #{inforId},
+			material_name = #{materialName},
+			outbound_amount = #{outboundAmount},
+			authorized_amount = #{authorizedAmount},
 			difference = #{difference},
-			authorized_number = #{authorized_number},
+			outbound_number=#{outboundNumber},
+			authorized_number = #{authorizedNumber},
 			price = #{price},
 			unit = #{unit},
-			material_small = #{material_small},
-			material_mid = #{material_mid},
+			material_small = #{materialSmall},
+			material_mid = #{materialMid},
+			material_big = #{materialBig},
 			isBack = #{isBack},
 			status = #{status},
 			info = #{info},

src/main/java/com/jeeplus/modules/test/information/material/service/MaterialService.java

@@ -1,14 +1,12 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.test.information.material.service;
+package com.jeeplus.modules.sg.material.service;
 
 import java.util.List;
 
-import com.jeeplus.modules.test.information.entity.Information;
-import com.jeeplus.modules.test.information.mapper.InformationMapper;
-import com.jeeplus.modules.test.information.material.entity.Material;
-import com.jeeplus.modules.test.information.material.mapper.MaterialMapper;
+import com.jeeplus.modules.sg.material.entity.Material;
+import com.jeeplus.modules.sg.material.mapper.MaterialMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,6 +44,10 @@ public class MaterialService extends CrudService<MaterialMapper, Material> {
 		super.save(entity);
 	}
 
+	public Integer updateInfo(Material material) {
+		return materialMapper.updateInfo(material);
+	}
+
 	public Material findByMaterialId(Material material){
 		return materialMapper.findByMaterialId(material);
 	}

src/main/java/com/jeeplus/modules/test/information/material/web/MaterialController.java

@@ -1,20 +1,16 @@
 /**
  * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
  */
-package com.jeeplus.modules.test.information.material.web;
+package com.jeeplus.modules.sg.material.web;
 
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
 
-import com.jeeplus.modules.test.information.entity.Information;
-import com.jeeplus.modules.test.information.material.entity.Material;
-import com.jeeplus.modules.test.information.material.service.MaterialService;
-import com.jeeplus.modules.test.information.service.InformationService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import com.jeeplus.modules.sg.information.entity.Information;
+import com.jeeplus.modules.sg.material.entity.Material;
+import com.jeeplus.modules.sg.material.service.MaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -22,17 +18,10 @@ 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 com.google.common.collect.Lists;
-import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.common.utils.excel.ImportExcel;
-import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataMain1;
 
 /**
  * 物料详情Controller
@@ -40,7 +29,7 @@ import com.jeeplus.modules.test.onetomany.dialog.entity.TestDataMain1;
  * @version
  */
 @Controller
-@RequestMapping(value = "${adminPath}/test/information/material")
+@RequestMapping(value = "${adminPath}/sg/material")
 public class MaterialController extends BaseController {
 
 	@Autowired
@@ -65,7 +54,7 @@ public class MaterialController extends BaseController {
 	@RequestMapping(value = {"list", ""})
 	public String list(Material material, Model model) {
 		model.addAttribute("materialList", material);
-		return "modules/test/information/material/materialList";
+		return "modules/sg/material/materialList";
 	}
 
 
@@ -83,7 +72,18 @@ public class MaterialController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(Information information, Model model) {
 		model.addAttribute("Information", information);
-		return "modules/test/information/material/materialForm";
+		return "modules/sg/material/materialForm";
+	}
+
+	@RequestMapping(value = "update")
+	@ResponseBody
+	public String updateInfo(Material material) {
+		Integer s = materialService.updateInfo(material);
+		if (s > 0 ) {
+			return "1";
+		} else {
+			return "2";
+		}
 	}
 /*
 	*/

src/main/webapp/webpage/modules/test/information/informationList.js

@@ -5,7 +5,7 @@ $(document).ready(function() {
 
 	window.operateEvents = {
 		'click #TableView': function (e, value, row, index) {
-			jp.openViewDialog('查看', "${ctx}/test/information/material?projectId="+row.projectId, '1000px', '800px');
+			jp.openViewDialog('查看', "${ctx}/sg/material?projectId="+row.projectId, '1000px', '800px');
 		}
 	};
 
@@ -45,7 +45,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
-               url: "${ctx}/test/information/information/data",
+               url: "${ctx}/sg/information/information/data",
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',
                ////查询参数,每次调用是会带上这个参数，可自定义
@@ -140,7 +140,7 @@ $(document).ready(function() {
 				btn: ['确定', '关闭'],
 				btn1: function(index, layero){
 					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-					iframeWin.contentWindow.importExcel('${ctx}/test/information/information/import', function (data) {
+					iframeWin.contentWindow.importExcel('${ctx}/sg/information/information/import', function (data) {
 						if(data.success){
 							jp.success(data.msg);
 							refresh();
@@ -167,7 +167,7 @@ $(document).ready(function() {
 			btn: ['确定', '关闭'],
 			btn1: function(index, layero){
 				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-				iframeWin.contentWindow.importExcel('${ctx}/test/information/information/importCom', function (data) {
+				iframeWin.contentWindow.importExcel('${ctx}/sg/information/information/importCom', function (data) {
 					if(data.success){
 						jp.success(data.msg);
 						refresh();
@@ -209,12 +209,7 @@ $(document).ready(function() {
   }
 
 
- function view(id){//没有权限时，不显示确定按钮
-      if(id == undefined){
-             id = getIdSelections();
-      }
-        jp.openViewDialog('查看票务代理', "${ctx}/test/information/information/form?id=" + id, '800px', '500px');
- }
+
 
 
 	function addRow(list, idx, tpl, row){

src/main/webapp/webpage/modules/sg/material/materialForm.jsp

@@ -0,0 +1,62 @@
+<%@ 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() {
+	        $('#inDate').datetimepicker({
+				 format: "YYYY-MM-DD HH:mm:ss"
+		    });
+			$("#saveInfo").click(function () {
+				$.ajax({
+					url:"/${ctx}/sg/material/update",
+					type:"post",
+					data: $("form").serialize(),
+					dataType:"json",
+					success:function (data) {
+						if (data == "1") {
+							alert("修改成功!");
+							window.close();
+						} else {
+							alert("修改失败!");
+							window.close();
+						}
+					}
+				})
+			})
+		});
+	</script>
+</head>
+<body class="bg-white">
+		<form:form id="inputForm" modelAttribute="material" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+		<table class="table table-bordered" style="margin: 0 auto;text-align: center;width: 600px">
+		   <tbody>
+				<tr>
+					<td class="width-35" style="text-align: center;margin: 0 auto">
+						<form:select cssStyle="width: 300px;margin: 0 auto" path="status" cssClass="form-control" htmlEscape="false">
+							<form:option value="施工单位放弃补领">施工单位放弃补领</form:option>
+							<form:option value="多领物资抵扣施工费">多领物资抵扣施工费</form:option>
+							<form:option value="结算审计错误">结算审计错误</form:option>
+							<form:option value="自定义">自定义</form:option>
+						</form:select>
+					</td>
+				</tr>
+				<tr class="">
+					<td class="width-35" style="text-align: center;margin: 0 auto">
+						<form:textarea cssStyle="width: 300px;margin: 0 auto" path="info" htmlEscape="false" cssClass="form-control"/>
+					</td>
+				</tr>
+				<tr>
+					<td class="width-35" style="text-align: center;margin: 0 auto">
+						<input type="button" id="saveInfo" value="保存" onclick="saveInfo()" class="btn btn-primary btn-block btn-lg btn-parsley"/>
+					</td>
+		  		</tr>
+		 	</tbody>
+		</table>
+		</form:form>
+</body>
+</html>

src/main/webapp/webpage/modules/test/information/material/materialList.js

@@ -5,7 +5,7 @@ $(document).ready(function() {
 
 	window.operateEvents = {
 		'click #TableView': function (e, value, row, index) {
-			jp.openViewDialog('查看票务代理', "${ctx}/test/information/Material/list?projectId=" + row.projectId, '1000px', '800px');
+			jp.openViewDialog('查看票务代理', "${ctx}/sg/material/form?projectId=" + row.projectId, '1000px', '800px');
 		}
 	};
 
@@ -45,7 +45,7 @@ $(document).ready(function() {
                //可供选择的每页的行数（*）
                pageList: [10, 25, 50, 100],
                //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
-               url: "${ctx}/test/information/material/data",
+               url: "${ctx}/sg/material/data",
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
                //queryParamsType:'',
                ////查询参数,每次调用是会带上这个参数，可自定义
@@ -143,7 +143,7 @@ $(document).ready(function() {
 			   sortName: 'status'
 		   },{
 			   field: 'operate',
-			   title: '操作',
+			   title: '调整物料情况',
 			   width: '80px',
 			   events: operateEvents,
 			   formatter: operateFormatter
@@ -167,59 +167,7 @@ $(document).ready(function() {
             $('#view,#edit').prop('disabled', $('#informationTable').bootstrapTable('getSelections').length!=1);
         });
 
-	  	$("#btnInformation").click(function () {
-			jp.open({
-				type: 2,
-				area: [500, 200],
-				auto: true,
-				title:"导入数据",
-				content: "${ctx}/tag/importExcel" ,
-				btn: ['确定', '关闭'],
-				btn1: function(index, layero){
-					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-					iframeWin.contentWindow.importExcel('${ctx}/test/information/information/import', function (data) {
-						if(data.success){
-							jp.success(data.msg);
-							refresh();
-						}else{
-							jp.error(data.msg);
-						}
-						jp.close(index);
-					});//调用保存事件
-					return false;
-				},
-				btn2: function(index){
-					jp.close(index);
-				}
-			})
-		})
 
-	$("#btnCom").click(function () {
-		jp.open({
-			type: 2,
-			area: [500, 200],
-			auto: true,
-			title:"导入数据",
-			content: "${ctx}/tag/importExcel" ,
-			btn: ['确定', '关闭'],
-			btn1: function(index, layero){
-				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-				iframeWin.contentWindow.importExcel('${ctx}/test/information/information/importCom', function (data) {
-					if(data.success){
-						jp.success(data.msg);
-						refresh();
-					}else{
-						jp.error(data.msg);
-					}
-					jp.close(index);
-				});//调用保存事件
-				return false;
-			},
-			btn2: function(index){
-				jp.close(index);
-			}
-		})
-	})
 
 	  $("#search").click("click", function() {// 绑定查询按扭
 		  $('#informationTable').bootstrapTable('refresh');
@@ -246,12 +194,7 @@ $(document).ready(function() {
   }
 
 
- function view(id){//没有权限时，不显示确定按钮
-      if(id == undefined){
-             id = getIdSelections();
-      }
-        jp.openViewDialog('查看票务代理', "${ctx}/test/information/information/form?id=" + id, '800px', '500px');
- }
+
 
 
 	function addRow(list, idx, tpl, row){

src/main/webapp/webpage/modules/test/information/material/materialForm.jsp

@@ -1,64 +0,0 @@
-<%@ 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() {
-	        $('#inDate').datetimepicker({
-				 format: "YYYY-MM-DD HH:mm:ss"
-		    });
-		});
-	</script>
-</head>
-<body class="bg-white">
-		<form:form id="inputForm" modelAttribute="material" method="post" 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>1：</label></td>
-					<td class="width-35">
-						<form:input path="projectId" htmlEscape="false" cssClass="form-control"/>
-					</td>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>2：</label></td>
-					<td class="width-35">
-						<form:input path="projectName" htmlEscape="false" cssClass="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>3：</label></td>
-					<td class="width-35">
-						<form:input path="department" htmlEscape="false" cssClass="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>4：</label></td>
-					<td class="width-35">
-						<form:input path="secondUnits" htmlEscape="false" cssClass="form-control"/>
-					</td>
-					<td class="width-15 active"><label class="pull-right"><font color="red">*</font>5：</label></td>
-					<td class="width-35">
-						<form:input path="firstUnits" htmlEscape="false" cssClass="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td class="width-15 active"><label class="pull-right">操作</label></td>
-					<td class="width-35">
-						<input type="button" value="查看" width="100" height="20">
-<%--						<shiro:hasPermission name="test:onetomany:dialog:testDataMain1:edit">
-							<button id="view" class="btn btn-default" disabled onclick="view()">
-								<i class="fa fa-search-plus"></i> 查看
-							</button>
-						</shiro:hasPermission>--%>
-					</td>
-					<td class="width-15 active"></td>
-		   			<td class="width-35" ></td>
-		  		</tr>
-		 	</tbody>
-		</table>
-		</form:form>
-</body>
-</html>