储备项目细节修改

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/service/ErpCreditService.java

@@ -249,6 +249,7 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
         XSSFSheet sheetSettlement=null;//结算表
         XSSFSheet sheetLine2=null;//线路2
         XSSFSheet sheetEquip2=null;//设备2
+        XSSFSheet newForm=null;//新表格
         try {
             inputStream = new FileInputStream(newFile);// 将excel文件转为输入流
             workbook = new XSSFWorkbook(inputStream);// 创建个workbook，
@@ -263,6 +264,7 @@ public class ErpCreditService extends CrudService<ErpCreditMapper,ErpCredit> {
             sheetSettlement=workbook.getSheetAt(7);//结算表
             sheetLine2=workbook.getSheetAt(9);//线路2
             sheetEquip2=workbook.getSheetAt(10);//设备2
+            newForm=workbook.getSheetAt(11);//新表
         } catch (Exception e1) {
             e1.printStackTrace();
         }

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/ProgressScheduleMapper.java

@@ -3,6 +3,7 @@ package com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ProgressSchedule;
+import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveProcess;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,4 +32,6 @@ public interface ProgressScheduleMapper extends BaseMapper<ProgressSchedule> {
      * 通过项目储备编码重置项目完成时间
      * */
     void resetTime(String projectReserveId);
+
+
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/ReserveProcessMapper.java

@@ -20,6 +20,8 @@ public interface ReserveProcessMapper extends BaseMapper<ReserveProcess> {
      * */
     String findProjectId(ReserveProcess reserveProcess);
 
+    String findProc(String projectReserveId);
+
     /**
      * 通过流程定义号查询储备项目编码
      */
@@ -57,6 +59,12 @@ public interface ReserveProcessMapper extends BaseMapper<ReserveProcess> {
      * */
     List<ReserveProcess> findUploadList(ReserveProcess reserveProcess);
 
+
+    /**
+     * 储备流程当前流程所有的甲供材数据
+     */
+    List<MaterialInfo> findMaterialList(MaterialInfo entity);
+
     /**
      * 储备文件管理，
      */

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/xml/ProgressScheduleMapper.xml

@@ -89,6 +89,7 @@
     </select>
 
 
+
     <insert id="insert">
         insert into cb_progress_schedule (
             id,

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/mapper/xml/ReserveProcessMapper.xml

@@ -141,6 +141,13 @@
     <select id="findProjectId" resultType="java.lang.String">
         select projectReserveId from cb_personnel_activiti where id = #{id};
     </select>
+
+    <select id="findProc" resultType="java.lang.String">
+        select proc_ins_id
+        from cb_personnel_activiti
+        where projectReserveId = #{projectReserveId}
+    </select>
+
     <select id="findList"
             resultType="com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveProcess">
         select
@@ -294,6 +301,35 @@
         from cb_material_data
         where projectName = #{projectName}
     </select>
+    <select id="findMaterialList"
+            resultType="com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo">
+        SELECT
+            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.remarks AS "remarks",
+            a.del_flag AS "delFlag",
+            a.projectName AS "projectName",
+            a.materialCode AS "materialCode",
+            a.materialName AS "materialName",
+            a.extendDescription AS "extendDescription",
+            a.unit AS "unit",
+            a.totalCount AS "totalCount",
+            a.weightKg AS "weightKg",
+            a.weightTon AS "weightTon",
+            a.supplyType AS "supplyType",
+            a.note AS "note",
+            a.state AS "state"
+        FROM cb_material_data a
+        <where>
+            1=1
+            <if test="projectName!=null and projectName != ''">
+                and a.projectName = #{projectName}
+            </if>
+        </where>
+    </select>
 
     <insert id="insert">
         insert into cb_personnel_activiti (
@@ -379,7 +415,7 @@
             projectProposal = #{projectProposal},
             drawings = #{drawings},
             drawingSpecification = #{drawingSpecification}
-        where proc_ins_id = #{procInsId}
+        where projectReserveId = #{projectReserveId}
     </update>
     <update id="updateAmount">
         update cb_personnel_activiti

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ProgressScheduleService.java

@@ -16,6 +16,7 @@ import com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper.Personne
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper.ProgressScheduleMapper;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.mapper.ReserveProcessMapper;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import org.activiti.engine.RuntimeService;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +45,9 @@ public class ProgressScheduleService extends CrudService<ProgressScheduleMapper,
     @Autowired
     private ProgressScheduleMapper scheduleMapper;
 
+    @Autowired
+    private RuntimeService runtimeService;
+
 
     @Override
     public ProgressSchedule get(ProgressSchedule entity) {
@@ -98,6 +102,7 @@ public class ProgressScheduleService extends CrudService<ProgressScheduleMapper,
         String projectName = entity.getProjectName();
         // 判断项目是否发起了储备项目流程，未发起无需重置
         PersonnelTurnover byReserveId = turnoverMapper.findByReserveId(projectReserveId);
+
         String openProcessStatus = byReserveId.getOpenProcessStatus();
         if ("0".equals(openProcessStatus)) {
             return "项目无需重置，未发起储备流程";
@@ -111,6 +116,12 @@ public class ProgressScheduleService extends CrudService<ProgressScheduleMapper,
         if (!"0".equals(addWareHousing)) {
             turnoverMapper.updateAddWareHousingStatus(projectReserveId,"2");
         }
+        if (!"2".equals(byReserveId.getOpenProcessStatus())) {
+            String proc = reserveProcessMapper.findProc(projectReserveId);
+            //根据流程定义号删除流程
+            runtimeService.deleteProcessInstance(proc, " ");
+        }
+
         // 重置年度物资上报统计/明细，
         materialInfoMapper.deleteByPro(projectName);
         materialInfoMapper.deleteMaterial(projectName);
@@ -123,6 +134,7 @@ public class ProgressScheduleService extends CrudService<ProgressScheduleMapper,
         //修改状态入库退回
         //删除甲供材信息
         reserveProcessMapper.deleteMaterial(projectName);
+
         return "重置成功";
     }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/service/ReserveProcessService.java

@@ -105,6 +105,13 @@ public class ReserveProcessService extends CrudService<ReserveProcessMapper, Res
         return super.findPage(page, entity);
     }
 
+    public Page<MaterialInfo> findMaterialPage(Page<MaterialInfo> page, MaterialInfo entity) {
+        dataRuleFilter(entity);
+        entity.setPage(page);
+        page.setList(mapper.findMaterialList(entity));
+        return page;
+    }
+
     public Page<ReserveProcess> findUploadPage(Page<ReserveProcess> page, ReserveProcess entity) {
         dataRuleFilter(entity);
         entity.setPage(page);
@@ -205,17 +212,25 @@ public class ReserveProcessService extends CrudService<ReserveProcessMapper, Res
             vars.put("manager", UserUtils.getByUserName(user.getProjectManager()).getLoginName());
             SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String format = dft.format(new Date());
+            //通过储备项目定义号，查询项目是否已经存在时间记录
+            ProgressSchedule progressSchedule = scheduleMapper.findProjectReserveId(reserveProcess.getProjectReserveId());
             ProgressSchedule schedule = new ProgressSchedule();
-            schedule.preUpdate();
             schedule.setDesignUpload(format);
             schedule.setProjectReserveId(reserveProcess.getProjectReserveId());
-            scheduleMapper.updateTimeNode(schedule);
+            if (null == progressSchedule) {
+                schedule.preInsert();
+                scheduleMapper.insert(schedule);
+            }else {
+                schedule.preUpdate();
+                scheduleMapper.updateTimeNode(schedule);
+            }
         } else {
             //结束项目流程，修改项目开始流程状态，清空人员流转信息，清空
             //删除对应的流程数据
             //删除对应甲供材信息
             mapper.deleteMaterial(reserveProcess.getProjectName());
             mapper.deleteAct(reserveProcess.getProjectReserveId());
+            personnelTurnoverMapper.updateOpenStatus(reserveProcess.getProjectReserveId(), "0");
             personnelTurnoverService.deletePerson(reserveProcess.getProjectReserveId());
             vars.put("manager", UserUtils.getUser().getLoginName());
         }
@@ -311,7 +326,7 @@ public class ReserveProcessService extends CrudService<ReserveProcessMapper, Res
             //审核通过修改项目状态，将物料信息导入年度物资上报统计
             //根据流程定义号查询项目编码
             ReserveManagement byProcInsId = reserveManagementMapper.findByProcInsId(act.getProcInsId());
-            //通过储备编码查询项目的入库状态-如果是0修改为1，如果是3，修改成4
+            //通过储备编码查询项目的入库状态-如果是0修改为1，如果是2，修改成3
             String projectReserveId = byProcInsId.getProjectReserveId();
             String projectName = byProcInsId.getProjectName();
             PersonnelTurnover byReserveId = personnelTurnoverMapper.findByReserveId(projectReserveId);
@@ -323,6 +338,7 @@ public class ReserveProcessService extends CrudService<ReserveProcessMapper, Res
             }
             //修改项目甲供材清册状态
             personnelTurnoverMapper.updateMaterialStatus(projectReserveId, "2");
+            personnelTurnoverMapper.updateOpenStatus(projectReserveId, "2");
             //获取所有的物料信息-导入年度物资上报统计
             List<MaterialInfo> materialByName = mapper.findMaterialByName(projectName);
             for (MaterialInfo m :

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/PersonnelTurnoverController.java

@@ -187,7 +187,7 @@ public class PersonnelTurnoverController extends BaseController {
                     reserveProcessService.insert(reserveProcess);
                     //发送流程，更改项目状态
                     Map<String, Object> vars = Maps.newHashMap();
-                    vars.put("design", UserUtils.getByUserName(s.getDesignUnit()).getLoginName());
+                    vars.put("manager", UserUtils.getByUserName(s.getDesignUnit()).getLoginName());
                     String procDefId = projectService.findDefId("cbry");
                     ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
                     String title = s.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();
@@ -208,7 +208,7 @@ public class PersonnelTurnoverController extends BaseController {
                         reserveProcessService.insert(reserveProcess);
                         //发送流程，更改项目状态
                         Map<String, Object> vars = Maps.newHashMap();
-                        vars.put("design", UserUtils.getByUserName(s.getDesignUnit()).getLoginName());
+                        vars.put("manager", UserUtils.getByUserName(s.getDesignUnit()).getLoginName());
                         String procDefId = projectService.findDefId("cbry");
                         ProcessDefinition p = actProcessService.getProcessDefinition(procDefId);
                         String title = s.getCurrentUser().getName() + "在" + DateUtils.getDateTime() + "发起" + p.getName();

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/ReserveProcessController.java

@@ -32,6 +32,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.*;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -120,6 +121,16 @@ public class ReserveProcessController extends BaseController {
     }
 
     /**
+     * 甲供材 列表数据
+     */
+    @ResponseBody
+    @RequestMapping(value = "materialData")
+    public Map<String, Object> data(MaterialInfo materialInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<MaterialInfo> page = reserveProcessService.findMaterialPage(new Page<MaterialInfo>(request, response), materialInfo);
+        return getBootstrapData(page);
+    }
+
+    /**
      * 物料规范信息数据列表
      * @param reserveProcess
      * @param request

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/afterList.js

@@ -2,134 +2,155 @@
 <script>
 $(document).ready(function() {
 	$('#testPicTable').bootstrapTable({
-		  //请求方法
-               method: 'post',
-               //类型json
-               dataType: "json",
-               contentType: "application/x-www-form-urlencoded",
-               //显示检索按钮
-	           showSearch: true,
-               //显示刷新按钮
-               showRefresh: true,
-               //显示切换手机试图按钮
-               showToggle: false,
-               //显示 内容列下拉框
-    	       showColumns: false,
-    	       //显示到处按钮
-    	       showExport: false,
-    	       //显示切换分页按钮
-    	       showPaginationSwitch: false,
-    	       //最低显示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}/sg/managementCenter/scaleDetails/afterData",
-               //默认值为 '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){
-               },
-               onClickRow: function(row, $el){
-               },
-               	onShowSearch: function () {
-					$("#search-collapse").slideToggle();
-				},
-               columns: [
-				   {
-					   checkbox: true
-				   },
-               	{
-					   field: 'projectReserveId',
-					   title: '储备项目编号',
-				   },{
-					   field: 'projectName',
-					   title: '项目名称',
-				   },
-				   {
-					   field: 'switchCabinet',
-					   title: '开关柜',
-				   }, {
-					   field: 'overheadLines',
-					   title: '架空线路'
-				   }, {
-					   field: 'powerCable',
-					   title: '电力电缆',
-				   }, {
-					   field: 'cableBox',
-					   title: '10千伏电缆分接箱',
-				   }, {
-					   field: 'ringCare',
-					   title: '环网箱/室',
-				   }, {
-					   field: 'switchYard',
-					   title: '开关站',
-				   }, {
-					   field: 'postSwitch',
-					   title: '柱上开关',
-				   }, {
-					   field: 'distributionKva',
-					   title: '配电室kva',
-				   }, {
-					   field: 'distribution',
-					   title: '配电室',
-				   }, {
-					   field: 'boxTransformerKva',
-					   title: '箱变kva',
-				   }, {
-					   field: 'boxTransformer',
-					   title: '箱变',
-				   }, {
-					   field: 'disTransformerKva',
-					   title: '配电变压器kva',
-				   }, {
-					   field: 'disTransformer',
-					   title: '配电变压器',
-				   }, {
-					   field: 'lowVoltageLine',
-					   title: '低压线路',
-				   }, {
-					   field: 'lowVoltageCable',
-					   title: '低压电缆',
-				   }, {
-					   field: 'lowDistributionBox',
-					   title: '低压电缆分接箱',
-				   }, {
-					   field: 'lowBoxCabinet',
-					   title: '低压配电箱（柜）',
-				   }, {
-					   field: 'distributionTerminal',
-					   title: '配电自动化终端（DTU）',
-				   }, {
-					   field: 'cableChannel',
-					   title: '电缆通道',
-				   }
-			   ]
-		});
+		//请求方法
+		method: 'post',
+		//类型json
+		dataType: "json",
+		contentType: "application/x-www-form-urlencoded",
+		//显示检索按钮
+		showSearch: true,
+		//显示刷新按钮
+		showRefresh: true,
+		//显示切换手机试图按钮
+		showToggle: false,
+		//显示 内容列下拉框
+		showColumns: false,
+		//显示到处按钮
+		showExport: false,
+		//显示切换分页按钮
+		showPaginationSwitch: false,
+		//最低显示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}/sg/managementCenter/scaleDetails/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){
+		},
+		onClickRow: function(row, $el){
+		},
+		onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+		columns: [
+			{
+				checkbox: true
+			},
+			{
+				field: 'projectReserveId',
+				width:150,
+				title: '储备项目编号',
+			},{
+				field: 'projectName',
+				width:100,
+				title: '项目名称',
+			},
+			{
+				field: 'switchCabinet',
+				width:100,
+				title: '开关柜',
+			}, {
+				field: 'overheadLines',
+				width:100,
+				title: '架空线路'
+			}, {
+				field: 'powerCable',
+				width:100,
+				title: '电力电缆',
+			}, {
+				field: 'cableBox',
+				width:150,
+				title: '10千伏电缆分接箱',
+			}, {
+				field: 'ringCare',
+				width:100,
+				title: '环网箱/室',
+			}, {
+				field: 'switchYard',
+				width:100,
+				title: '开关站',
+			}, {
+				field: 'postSwitch',
+				width:100,
+				title: '柱上开关',
+			}, {
+				field: 'distributionKva',
+				width:100,
+				title: '配电室kva',
+			}, {
+				field: 'distribution',
+				width:100,
+				title: '配电室',
+			}, {
+				field: 'boxTransformerKva',
+				width:100,
+				title: '箱变kva',
+			}, {
+				field: 'boxTransformer',
+				width:100,
+				title: '箱变',
+			}, {
+				field: 'disTransformerKva',
+				width:150,
+				title: '配电变压器kva',
+			}, {
+				field: 'disTransformer',
+				width:100,
+				title: '配电变压器',
+			}, {
+				field: 'lowVoltageLine',
+				width:100,
+				title: '低压线路',
+			}, {
+				field: 'lowVoltageCable',
+				width:100,
+				title: '低压电缆',
+			}, {
+				field: 'lowDistributionBox',
+				width:100,
+				title: '低压电缆分接箱',
+			}, {
+				field: 'lowBoxCabinet',
+				width:150,
+				title: '低压配电箱（柜）',
+			}, {
+				field: 'distributionTerminal',
+				width:150,
+				title: '配电自动化终端',
+			}, {
+				field: 'cableChannel',
+				width:100,
+				title: '电缆通道',
+			}
+		]
+	});
 
 
 	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/afterList.jsp

@@ -53,7 +53,7 @@
 			</div>
 
 			<!-- 表格 -->
-			<table id="testPicTable" style="table-layout:fixed" data-toolbar="#toolbar"></table>
+			<table id="testPicTable" style="table-layout:fixed;overflow:scroll;"  data-toolbar="#toolbar"></table>
 		</div>
 	</div>
 </div>

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/designUnit.jsp

@@ -19,7 +19,23 @@
 					var drawingSpecification = $("input[name='drawingSpecification']").val();
 					var projectReserveId = $("#projectReserveId").val();
 					var projectName = $("#projectName").val();
-					if (budgetStatement == "" || projectProposal == "" || drawings == "" || drawingSpecification == "") {
+					console.log(budgetStatement)
+					console.log(projectProposal)
+					console.log(drawings)
+					console.log(drawingSpecification)
+
+					if (budgetStatement == ""
+							|| projectProposal == ""
+							|| drawings == ""
+							|| drawingSpecification == ""
+							|| budgetStatement == undefined
+							|| projectProposal == undefined
+							|| drawings == undefined
+							|| drawingSpecification == undefined
+							|| budgetStatement == 'undefined'
+							|| projectProposal == 'undefined'
+							|| drawings == 'undefined'
+							|| drawingSpecification == 'undefined') {
 						jp.error("不能为空");
 					} else {
 						jp.post("${ctx}/sg/reserveProcess/actDesignUnit",
@@ -49,6 +65,7 @@
 						);
 					}
 
+
 				})
 			});
 			$("#no").click(function () {
@@ -113,11 +130,6 @@
 							<h3 class="panel-title">运行人员审核</h3>
 						</h3>
 					</div>
-					<div id="toolbar">
-						<button id="moreImport" class="btn btn-info">
-							<i class="fa fa-file-excel-o"></i> 多文件导入
-						</button>
-					</div>
 					<div class="panel-body">
 						<form:form id="inputForm" modelAttribute="reserveProcess" class="form-horizontal">
 							<form:hidden path="id"/>
@@ -523,6 +535,14 @@
 										<sys:fileUpload path="drawingSpecification"  value="${reserveProcess.drawingSpecification}" type="*" uploadPath="/personnelTurnover"  readonly="false"/>
 									</td>
 								</tr>
+								<tr>
+									<td class="width-15 active"><label class="">甲供材清册：</label></td>
+									<td class="width-35">
+										<a id="moreImport" class="btn btn-info">
+											<i class="fa fa-file-excel-o"></i> 多文件导入
+										</a>
+									</td>
+								</tr>
 								</tbody>
 							</table>
 						</form:form>

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/drawingReview.js

@@ -139,6 +139,117 @@ $(document).ready(function() {
 			   ]
 		});
 
+	$('#dataTable').bootstrapTable({
+		//请求方法
+		method: 'post',
+		//类型json
+		dataType: "json",
+		contentType: "application/x-www-form-urlencoded",
+		//显示检索按钮
+		showSearch: false,
+		//显示刷新按钮
+		showRefresh: true,
+		//显示切换手机试图按钮
+		showToggle: false,
+		//显示 内容列下拉框
+		showColumns: false,
+		//显示到处按钮
+		showExport: false,
+		//显示切换分页按钮
+		showPaginationSwitch: false,
+		//最低显示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}/sg/reserveProcess/materialData",
+		//默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+		//queryParamsType:'',
+		////查询参数,每次调用是会带上这个参数，可自定义
+		queryParams : function(params) {
+			var searchParam = $("#searchForm").serializeJSON();
+			searchParam.projectName = $("#projectName").val();
+			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){
+		},
+		onClickRow: function(row, $el){
+		},
+		onLoadSuccess: function () {  //加载成功时执行
+		},
+		onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+		columns: [
+			{
+				field: 'projectName',
+				width:230,
+				title: '项目名称'
+			}
+			,{
+				field: 'materialCode',
+				width:100,
+				title: '物料编码'
+			}
+			,{
+				field: 'materialName',
+				width:200,
+				title: '物料名称'
+			}
+			,{
+				field: 'extendDescription',
+				width:200,
+				title: '扩展描述'
+			}
+			,{
+				field: 'unit',
+				width:60,
+				title: '单位'
+			}
+			,{
+				field: 'totalCount',
+				width:60,
+				title: '总量'
+			}
+			,{
+				field: 'weightKg',
+				width:80,
+				title: '单重/kg'
+			}
+			,{
+				field: 'weightTon',
+				width:80,
+				title: '总重/吨'
+			}
+			,{
+				field: 'supplyType',
+				width:80,
+				title: '甲乙供'
+			}
+		]
+
+	})
+
 
 	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
 

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/drawingReview.jsp

@@ -459,6 +459,7 @@
 							</table>
 						</form:form>
 						<table id="testPicTable"   data-toolbar="#toolbar"></table>
+						<table id="dataTable"   data-toolbar="#toolbar"></table>
 						<div class="row">
 							<div class="col-sm-3"></div>
 							<div class="col-sm-6">

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/economicPersonnel.js

@@ -131,8 +131,119 @@ $(document).ready(function() {
 			   ]
 		});
 
+	$('#dataTable').bootstrapTable({
+		//请求方法
+		method: 'post',
+		//类型json
+		dataType: "json",
+		contentType: "application/x-www-form-urlencoded",
+		//显示检索按钮
+		showSearch: false,
+		//显示刷新按钮
+		showRefresh: true,
+		//显示切换手机试图按钮
+		showToggle: false,
+		//显示 内容列下拉框
+		showColumns: false,
+		//显示到处按钮
+		showExport: false,
+		//显示切换分页按钮
+		showPaginationSwitch: false,
+		//最低显示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}/sg/reserveProcess/materialData",
+		//默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+		//queryParamsType:'',
+		////查询参数,每次调用是会带上这个参数，可自定义
+		queryParams : function(params) {
+			var searchParam = $("#searchForm").serializeJSON();
+			searchParam.projectName = $("#projectName").val();
+			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){
+		},
+		onClickRow: function(row, $el){
+		},
+		onLoadSuccess: function () {  //加载成功时执行
+		},
+		onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+		columns: [
+			{
+				field: 'projectName',
+				width:230,
+				title: '项目名称'
+			}
+			,{
+				field: 'materialCode',
+				width:100,
+				title: '物料编码'
+			}
+			,{
+				field: 'materialName',
+				width:200,
+				title: '物料名称'
+			}
+			,{
+				field: 'extendDescription',
+				width:200,
+				title: '扩展描述'
+			}
+			,{
+				field: 'unit',
+				width:60,
+				title: '单位'
+			}
+			,{
+				field: 'totalCount',
+				width:60,
+				title: '总量'
+			}
+			,{
+				field: 'weightKg',
+				width:80,
+				title: '单重/kg'
+			}
+			,{
+				field: 'weightTon',
+				width:80,
+				title: '总重/吨'
+			}
+			,{
+				field: 'supplyType',
+				width:80,
+				title: '甲乙供'
+			}
+		]
 
-	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+	})
+
+
+	if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
 
 
 		  $('#testPicTable').bootstrapTable("toggleView");

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/economicPersonnel.jsp

@@ -592,6 +592,7 @@
 							</table>
 						</form:form>
 						<table id="testPicTable"   data-toolbar="#toolbar"></table>
+						<table id="dataTable"   data-toolbar="#toolbar"></table>
 						<div class="row">
 							<div class="col-sm-3"></div>
 							<div class="col-sm-6">

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/operationUnit.js

@@ -131,8 +131,120 @@ $(document).ready(function() {
 			   ]
 		});
 
+	$('#dataTable').bootstrapTable({
+		//请求方法
+		method: 'post',
+		//类型json
+		dataType: "json",
+		contentType: "application/x-www-form-urlencoded",
+		//显示检索按钮
+		showSearch: false,
+		//显示刷新按钮
+		showRefresh: true,
+		//显示切换手机试图按钮
+		showToggle: false,
+		//显示 内容列下拉框
+		showColumns: false,
+		//显示到处按钮
+		showExport: false,
+		//显示切换分页按钮
+		showPaginationSwitch: false,
+		//最低显示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}/sg/reserveProcess/materialData",
+		//默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+		//queryParamsType:'',
+		////查询参数,每次调用是会带上这个参数，可自定义
+		queryParams : function(params) {
+			var searchParam = $("#searchForm").serializeJSON();
+			searchParam.projectName = $("#projectName").val();
+			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){
+		},
+		onClickRow: function(row, $el){
+		},
+		onLoadSuccess: function () {  //加载成功时执行
+		},
+		onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+		columns: [
+			{
+				field: 'projectName',
+				width:230,
+				title: '项目名称'
+			}
+			,{
+				field: 'materialCode',
+				width:100,
+				title: '物料编码'
+			}
+			,{
+				field: 'materialName',
+				width:200,
+				title: '物料名称'
+			}
+			,{
+				field: 'extendDescription',
+				width:200,
+				title: '扩展描述'
+			}
+			,{
+				field: 'unit',
+				width:60,
+				title: '单位'
+			}
+			,{
+				field: 'totalCount',
+				width:60,
+				title: '总量'
+			}
+			,{
+				field: 'weightKg',
+				width:80,
+				title: '单重/kg'
+			}
+			,{
+				field: 'weightTon',
+				width:80,
+				title: '总重/吨'
+			}
+			,{
+				field: 'supplyType',
+				width:80,
+				title: '甲乙供'
+			}
+		]
 
-	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+	})
+
+
+
+	if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
 
 
 		  $('#testPicTable').bootstrapTable("toggleView");

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/operationUnit.jsp

@@ -556,6 +556,7 @@
 							</table>
 						</form:form>
 						<table id="testPicTable"   data-toolbar="#toolbar"></table>
+						<table id="dataTable"   data-toolbar="#toolbar"></table>
 						<div class="row">
 							<div class="col-sm-3"></div>
 							<div class="col-sm-6">

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/scaleDetailsList.js

@@ -65,67 +65,88 @@ $(document).ready(function() {
 				   },
                	{
 					   field: 'projectReserveId',
+						width:150,
 					   title: '储备项目编号',
 				   },{
 					   field: 'projectName',
+					   width:100,
 					   title: '项目名称',
 				   },
 				   {
 					   field: 'switchCabinet',
+					   width:100,
 					   title: '开关柜',
 				   }, {
 					   field: 'overheadLines',
+					   width:100,
 					   title: '架空线路'
 				   }, {
 					   field: 'powerCable',
+					   width:100,
 					   title: '电力电缆',
 				   }, {
 					   field: 'cableBox',
+					   width:150,
 					   title: '10千伏电缆分接箱',
 				   }, {
 					   field: 'ringCare',
+					   width:100,
 					   title: '环网箱/室',
 				   }, {
 					   field: 'switchYard',
+					   width:100,
 					   title: '开关站',
 				   }, {
 					   field: 'postSwitch',
+					   width:100,
 					   title: '柱上开关',
 				   }, {
 					   field: 'distributionKva',
+					   width:100,
 					   title: '配电室kva',
 				   }, {
 					   field: 'distribution',
+					   width:100,
 					   title: '配电室',
 				   }, {
 					   field: 'boxTransformerKva',
+					   width:100,
 					   title: '箱变kva',
 				   }, {
 					   field: 'boxTransformer',
+					   width:100,
 					   title: '箱变',
 				   }, {
 					   field: 'disTransformerKva',
+					   width:150,
 					   title: '配电变压器kva',
 				   }, {
 					   field: 'disTransformer',
+					   width:100,
 					   title: '配电变压器',
 				   }, {
 					   field: 'lowVoltageLine',
+					   width:100,
 					   title: '低压线路',
 				   }, {
 					   field: 'lowVoltageCable',
+					   width:100,
 					   title: '低压电缆',
 				   }, {
 					   field: 'lowDistributionBox',
+					   width:100,
 					   title: '低压电缆分接箱',
 				   }, {
 					   field: 'lowBoxCabinet',
+					   width:150,
 					   title: '低压配电箱（柜）',
 				   }, {
 					   field: 'distributionTerminal',
-					   title: '配电自动化终端（DTU）',
+					   width:150,
+					   title: '配电自动化终端',
 				   }, {
 					   field: 'cableChannel',
+					   width:100,
 					   title: '电缆通道',
 				   }
 			   ]

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/scaleDetailsList.jsp

@@ -53,7 +53,7 @@
 			</div>
 
 			<!-- 表格 -->
-			<table id="testPicTable" style="table-layout:fixed" data-toolbar="#toolbar"></table>
+			<table id="testPicTable" style="table-layout:fixed;overflow:scroll;"  data-toolbar="#toolbar"></table>
 		</div>
 	</div>
 </div>