首页我的项目筛选方法变更

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordReportDao.xml

@@ -187,7 +187,7 @@
 			or ((prr.status != 5 or prr.status is null) and a.reported_state=5 and prd.update_date is null))
 			)-->
 			and (a.create_by = #{createBy.id} or w1.user_id = #{createBy.id})
-			and ((prr.status != 5 or prr.status is null) or (a.reported_state is null or a.reported_state = '6'))
+			and ((prr.status != 5 or prr.status is null) or (a.reported_state is null or a.reported_state not in ('5','7')))
 			and a.status = 5
 		</where>
 		ORDER BY a.create_date DESC

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -770,7 +770,7 @@
 			or (((prr.status != 5 or prr.status is null) and a.reported_state=5 and date_add(prd.update_date,interval 40 day)>= now())
 			or ((prr.status != 5 or prr.status is null) and a.reported_state=5 and prd.update_date is null))
 			)-->
-			and ((prr.status != 5 or prr.status is null) or (a.reported_state is null or a.reported_state = '6'))
+			and ((prr.status != 5 or prr.status is null) or (a.reported_state is null or a.reported_state not in ('5','7')))
 			and a.status = 5
 			and (a.create_by = #{createBy.id} or w1.user_id = #{createBy.id})
 			<if test="projectId != null and projectId != ''">
@@ -859,7 +859,7 @@
 			or (((prr.status != 5 or prr.status is null) and a.reported_state=5 and date_add(prd.update_date,interval 40 day)>= now())
 			or ((prr.status != 5 or prr.status is null) and a.reported_state=5 and prd.update_date is null))
 			)-->
-			and ((prr.status != 5 or prr.status is null) or (a.reported_state is null or a.reported_state = '6'))
+			and ((prr.status != 5 or prr.status is null) or (a.reported_state is null or a.reported_state not in ('5','7')))
 			and a.status = 5
 			and (a.create_by = #{createBy.id} or w1.user_id = #{createBy.id})
 			<if test="projectId != null and projectId != ''">
@@ -953,7 +953,7 @@
 			or (((prr.status != 5 or prr.status is null) and a.reported_state=5 and date_add(prd.update_date,interval 40 day)>= now())
 			or ((prr.status != 5 or prr.status is null) and a.reported_state=5 and prd.update_date is null))
 			)-->
-			and (prr.status = 5 and (a.reported_state = '5' or a.reported_state = '7'))
+			and (prr.status = 5 and (a.reported_state in ('5','7')))
 			and a.status = 5
 			and (a.create_by = #{createBy.id} or w1.user_id = #{createBy.id})
 			<if test="projectId != null and projectId != ''">
@@ -1042,7 +1042,7 @@
 			or (((prr.status != 5 or prr.status is null) and a.reported_state=5 and date_add(prd.update_date,interval 40 day)>= now())
 			or ((prr.status != 5 or prr.status is null) and a.reported_state=5 and prd.update_date is null))
 			)-->
-			and (prr.status = 5 and (a.reported_state = '5' or a.reported_state = '7'))
+			and (prr.status = 5 and (a.reported_state in ('5','7')))
 			and a.status = 5
 			and (a.create_by = #{createBy.id} or w1.user_id = #{createBy.id})
 			<if test="projectId != null and projectId != ''">

src/main/webapp/webpage/modules/ProjectFollowReport/ProjectFollowReportList.jsp

@@ -225,7 +225,7 @@
 							}
 						});
 					}else{
-						top.layer.msg("该咨询报告信息不存在！", {icon: 0});
+						top.layer.msg("该咨询报告信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}
@@ -263,7 +263,7 @@
 							}
 						});
 					}else{
-						top.layer.msg("该咨询报告信息不存在！", {icon: 0});
+						top.layer.msg("该咨询报告信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}

src/main/webapp/webpage/modules/oa/oaNotifyList.jsp

@@ -271,7 +271,7 @@
 							}
 						});
 					}else{
-						top.layer.msg("该公告信息不存在！", {icon: 0});
+						top.layer.msg("该公告信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}
@@ -309,7 +309,7 @@
 							}
 						});
 					}else{
-						top.layer.msg("该公告信息不存在！", {icon: 0});
+						top.layer.msg("该公告信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}
@@ -475,7 +475,7 @@
                         if(d.candel != undefined && d.candel == "1")
                             xml += "<a href=\"${ctx}/oa/oaNotify/delete?id="+ d.id +"\" onclick=\"return confirmx('确认要关闭该公告吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 关闭</a>";
                         if(d.canmodify != undefined && d.canmodify =="1"){
-                            xml+="<a href=\"#\" onclick=\"openDialogreModify('修改公告', '${ctx}/oa/oaNotify/modify?id=" + d.id + "','95%', '95%','" + d.id + "','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogreModify('修改公告', '${ctx}/oa/oaNotify/modify?id=" + d.id + "','" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1"){
                             xml+="<a href=\"${ctx}/oa/oaNotify/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该公告吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";

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

@@ -178,7 +178,7 @@
 							}
 						});
 					}else{
-						top.layer.msg("该项目报告信息不存在！", {icon: 0});
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}
@@ -251,7 +251,7 @@
 							}
 						});
 					}else{
-						top.layer.msg("该项目报告信息不存在！", {icon: 0});
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}

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

@@ -178,7 +178,7 @@
 							}
 						});
 					}else{
-						top.layer.msg("该项目报告信息不存在！", {icon: 0});
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}
@@ -251,7 +251,7 @@
 							}
 						});
 					}else{
-						top.layer.msg("该项目报告信息不存在！", {icon: 0});
+						top.layer.msg("该项目报告信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}

src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp

@@ -240,7 +240,7 @@
 
         }
 
-		function openDialogreModify(title,url,id,width,height,target,buttons) {
+		function openDialogreModify(title,url,id,width,height,target) {
 
 			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 				width = 'auto';
@@ -255,55 +255,37 @@
 				dataType: "json",
 				success: function (data) {
 					if(data.success){
-						var split = buttons.split(",");
-						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) {
-							}
-						});
+                        top.layer.open({
+                            type: 2,
+                            area: [width, height],
+                            title: title,
+                            maxmin: true, //开启最大化最小化按钮
+                            content: url ,
+                            skin:"two-btns",
+                            btn: ['送审','关闭'],
+                            yes: 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() ){
+                                    top.layer.close(index);//关闭对话框。
+                                    //setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒，对应360 7.1版本bug
+                                }
+
+                            },
+                            cancel: function(index){
+                            }
+                        });
 					}else{
-						top.layer.msg("该发票信息不存在！", {icon: 0});
+						top.layer.msg("该发票信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}
@@ -341,7 +323,7 @@
 							}
 						});
 					}else{
-						top.layer.msg("该发票信息不存在！", {icon: 0});
+						top.layer.msg("该发票信息已删除！", {icon: 0});
 						window.location.reload();
 					}
 				}

src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -442,7 +442,7 @@
                         }
                     });
                 }else{
-                    top.layer.msg("该报销信息不存在！", {icon: 0});
+                    top.layer.msg("该报销信息已删除！", {icon: 0});
                     window.location.reload();
                 }
             }
@@ -480,7 +480,7 @@
                         }
                     });
                 }else{
-                    top.layer.msg("该报销信息不存在！", {icon: 0});
+                    top.layer.msg("该报销信息已删除！", {icon: 0});
                     window.location.reload();
                 }
             }