Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/common/web/BaseController.java

@@ -43,6 +43,8 @@ public abstract class BaseController {
 
 	/** 文件存储方式（0：本地服务器存储。1：云端存储） */
 	protected final static String uploadMode = Global.getConfig("remoteServer.uploadMode");
+	/** 上报开关 */
+	protected volatile static boolean REPORTSWITCH = true;
 	/**
 	 * 日志对象
 	 */

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -117,6 +117,7 @@ public class RuralCostProjectMessageController extends BaseController {
         return entity;
     }
 
+
     /**
      * 项目列表页面
      */
@@ -166,6 +167,7 @@ public class RuralCostProjectMessageController extends BaseController {
         }
         model.addAttribute("beginDate", projectRecords.getBeginDate());
         model.addAttribute("endDate", projectRecords.getEndDate());
+        model.addAttribute("reportSwitch", BaseController.REPORTSWITCH);
         return "modules/ruralprojectrecords/cost/ruralCostProjectMessageLists";
     }
 
@@ -1833,6 +1835,10 @@ public class RuralCostProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "saveReported")
     public String saveReported(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        if(!BaseController.REPORTSWITCH){
+            addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
+        }
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
             ruralProjectMessageService.disposeList(reported);
@@ -2108,4 +2114,28 @@ public class RuralCostProjectMessageController extends BaseController {
             }
         }
     }
+    /**
+     * 设置上报按钮开关
+     */
+    @RequestMapping(value = "setReportSwitch")
+    @ResponseBody
+    public String setReportSwitch(boolean reportSwitch){
+        BaseController.REPORTSWITCH=reportSwitch;
+        String str="";
+        if (reportSwitch){
+            str="修改成功，上报按钮已开启";
+        }else{
+            str="修改成功，上报按钮已关闭";
+        }
+        return str;
+    }
+    /**
+     * 查询上报按钮开关
+     */
+    @RequestMapping(value = "getReportSwitch")
+    @ResponseBody
+    public boolean getReportSwitch(){
+        boolean falg=BaseController.REPORTSWITCH;
+        return falg;
+    }
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageAllController.java

@@ -117,6 +117,7 @@ public class RuralProjectMessageAllController extends BaseController {
         }
         model.addAttribute("beginDate", projectRecords.getBeginDate());
         model.addAttribute("endDate", projectRecords.getEndDate());
+        model.addAttribute("reportSwitch", BaseController.REPORTSWITCH);
         return "modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists";
     }
 
@@ -383,4 +384,20 @@ public class RuralProjectMessageAllController extends BaseController {
         ProjectRecords projectRecords = projectcontentinfo.getProject()==null?new ProjectRecords():projectcontentinfo.getProject();
         return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessageAll/?repage";
     }
+
+    /**
+     * 设置上报按钮开关
+     */
+    @RequestMapping(value = "setReportSwitch")
+    @ResponseBody
+    public String setReportSwitch(boolean reportSwitch){
+        BaseController.REPORTSWITCH=reportSwitch;
+        String str="";
+        if (reportSwitch){
+            str="修改成功，上报按钮已开启";
+        }else{
+            str="修改成功，上报按钮已关闭";
+        }
+        return str;
+    }
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -164,6 +164,7 @@ public class RuralProjectMessageController extends BaseController {
         }
         model.addAttribute("beginDate", projectRecords.getBeginDate());
         model.addAttribute("endDate", projectRecords.getEndDate());
+        model.addAttribute("reportSwitch", BaseController.REPORTSWITCH);
         return "modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists";
     }
 
@@ -1853,6 +1854,10 @@ public class RuralProjectMessageController extends BaseController {
      */
     @RequestMapping(value = "saveReported")
     public String saveReported(RuralProjectRecordsReported reported,  RedirectAttributes redirectAttributes) throws Exception {
+        if(!BaseController.REPORTSWITCH){
+            addMessage(redirectAttributes, "项目上报失败:上报管理员已关闭上报模块");
+            return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralProjectMessage/?repage";
+        }
         String str = "";
         if(!reported.getIsNewRecord()){//编辑表单保存
             ruralProjectMessageService.disposeList(reported);
@@ -2111,5 +2116,28 @@ public class RuralProjectMessageController extends BaseController {
         model.addAttribute("ruralProjectRecords", ruralProjectRecords);
         return "modules/projectFilingBatch/projectFilingBacthTaskTwo";
     }
-
+    /**
+     * 设置上报按钮开关
+     */
+    @RequestMapping(value = "setReportSwitch")
+    @ResponseBody
+    public String setReportSwitch(boolean reportSwitch){
+        BaseController.REPORTSWITCH=reportSwitch;
+        String str="";
+        if (reportSwitch){
+            str="修改成功，上报按钮已开启";
+        }else{
+            str="修改成功，上报按钮已关闭";
+        }
+        return str;
+    }
+    /**
+     * 查询上报按钮开关
+     */
+    @RequestMapping(value = "getReportSwitch")
+    @ResponseBody
+    public boolean getReportSwitch(){
+        boolean falg=BaseController.REPORTSWITCH;
+        return falg;
+    }
 }

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageLists.jsp

@@ -46,6 +46,18 @@
 				type : 'date'
 				, trigger: 'click'
 			});
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+				form.on('switch(reportSwitch)',function(data){
+					var flag=$(this).prop("checked")
+					$.ajax({
+						url: "${ctx}/ruralProject/ruralProjectMessageAll/setReportSwitch?reportSwitch="+flag,
+						success: function (data) {
+							top.layer.msg(data, {icon: 0});
+						}
+					});
+				})
+			})
         });
 
         function reset() {
@@ -165,6 +177,71 @@
 			});
 		}
 
+		function openDialogreReportSwitch(title,url,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			var split = buttons.split(",");
+			$.ajax({
+				url: "${ctx}/ruralProject/ruralCostProjectMessage/getReportSwitch",
+				success: function (data) {
+					if (data){
+						top.layer.open({
+							type: 2,
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							skin: 'three-btns',
+							content: url,
+							btn: split,
+							btn1: function(index, layero){
+								var body = top.layer.getChildFrame('body', index);
+								var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+								var inputForm = body.find('#inputForm');
+								var top_iframe;
+								if(target){
+									top_iframe = target;//如果指定了iframe，则在改frame中跳转
+								}else{
+									top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+								}
+								inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+								if(iframeWin.contentWindow.doSubmit(1) ){
+									// top.layer.close(index);//关闭对话框。
+									setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+								}
+							},
+							btn2:function(index,layero){
+								if(split.length==2){return}
+								var body = top.layer.getChildFrame('body', index);
+								var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+								var inputForm = body.find('#inputForm');
+								var top_iframe;
+								if(target){
+									top_iframe = target;//如果指定了iframe，则在改frame中跳转
+								}else{
+									top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+								}
+								inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+								if(iframeWin.contentWindow.doSubmit(2) ){
+									// top.layer.close(index);//关闭对话框。
+									setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+								}else {
+									return false;
+								}
+							},
+							btn3: function (index) {
+							}
+						});
+					}else{
+						top.layer.msg("上报功能已关闭", {icon: 0});
+					}
+				}
+			});
+		}
 
 		function openDialogreSub(title,url,width,height,target,formId,tableId) {
 			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
@@ -466,7 +543,7 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectMessage/" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectMessage/" method="post" class="form-inline layui-form">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<input id="toflag" name="toflag" type="hidden" value="1"/>
@@ -603,10 +680,11 @@
 						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
 						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
-<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
-<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
-<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
-
+						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportSwitch">
+							<div style="float: right;margin-right: 30px;">
+								<input type="checkbox" id="reportSwitch" <c:if test="${reportSwitch}">checked</c:if> lay-filter="reportSwitch" lay-skin="switch" lay-text="开启|关闭">
+							</div>
+						</shiro:hasPermission>
                     <div style="clear: both;"></div>
 				</div>
                 <table id="permissionTable" class="oa-table layui-table" lay-filter="permissionTable"></table>
@@ -928,7 +1006,7 @@
 						if(d.syncStatus == 0){
 							if(d.reportStatus == 0){
 								if(d.reportedState == 0 || d.reportedState == 6){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 上报</a>";
 									/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
 								}
 							}else{
@@ -937,11 +1015,11 @@
 								}
 								/*撤回修改*/
 								if(d.reportedState == 3){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
 								}
 								/*驳回修改*/
 								if(d.reportedState == 4){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
 								}
 							}
 						}

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists.jsp

@@ -43,6 +43,18 @@
 				type : 'date'
 				, trigger: 'click'
 			});
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+				form.on('switch(reportSwitch)',function(data){
+					var flag=$(this).prop("checked")
+					$.ajax({
+						url: "${ctx}/ruralProject/ruralCostProjectMessage/setReportSwitch?reportSwitch="+flag,
+						success: function (data) {
+							top.layer.msg(data, {icon: 0});
+						}
+					});
+				})
+			})
         });
 
         function reset() {
@@ -561,7 +573,11 @@
 <%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
 <%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
 <%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
-
+					<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportSwitch">
+						<div style="float: right;margin-right: 30px;">
+							<input type="checkbox" id="reportSwitch" <c:if test="${reportSwitch}">checked</c:if> lay-filter="reportSwitch" lay-skin="switch" lay-text="开启|关闭">
+						</div>
+					</shiro:hasPermission>
                     <div style="clear: both;"></div>
 				</div>
                 <table id="permissionTable" class="oa-table layui-table" lay-filter="permissionTable"></table>
@@ -574,7 +590,6 @@
 	<div id="changewidth"></div>
 </div>
 
-<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script>
 
     resizeListTable();

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp

@@ -44,6 +44,18 @@
 				type : 'date'
 				, trigger: 'click'
 			});
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+				form.on('switch(reportSwitch)',function(data){
+					var flag=$(this).prop("checked")
+					$.ajax({
+						url: "${ctx}/ruralProject/ruralCostProjectMessage/setReportSwitch?reportSwitch="+flag,
+						success: function (data) {
+							top.layer.msg(data, {icon: 0});
+						}
+					});
+				})
+			})
         });
 
         function reset() {
@@ -163,6 +175,71 @@
 			});
 		}
 
+		function openDialogreReportSwitch(title,url,width,height,target,buttons) {
+
+			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+				width = 'auto';
+				height = 'auto';
+			} else {//如果是PC端，根据用户设置的width和height显示。
+
+			}
+			var split = buttons.split(",");
+			$.ajax({
+				url: "${ctx}/ruralProject/ruralCostProjectMessage/getReportSwitch",
+				success: function (data) {
+					if (data){
+						top.layer.open({
+							type: 2,
+							area: [width, height],
+							title: title,
+							maxmin: true, //开启最大化最小化按钮
+							skin: 'three-btns',
+							content: url,
+							btn: split,
+							btn1: function(index, layero){
+								var body = top.layer.getChildFrame('body', index);
+								var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+								var inputForm = body.find('#inputForm');
+								var top_iframe;
+								if(target){
+									top_iframe = target;//如果指定了iframe，则在改frame中跳转
+								}else{
+									top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+								}
+								inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+								if(iframeWin.contentWindow.doSubmit(1) ){
+									// top.layer.close(index);//关闭对话框。
+									setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+								}
+							},
+							btn2:function(index,layero){
+								if(split.length==2){return}
+								var body = top.layer.getChildFrame('body', index);
+								var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+								var inputForm = body.find('#inputForm');
+								var top_iframe;
+								if(target){
+									top_iframe = target;//如果指定了iframe，则在改frame中跳转
+								}else{
+									top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+								}
+								inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+								if(iframeWin.contentWindow.doSubmit(2) ){
+									// top.layer.close(index);//关闭对话框。
+									setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+								}else {
+									return false;
+								}
+							},
+							btn3: function (index) {
+							}
+						});
+					}else{
+						top.layer.msg("上报功能已关闭", {icon: 0});
+					}
+				}
+			});
+		}
 
 		function openDialogreSub(title,url,width,height,target,formId,tableId) {
 			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
@@ -464,7 +541,7 @@
 	<div class="layui-row">
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
-				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectMessage/" method="post" class="form-inline">
+				<form:form id="searchForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralProjectMessage/" method="post" class="form-inline layui-form">
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 					<input id="toflag" name="toflag" type="hidden" value="1"/>
@@ -490,9 +567,7 @@
 									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
 									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
 								</div>
-<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
-<%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
-<%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
+
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -601,10 +676,11 @@
 						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
 						<button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
-<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
-<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
-<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
-
+					<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportSwitch">
+						<div style="float: right;margin-right: 30px;">
+							<input type="checkbox" id="reportSwitch" <c:if test="${reportSwitch}">checked</c:if> lay-filter="reportSwitch" lay-skin="switch" lay-text="开启|关闭">
+						</div>
+					</shiro:hasPermission>
                     <div style="clear: both;"></div>
 				</div>
                 <table id="permissionTable" class="oa-table layui-table" lay-filter="permissionTable"></table>
@@ -929,7 +1005,7 @@
 						if(d.syncStatus == 0){
 							if(d.reportStatus == 0){
 								if(d.reportedState == 0 || d.reportedState == 6){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</a>";
 									/*xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";*/
 								}
 							}else{
@@ -938,11 +1014,11 @@
 								}
 								/*撤回修改*/
 								if(d.reportedState == 3){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
 								}
 								/*驳回修改*/
 								if(d.reportedState == 4){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogreReportSwitch('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
 								}
 							}
 						}