拆分jsp与js，流程中出现procinsId重复存在在查询时会自动拼接，项目经理组织交底的时候导入交底结论出现无问题与设备基础是否可以扩容，现场设备尺寸， 最多可扩容尺寸不兼容的问题，

src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -437,7 +437,7 @@ public class ActTaskController extends BaseController {
 	public AjaxJson economics(Act act,String pic,UploadImages uploadImages) {
 		AjaxJson j = new AjaxJson();
 		try {
-			if (pic!=null&&pic!="") {
+			if (pic!=null&&!"".equals(pic)) {
 				uploadImages.setPath(pic);
 				uploadImages.setProcInsId(act.getProcInsId());
 				uploadImages.setImgName("上传新图纸");

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/UploadController.java

@@ -115,7 +115,7 @@ public class UploadController extends BaseController {
 	@RequestMapping(value = {"managerUploadList"})
 	public String managerUploadList(UploadImages uploadImages, Model model) {
 		model.addAttribute("uploadImages", uploadImages);
-		return "modules/sg/managementcenter/activiti/managerUploadLconAfterChangeist";
+		return "modules/sg/managementcenter/activiti/managerUploadList";
 	}
 
 	/**

src/main/webapp/webpage/modules/sg/managementcenter/activiti/conAfterChange.js

@@ -0,0 +1,247 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script>
+$(document).ready(function() {
+	$('#testPicTable').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}/managementcenter/upload/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/pic/testPic/delete?id="+row.id, function(data){
+						if(data.success){
+							$('#testPicTable').bootstrapTable('refresh');
+							jp.success(data.msg);
+						}else{
+							jp.error(data.msg);
+						}
+					})
+
+				});
+
+			}
+		},
+
+		onClickRow: function(row, $el){
+		},
+		onShowSearch: function () {
+			$("#search-collapse").slideToggle();
+		},
+		columns: [/*{
+				   field: 'uId',
+				   title: '标题',
+				   sortable: true,
+				   sortName: 'uId'
+				   ,formatter:function(value, row , index){
+					   value = jp.unescapeHTML(value);
+				   <c:choose>
+					   <c:when test="${fns:hasPermission('test:pic:testPic:edit')}">
+					   return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
+				   </c:when>
+					   <c:when test="${fns:hasPermission('test:pic:testPic:view')}">
+					   return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
+				   </c:when>
+					   <c:otherwise>
+					   return value;
+				   </c:otherwise>
+					   </c:choose>
+				   }
+
+			   },*/{
+			field: 'path',
+			title: '图片路径',
+			sortable: true,
+			sortName: 'path',
+			formatter:function(value, row , index){
+				var valueArray = value.split("|");
+				var labelArray = [];
+				for(var i =0 ; i<valueArray.length; i++){
+					if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
+					{
+						labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
+					}else{
+						labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
+					}
+				}
+				return labelArray.join(" ");
+			}
+
+		},{
+			field: 'imgName',
+			title: '上传用途',
+			sortable: true,
+			sortName: 'imgName',
+		},{
+			field: 'uId',
+			title: '上传人员',
+			sortable: true,
+			sortName: 'uId',
+		}]
+	});
+
+
+	if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+
+		$('#testPicTable').bootstrapTable("toggleView");
+	}
+
+	$('#testPicTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+		'check-all.bs.table uncheck-all.bs.table', function () {
+		$('#remove').prop('disabled', ! $('#testPicTable').bootstrapTable('getSelections').length);
+		$('#view,#edit').prop('disabled', $('#testPicTable').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}/test/pic/testPic/import/template');
+			},
+			btn2: function(index, layero){
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				iframeWin.contentWindow.importExcel('${ctx}/test/pic/testPic/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}/test/pic/testPic/export');
+	});
+
+
+	$("#search").click("click", function() {// 绑定查询按扭
+		$('#testPicTable').bootstrapTable('refresh');
+	});
+
+	$("#reset").click("click", function() {// 绑定查询按扭
+		$("#searchForm  input").val("");
+		$("#searchForm  select").val("");
+		$("#searchForm  .select-item").html("");
+		$('#testPicTable').bootstrapTable('refresh');
+	});
+
+
+});
+
+function getIdSelections() {
+	return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
+		return row.id
+	});
+}
+
+function deleteAll(){
+
+	jp.confirm('确认要删除该图片管理记录吗？', function(){
+		jp.loading();
+		jp.get("${ctx}/test/pic/testPic/deleteAll?ids=" + getIdSelections(), function(data){
+			if(data.success){
+				$('#testPicTable').bootstrapTable('refresh');
+				jp.success(data.msg);
+			}else{
+				jp.error(data.msg);
+			}
+		})
+
+	})
+}
+
+//刷新列表
+function refresh(){
+	$('#testPicTable').bootstrapTable('refresh');
+}
+
+function add(){
+	jp.openSaveDialog('新增图片管理', "${ctx}/test/pic/testPic/form",'800px', '500px');
+}
+
+
+
+function edit(id){//没有权限时，不显示确定按钮
+	if(id == undefined){
+		id = getIdSelections();
+	}
+	jp.openSaveDialog('编辑图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
+}
+
+function view(id){//没有权限时，不显示确定按钮
+	if(id == undefined){
+		id = getIdSelections();
+	}
+	jp.openViewDialog('查看图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
+}
+
+
+
+</script>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/conAfterChange.jsp

@@ -7,7 +7,7 @@
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
-	<%@include file="economicsDesignChange.js" %>
+	<%@include file="conAfterChange.js" %>
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$("#agree").click(function () {

src/main/webapp/webpage/modules/sg/managementcenter/activiti/economicsDesignChange.js

@@ -2,6 +2,7 @@
 <script>
 $(document).ready(function() {
 	var procInsId = $("#procInsId").val();
+
 	// alert(procInsId);
 	$('#testPicTable').bootstrapTable({
 		  //请求方法

src/main/webapp/webpage/modules/sg/managementcenter/activiti/managerUploadList.js

@@ -1,86 +1,86 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script>
 $(document).ready(function() {
+
 	$('#testPicTable').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}/managementcenter/upload/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/pic/testPic/delete?id="+row.id, function(data){
-                   	  		if(data.success){
-                   	  			$('#testPicTable').bootstrapTable('refresh');
-                   	  			jp.success(data.msg);
-                   	  		}else{
-                   	  			jp.error(data.msg);
-                   	  		}
-                   	  	})
-                   	   
-                   	});
-                      
-                   } 
-               },
-              
-               onClickRow: function(row, $el){
-               },
-               	onShowSearch: function () {
+		//请求方法
+		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}/managementcenter/upload/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/pic/testPic/delete?id="+row.id, function(data){
+						if(data.success){
+							$('#testPicTable').bootstrapTable('refresh');
+							jp.success(data.msg);
+						}else{
+							jp.error(data.msg);
+						}
+					})
+
+				});
+
+			}
+		},
+
+		onClickRow: function(row, $el){
+		},
+		onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
-               columns: [/*{
+		columns: [/*{
 				   field: 'uId',
 				   title: '标题',
 				   sortable: true,
@@ -101,142 +101,147 @@ $(document).ready(function() {
 				   }
 
 			   },*/{
-		        field: 'path',
-		        title: '图片路径',
-		        sortable: true,
-		        sortName: 'path',
-		        formatter:function(value, row , index){
-		        	var valueArray = value.split("|");
-		        	var labelArray = [];
-		        	for(var i =0 ; i<valueArray.length; i++){
-		        		if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
-		        		{
-		        			labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
-		        		}else{
-		        			labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
-		        		}
-		        	}
-		        	return labelArray.join(" ");
-		        }
-		       
-		    },{
-				   field: 'uId',
-				   title: '上传人员',
-				   sortable: true,
-				   sortName: 'uId',
-			   }]
-		});
-		
-		  
-	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
-
-		 
-		  $('#testPicTable').bootstrapTable("toggleView");
-		}
-	  
-	  $('#testPicTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
-                'check-all.bs.table uncheck-all.bs.table', function () {
-            $('#remove').prop('disabled', ! $('#testPicTable').bootstrapTable('getSelections').length);
-            $('#view,#edit').prop('disabled', $('#testPicTable').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}/test/pic/testPic/import/template');
-				  },
-			    btn2: function(index, layero){
-				        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-						iframeWin.contentWindow.importExcel('${ctx}/test/pic/testPic/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}/test/pic/testPic/export');
-	  });
-
-		    
-	  $("#search").click("click", function() {// 绑定查询按扭
-		  $('#testPicTable').bootstrapTable('refresh');
-		});
-	 
-	 $("#reset").click("click", function() {// 绑定查询按扭
-		  $("#searchForm  input").val("");
-		  $("#searchForm  select").val("");
-		  $("#searchForm  .select-item").html("");
-		  $('#testPicTable').bootstrapTable('refresh');
+			field: 'path',
+			title: '图片路径',
+			sortable: true,
+			sortName: 'path',
+			formatter:function(value, row , index){
+				var valueArray = value.split("|");
+				var labelArray = [];
+				for(var i =0 ; i<valueArray.length; i++){
+					if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
+					{
+						labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
+					}else{
+						labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
+					}
+				}
+				return labelArray.join(" ");
+			}
+
+		},{
+			field: 'imgName',
+			title: '上传用途',
+			sortable: true,
+			sortName: 'imgName',
+		},{
+			field: 'uId',
+			title: '上传人员',
+			sortable: true,
+			sortName: 'uId',
+		}]
+	});
+
+
+	if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+
+		$('#testPicTable').bootstrapTable("toggleView");
+	}
+
+	$('#testPicTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+		'check-all.bs.table uncheck-all.bs.table', function () {
+		$('#remove').prop('disabled', ! $('#testPicTable').bootstrapTable('getSelections').length);
+		$('#view,#edit').prop('disabled', $('#testPicTable').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}/test/pic/testPic/import/template');
+			},
+			btn2: function(index, layero){
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				iframeWin.contentWindow.importExcel('${ctx}/test/pic/testPic/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);
+			}
 		});
-		
-		
 	});
-		
-  function getIdSelections() {
-        return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
-            return row.id
-        });
-    }
-  
-  function deleteAll(){
-
-		jp.confirm('确认要删除该图片管理记录吗？', function(){
-			jp.loading();  	
-			jp.get("${ctx}/test/pic/testPic/deleteAll?ids=" + getIdSelections(), function(data){
-         	  		if(data.success){
-         	  			$('#testPicTable').bootstrapTable('refresh');
-         	  			jp.success(data.msg);
-         	  		}else{
-         	  			jp.error(data.msg);
-         	  		}
-         	  	})
-          	   
+
+
+	$("#export").click(function(){//导出Excel文件
+		jp.downloadFile('${ctx}/test/pic/testPic/export');
+	});
+
+
+	$("#search").click("click", function() {// 绑定查询按扭
+		$('#testPicTable').bootstrapTable('refresh');
+	});
+
+	$("#reset").click("click", function() {// 绑定查询按扭
+		$("#searchForm  input").val("");
+		$("#searchForm  select").val("");
+		$("#searchForm  .select-item").html("");
+		$('#testPicTable').bootstrapTable('refresh');
+	});
+
+
+});
+
+function getIdSelections() {
+	return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
+		return row.id
+	});
+}
+
+function deleteAll(){
+
+	jp.confirm('确认要删除该图片管理记录吗？', function(){
+		jp.loading();
+		jp.get("${ctx}/test/pic/testPic/deleteAll?ids=" + getIdSelections(), function(data){
+			if(data.success){
+				$('#testPicTable').bootstrapTable('refresh');
+				jp.success(data.msg);
+			}else{
+				jp.error(data.msg);
+			}
 		})
-  }
-
-    //刷新列表
-  function refresh(){
-  	$('#testPicTable').bootstrapTable('refresh');
-  }
-  
-   function add(){
-	  jp.openSaveDialog('新增图片管理', "${ctx}/test/pic/testPic/form",'800px', '500px');
-  }
-
-
-  
-   function edit(id){//没有权限时，不显示确定按钮
-       if(id == undefined){
-	      id = getIdSelections();
+
+	})
+}
+
+//刷新列表
+function refresh(){
+	$('#testPicTable').bootstrapTable('refresh');
+}
+
+function add(){
+	jp.openSaveDialog('新增图片管理', "${ctx}/test/pic/testPic/form",'800px', '500px');
+}
+
+
+
+function edit(id){//没有权限时，不显示确定按钮
+	if(id == undefined){
+		id = getIdSelections();
 	}
 	jp.openSaveDialog('编辑图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
-  }
-  
- function view(id){//没有权限时，不显示确定按钮
-      if(id == undefined){
-             id = getIdSelections();
-      }
-        jp.openViewDialog('查看图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
- }
+}
+
+function view(id){//没有权限时，不显示确定按钮
+	if(id == undefined){
+		id = getIdSelections();
+	}
+	jp.openViewDialog('查看图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
+}
 
 
 

src/main/webapp/webpage/modules/sg/managementcenter/activiti/managerUploadList.jsp

@@ -7,7 +7,7 @@
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
-	<%@include file="economicsDesignChange.js" %>
+	<%@include file="managerUploadList.js" %>
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$("#agree").click(function () {

src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorDesignChange.jsp

@@ -12,8 +12,11 @@
 			var flag = false;
 			if (demandUnit=="经研所") {
 				$("#demandUnit1").css("display", "none");
-				$("#demandUnit2").css("display", "none");
+				$("#demandUnit4").css("display", "none");
 				flag = true;
+			}else {
+				$("#demandUnit2").css("display", "none");
+				$("#demandUnit5").css("display", "none");
 			}
 			$("#agree").click(function () {
 				var currentFileValues = $("input[name='pic']").val();
@@ -107,16 +110,18 @@
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">是否需要变更：</label></td>
-								<td class="width-35">
+								<td class="width-35" id="demandUnit4">
 									<select id="selected" class="form-control">
 										<option value="0">是</option>
 										<option value="1">否</option>
 									</select>
 								</td>
-								<td id="demandUnit1" class="width-15 active"><label class="pull-right">上传新方案图纸：</label></td>
-								<td id="demandUnit2" class="width-35">
+								<td id="demandUnit5">无需选择是否变更</td>
+								<td id="demandUnit3" class="width-15 active"><label class="pull-right">上传新方案图纸：</label></td>
+								<td id="demandUnit1" class="width-35">
 									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
 								</td>
+								<td id="demandUnit2">又经研所上传图纸</td>
 							</tr>
 							<tr>
 								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorUploadList.js

@@ -1,86 +1,86 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
 <script>
 $(document).ready(function() {
+
 	$('#testPicTable').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}/managementcenter/upload/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/pic/testPic/delete?id="+row.id, function(data){
-                   	  		if(data.success){
-                   	  			$('#testPicTable').bootstrapTable('refresh');
-                   	  			jp.success(data.msg);
-                   	  		}else{
-                   	  			jp.error(data.msg);
-                   	  		}
-                   	  	})
-                   	   
-                   	});
-                      
-                   } 
-               },
-              
-               onClickRow: function(row, $el){
-               },
-               	onShowSearch: function () {
+		//请求方法
+		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}/managementcenter/upload/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/pic/testPic/delete?id="+row.id, function(data){
+						if(data.success){
+							$('#testPicTable').bootstrapTable('refresh');
+							jp.success(data.msg);
+						}else{
+							jp.error(data.msg);
+						}
+					})
+
+				});
+
+			}
+		},
+
+		onClickRow: function(row, $el){
+		},
+		onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
-               columns: [/*{
+		columns: [/*{
 				   field: 'uId',
 				   title: '标题',
 				   sortable: true,
@@ -101,142 +101,147 @@ $(document).ready(function() {
 				   }
 
 			   },*/{
-		        field: 'path',
-		        title: '图片路径',
-		        sortable: true,
-		        sortName: 'path',
-		        formatter:function(value, row , index){
-		        	var valueArray = value.split("|");
-		        	var labelArray = [];
-		        	for(var i =0 ; i<valueArray.length; i++){
-		        		if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
-		        		{
-		        			labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
-		        		}else{
-		        			labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
-		        		}
-		        	}
-		        	return labelArray.join(" ");
-		        }
-		       
-		    },{
-				   field: 'uId',
-				   title: '上传人员',
-				   sortable: true,
-				   sortName: 'uId',
-			   }]
-		});
-		
-		  
-	  if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
-
-		 
-		  $('#testPicTable').bootstrapTable("toggleView");
-		}
-	  
-	  $('#testPicTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
-                'check-all.bs.table uncheck-all.bs.table', function () {
-            $('#remove').prop('disabled', ! $('#testPicTable').bootstrapTable('getSelections').length);
-            $('#view,#edit').prop('disabled', $('#testPicTable').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}/test/pic/testPic/import/template');
-				  },
-			    btn2: function(index, layero){
-				        var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
-						iframeWin.contentWindow.importExcel('${ctx}/test/pic/testPic/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}/test/pic/testPic/export');
-	  });
-
-		    
-	  $("#search").click("click", function() {// 绑定查询按扭
-		  $('#testPicTable').bootstrapTable('refresh');
-		});
-	 
-	 $("#reset").click("click", function() {// 绑定查询按扭
-		  $("#searchForm  input").val("");
-		  $("#searchForm  select").val("");
-		  $("#searchForm  .select-item").html("");
-		  $('#testPicTable').bootstrapTable('refresh');
+			field: 'path',
+			title: '图片路径',
+			sortable: true,
+			sortName: 'path',
+			formatter:function(value, row , index){
+				var valueArray = value.split("|");
+				var labelArray = [];
+				for(var i =0 ; i<valueArray.length; i++){
+					if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
+					{
+						labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"
+					}else{
+						labelArray[i] = '<img   onclick="jp.showPic(\''+valueArray[i]+'\')"'+' height="50px" src="'+valueArray[i]+'">';
+					}
+				}
+				return labelArray.join(" ");
+			}
+
+		},{
+			field: 'imgName',
+			title: '上传用途',
+			sortable: true,
+			sortName: 'imgName',
+		},{
+			field: 'uId',
+			title: '上传人员',
+			sortable: true,
+			sortName: 'uId',
+		}]
+	});
+
+
+	if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端
+
+
+		$('#testPicTable').bootstrapTable("toggleView");
+	}
+
+	$('#testPicTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+		'check-all.bs.table uncheck-all.bs.table', function () {
+		$('#remove').prop('disabled', ! $('#testPicTable').bootstrapTable('getSelections').length);
+		$('#view,#edit').prop('disabled', $('#testPicTable').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}/test/pic/testPic/import/template');
+			},
+			btn2: function(index, layero){
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				iframeWin.contentWindow.importExcel('${ctx}/test/pic/testPic/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);
+			}
 		});
-		
-		
 	});
-		
-  function getIdSelections() {
-        return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
-            return row.id
-        });
-    }
-  
-  function deleteAll(){
-
-		jp.confirm('确认要删除该图片管理记录吗？', function(){
-			jp.loading();  	
-			jp.get("${ctx}/test/pic/testPic/deleteAll?ids=" + getIdSelections(), function(data){
-         	  		if(data.success){
-         	  			$('#testPicTable').bootstrapTable('refresh');
-         	  			jp.success(data.msg);
-         	  		}else{
-         	  			jp.error(data.msg);
-         	  		}
-         	  	})
-          	   
+
+
+	$("#export").click(function(){//导出Excel文件
+		jp.downloadFile('${ctx}/test/pic/testPic/export');
+	});
+
+
+	$("#search").click("click", function() {// 绑定查询按扭
+		$('#testPicTable').bootstrapTable('refresh');
+	});
+
+	$("#reset").click("click", function() {// 绑定查询按扭
+		$("#searchForm  input").val("");
+		$("#searchForm  select").val("");
+		$("#searchForm  .select-item").html("");
+		$('#testPicTable').bootstrapTable('refresh');
+	});
+
+
+});
+
+function getIdSelections() {
+	return $.map($("#testPicTable").bootstrapTable('getSelections'), function (row) {
+		return row.id
+	});
+}
+
+function deleteAll(){
+
+	jp.confirm('确认要删除该图片管理记录吗？', function(){
+		jp.loading();
+		jp.get("${ctx}/test/pic/testPic/deleteAll?ids=" + getIdSelections(), function(data){
+			if(data.success){
+				$('#testPicTable').bootstrapTable('refresh');
+				jp.success(data.msg);
+			}else{
+				jp.error(data.msg);
+			}
 		})
-  }
-
-    //刷新列表
-  function refresh(){
-  	$('#testPicTable').bootstrapTable('refresh');
-  }
-  
-   function add(){
-	  jp.openSaveDialog('新增图片管理', "${ctx}/test/pic/testPic/form",'800px', '500px');
-  }
-
-
-  
-   function edit(id){//没有权限时，不显示确定按钮
-       if(id == undefined){
-	      id = getIdSelections();
+
+	})
+}
+
+//刷新列表
+function refresh(){
+	$('#testPicTable').bootstrapTable('refresh');
+}
+
+function add(){
+	jp.openSaveDialog('新增图片管理', "${ctx}/test/pic/testPic/form",'800px', '500px');
+}
+
+
+
+function edit(id){//没有权限时，不显示确定按钮
+	if(id == undefined){
+		id = getIdSelections();
 	}
 	jp.openSaveDialog('编辑图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
-  }
-  
- function view(id){//没有权限时，不显示确定按钮
-      if(id == undefined){
-             id = getIdSelections();
-      }
-        jp.openViewDialog('查看图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
- }
+}
+
+function view(id){//没有权限时，不显示确定按钮
+	if(id == undefined){
+		id = getIdSelections();
+	}
+	jp.openViewDialog('查看图片管理', "${ctx}/managementcenter/upload/imagesForm?id=" + id, '800px', '500px');
+}
 
 
 

src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorUploadList.jsp

@@ -7,11 +7,10 @@
 	<meta name="decorator" content="ani"/>
 	<%@ include file="/webpage/include/bootstraptable.jsp"%>
 	<%@include file="/webpage/include/treeview.jsp" %>
-	<%@include file="economicsDesignChange.js" %>
+	<%@include file="operatorUploadList.js" %>
 	<script type="text/javascript">
 
 		$(document).ready(function() {
-
 			$("#agree").click(function () {
 				var currentFileValues = $("input[name='pic']").val();
 					jp.prompt("审核意见", function (message) {
@@ -76,7 +75,7 @@
 	</form:form>
 	</div>
 	</div>
-	
+
 	<!-- 工具栏 -->
 	<div id="toolbar">