git-svn-id: https://192.168.57.71/svn/jsgkj@1909 931142cf-59ea-a443-aa0e-51397b428577

gkoa/trunk/gkoa/WebContent/WEB-INF/pages/qlgk/gwcc/detail.jsp

@@ -21,7 +21,7 @@
   
 </script>
 <!-----------右边开始------------>
-<form id="gwccform" method="post" enctype="multipart/form-data">
+<form id="gwccform" method="post" novalidate>
 	<input type="hidden" id="id" name="id" value="${vo.id }" />
 	<input type="hidden" id="taskId" name="taskId" value="${taskId}"/>
 	<input type="hidden" id="flag" name="flag" value="${flag}" />

gkoa/trunk/gkoa/WebContent/WEB-INF/pages/qlgk/ndys/detail.jsp

@@ -49,7 +49,7 @@
        </h1>
        <div class="swgl_dj_content">
 			<h1>江苏省交通运输厅港口局编制年度预算稿纸</h1>
-        	<form id="bzysform" method="post" action="${ctx}/ndys/save" method="post" enctype="multipart/form-data">
+        	<form id="bzysform" method="post"  enctype="multipart/form-data">
 	        	<input type="hidden" id="method" name="method" value="${method }"> 
 	        	<input type="hidden" id="id" name="id" value="${record.id }"> 
 	        	<input type="hidden" value="${record.id}" id="ndysid">

gkoa/trunk/gkoa/WebContent/static/xt/js/common/xt.js

@@ -135,7 +135,14 @@
              * 弹出意见
              */
             showGryjDialog : function(config) {
-                var href = ctx + '/wf/task/gryj?yj='+encodeURI(encodeURI(config.yj));
+                var opinion= config.yj;
+                if(!isEmpty(config.yj)){
+                    opinion = opinion.replace(/&amp/g, "&");
+                    opinion = opinion.replace(/&lt/g, "<");
+                    opinion = opinion.replace(/&gt/g, ">");
+                    opinion = opinion.replace(/&quot/g, "\"");
+                }
+                var href = ctx + '/wf/task/gryj?yj='+encodeURI(encodeURI(opinion));
                 if (!(Xt.gryjDialog)) {
                     Xt.gryjDialog = $('<div/>');
                 }
@@ -150,6 +157,7 @@
                     modal : true,
                     toolbar : '#toolbar',
                     onLoad : function() {
+                        //$('#opinion1').val(config.yj)
                     },
                     onClose : function() {
                         Xt.gryjDialog.dialog('destroy');

gkoa/trunk/gkoa/WebContent/static/xt/js/fwgl/dbfw/detail.js

@@ -71,11 +71,18 @@ fwgl.dbfw.detail.pop = function(flag) {
              }
          }, "json");		
     }else{
+        var opinion= $("#opinion").val();
+        if(!isEmpty(opinion)){
+            opinion = opinion.replace(/&amp/g, "&");
+            opinion = opinion.replace(/&lt/g, "<");
+            opinion = opinion.replace(/&gt/g, ">");
+            opinion = opinion.replace(/&quot/g, "\"");
+        }
         $.post($.ctx + "/dbfw/isLastStep", {
             wfid : 'fw',
             taskId:$("#taskid").val(),
             id:$("#fwid").val(),
-            yj:$("#opinion").val()
+            yj:opinion
         }, function(data, status) {
             if (data.success) {
             	//var flag = data.attrs.flag;
@@ -90,7 +97,7 @@ fwgl.dbfw.detail.pop = function(flag) {
                                 step:rows[0].step,
                                 usersStr:encodeURI(rows[0].users),
                                 id:$("#fwid").val(),
-                                yj:$("#opinion").val(),
+                                yj:opinion,
                                 days:rows[0].days
                             }, function(data, status) {
                                 if (data.success) {
@@ -321,7 +328,10 @@ fwgl.dbfw.detail.opWin=function(){
 	        if (!status) { return; }
 	    	var flag = $("#opflag").val();
 	    	var opinion = $('#opinion1').val();
-	    	opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
+	    	opinion = opinion.replace(/&/g, "&amp");
+            opinion = opinion.replace(/</g, "&lt");
+            opinion = opinion.replace(/>/g, "&gt");
+            opinion = opinion.replace(/"/g, "&quot");
 	    	$("#opinion").val(opinion);
 	    	var str = "<span style='color:blue;cursor: pointer;' onclick='fwgl.dbfw.detail.opWin()'>修改</span>&nbsp;"
 	    			+ "<span style='color:blue;cursor: pointer;' onclick='fwgl.dbfw.detail.delop()'>删除</span>";

gkoa/trunk/gkoa/WebContent/static/xt/js/jsta/dbjsta/detail.js

@@ -71,11 +71,18 @@ jsta.dbjsta.detail.pop = function(flag) {
              }
          }, "json");		
     }else{
+        var opinion= $("#opinion").val();
+        if(!isEmpty(opinion)){
+            opinion = opinion.replace(/&amp/g, "&");
+            opinion = opinion.replace(/&lt/g, "<");
+            opinion = opinion.replace(/&gt/g, ">");
+            opinion = opinion.replace(/&quot/g, "\"");
+        }
         $.post($.ctx + "/dbjsta/isLastStep", {
             wfid : 'jsta',
             taskId:$("#taskid").val(),
             id:$("#jstaid").val(),
-            yj:$("#opinion").val()
+            yj:opinion
         }, function(data, status) {
             if (data.success) {
             	//var flag = data.attrs.flag;
@@ -89,7 +96,7 @@ jsta.dbjsta.detail.pop = function(flag) {
                                 step:rows[0].step,
                                 usersStr:encodeURI(rows[0].users),
                                 id:$("#jstaid").val(),
-                                yj:$("#opinion").val(),
+                                yj:opinion,
                                 days:rows[0].days
                             }, function(data, status) {
                                 if (data.success) {
@@ -303,7 +310,11 @@ jsta.dbjsta.detail.opWin=function(){
 	        if (!status) { return; }
 	    	var flag = $("#opflag").val();
 	    	var opinion = $('#opinion1').val();
-	    	opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
+	        opinion = opinion.replace(/&/g, "&amp");
+            opinion = opinion.replace(/</g, "&lt");
+            opinion = opinion.replace(/>/g, "&gt");
+            opinion = opinion.replace(/"/g, "&quot");
+	    	//opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
 	    	$("#opinion").val(opinion);
 	    	var str = "<span style='color:blue;cursor: pointer;' onclick='jsta.dbjsta.detail.opWin()'>修改</span>&nbsp;"
 	    			+ "<span style='color:blue;cursor: pointer;' onclick='jsta.dbjsta.detail.delop()'>删除</span>";

gkoa/trunk/gkoa/WebContent/static/xt/js/qbgl/dbqb/detail.js

@@ -202,10 +202,17 @@ qbgl.dbqb.detail.showWin = function(flag) {
               }
           }, "json");
     }else{
+        var opinion= $("#opinion").val();
+        if(!isEmpty(opinion)){
+            opinion = opinion.replace(/&amp/g, "&");
+            opinion = opinion.replace(/&lt/g, "<");
+            opinion = opinion.replace(/&gt/g, ">");
+            opinion = opinion.replace(/&quot/g, "\"");
+        }
         $.post($.ctx + "/dbqb/isLastStep", {
             wfid : 'qb',
             taskId:$("#taskId").val(),
-            opStr:encodeURI($("#opinion").val()),
+            opStr:opinion,
             sfjs : flag,
             id:$("#id").val()
         }, function(data, status) {
@@ -224,7 +231,7 @@ qbgl.dbqb.detail.showWin = function(flag) {
                             id:$("#id").val(),
                             taskId:$("#taskId").val(),
                             days:rows[0].days,
-                            opStr:encodeURI($("#opinion").val())
+                            opStr:opinion
                         }, function(data, status) {
                             if (data.success) {
                             	window.location=$.ctx+"/dbqb/main";
@@ -320,7 +327,11 @@ qbgl.dbqb.detail.opWin=function(){
 	        if (!status) { return; }
 	    	var flag = $("#opflag").val();
 	    	var opinion = $('#opinion1').val();
-	    	opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
+	        opinion = opinion.replace(/&/g, "&amp");
+            opinion = opinion.replace(/</g, "&lt");
+            opinion = opinion.replace(/>/g, "&gt");
+            opinion = opinion.replace(/"/g, "&quot");
+	    	//opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
 	    	$("#opinion").val(opinion);
 	    	var str = "<span style='color:blue;cursor: pointer;' onclick='qbgl.dbqb.detail.opWin()'>修改</span>&nbsp;"
 	    			+ "<span style='color:blue;cursor: pointer;' onclick='qbgl.dbqb.detail.delop()'>删除</span>";

gkoa/trunk/gkoa/WebContent/static/xt/js/qlgk/gwcc/detail.js

@@ -156,11 +156,18 @@ qlgk.gwcc.detail.showWin=function(flag){
             }
         }, "json");
     }else{
+        var opinion= $("#opinion").val();
+        if(!isEmpty(opinion)){
+            opinion = opinion.replace(/&amp/g, "&");
+            opinion = opinion.replace(/&lt/g, "<");
+            opinion = opinion.replace(/&gt/g, ">");
+            opinion = opinion.replace(/&quot/g, "\"");
+        }
         $.post($.ctx + "/gwcc/isLastStep", {
             wfid : 'gwcc',
             taskId:$("#taskId").val(),
             id:$("#id").val(),
-            opStr:encodeURI($("#opinion").val())
+            opStr:opinion
         }, function(data, status) {
             if (data.success) {
             	//var flag = data.attrs.flag
@@ -176,7 +183,7 @@ qlgk.gwcc.detail.showWin=function(flag){
                             usersStr:encodeURI(rows[0].users),
                             id:$("#id").val(),
                             days:rows[0].days,
-                            opStr:encodeURI($("#opinion").val())
+                            opStr:opinion
                         }, function(data, status) {
                             if (data.success) {
                             	window.location=$.ctx+"/gwcc/main";
@@ -291,7 +298,10 @@ qlgk.gwcc.detail.opWin=function(){
             if (!status) { return; }
             var flag = $("#opflag").val();
             var opinion = $('#opinion1').val();
-            opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
+            opinion = opinion.replace(/&/g, "&amp");
+            opinion = opinion.replace(/</g, "&lt");
+            opinion = opinion.replace(/>/g, "&gt");
+            opinion = opinion.replace(/"/g, "&quot");
             $("#opinion").val(opinion);
             var str = "<span style='color:blue;cursor: pointer;' onclick='qlgk.gwcc.detail.opWin()'>修改</span>&nbsp;"
                     + "<span style='color:blue;cursor: pointer;' onclick='qlgk.gwcc.detail.delop()'>删除</span>";

gkoa/trunk/gkoa/WebContent/static/xt/js/qlgk/ygcg/detail.js

@@ -155,11 +155,18 @@ qlgk.ygcg.detail.showWin=function(flag){
             }
         }, "json");
     }else{
+        var opinion= $("#opinion").val();
+        if(!isEmpty(opinion)){
+            opinion = opinion.replace(/&amp/g, "&");
+            opinion = opinion.replace(/&lt/g, "<");
+            opinion = opinion.replace(/&gt/g, ">");
+            opinion = opinion.replace(/&quot/g, "\"");
+        }
         $.post($.ctx + "/ygcg/isLastStep", {
             wfid : 'ygcg',
             taskId:$("#taskId").val(),
             id:$("#id").val(),
-            opStr:encodeURI($("#opinion").val())
+            opStr:opinion
         }, function(data, status) {
             if (data.success) {
             	//var flag = data.attrs.flag
@@ -174,7 +181,7 @@ qlgk.ygcg.detail.showWin=function(flag){
                             usersStr:encodeURI(rows[0].users),
                             id:$("#id").val(),
                             days:rows[0].days,
-                            opStr:encodeURI($("#opinion").val())
+                            opStr:opinion
                         }, function(data, status) {
                             if (data.success) {
                             	window.location=$.ctx+"/ygcg/main";

gkoa/trunk/gkoa/WebContent/static/xt/js/qlgk/yszx/detail.js

@@ -148,11 +148,18 @@ qlgk.yszx.detail.showWin=function(flag){
             }
         }, "json");
     }else{
+        var opinion= $("#opinion").val();
+        if(!isEmpty(opinion)){
+            opinion = opinion.replace(/&amp/g, "&");
+            opinion = opinion.replace(/&lt/g, "<");
+            opinion = opinion.replace(/&gt/g, ">");
+            opinion = opinion.replace(/&quot/g, "\"");
+        }
         $.post($.ctx + "/yszx/isLastStep", {
             wfid : 'yszx',
             taskId:$("#taskId").val(),
             id:$("#id").val(),
-            opStr:encodeURI($("#opinion").val())
+            opStr:opinion
         }, function(data, status) {
             if (data.success) {
             	//var flag = data.attrs.flag
@@ -167,7 +174,7 @@ qlgk.yszx.detail.showWin=function(flag){
                             usersStr:encodeURI(rows[0].users),
                             id:$("#id").val(),
                             days:rows[0].days,
-                            opStr:encodeURI($("#opinion").val())
+                            opStr:opinion
                         }, function(data, status) {
                             if (data.success) {
                             	window.location=$.ctx+"/yszx/main";

gkoa/trunk/gkoa/WebContent/static/xt/js/swgl/dbsw/detail.js

@@ -199,12 +199,19 @@ swgl.dbsw.detail.showWin=function(flag){
             }
         }, "json");
     }else{
+        var opinion= $("#opinion").val();
+        if(!isEmpty(opinion)){
+            opinion = opinion.replace(/&amp/g, "&");
+            opinion = opinion.replace(/&lt/g, "<");
+            opinion = opinion.replace(/&gt/g, ">");
+            opinion = opinion.replace(/&quot/g, "\"");
+        }
         $.post($.ctx + "/dbsw/isLastStep", {
             wfid : 'sw',
             taskId:$("#taskId").val(),
             id:$("#id").val(),
             sfjs : flag,
-            opStr:encodeURI($("#opinion").val())
+            opStr:opinion
         }, function(data, status) {
             swgl.dbsw.detail.setCookie("tempyj","",24,"/");
             swgl.dbsw.detail.setCookie("tempopinion","",24,"/");
@@ -220,7 +227,7 @@ swgl.dbsw.detail.showWin=function(flag){
                              $.post($.ctx + "/dbsw/submit", {
                                  step:rows[0].step,
                                  usersStr:encodeURI(rows[0].users),
-                                 opStr:encodeURI($("#opinion").val()),
+                                 opStr:opinion,
                                  id:$("#id").val(),
                                  taskId:$("#taskId").val(),
                                  days:rows[0].days
@@ -461,7 +468,11 @@ swgl.dbsw.detail.opWin=function(){
 	        if (!status) { return; }
 	    	var flag = $("#opflag").val();
 	    	var opinion = $('#opinion1').val();
-	    	opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
+	    	   opinion = opinion.replace(/&/g, "&amp");
+	            opinion = opinion.replace(/</g, "&lt");
+	            opinion = opinion.replace(/>/g, "&gt");
+	            opinion = opinion.replace(/"/g, "&quot");
+	    	//opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
 	    	$("#opinion").val(opinion);
 	    	swgl.dbsw.detail.setCookie("tempopinion",opinion,24,"/");
 	    	var str = "<span style='color:blue;cursor: pointer;' onclick='swgl.dbsw.detail.opWin()'>修改</span>&nbsp;"+

gkoa/trunk/gkoa/WebContent/static/xt/js/xfjbl/dbxfj/detail.js

@@ -158,11 +158,18 @@ xfjbl.dbxfj.detail.showWin=function(flag){
             }
         }, "json");
     }else{
+        var opinion= $("#opinion").val();
+        if(!isEmpty(opinion)){
+            opinion = opinion.replace(/&amp/g, "&");
+            opinion = opinion.replace(/&lt/g, "<");
+            opinion = opinion.replace(/&gt/g, ">");
+            opinion = opinion.replace(/&quot/g, "\"");
+        }
         $.post($.ctx + "/dbxfj/isLastStep", {
             wfid : 'xfjbl',
             taskId:$("#taskId").val(),
             id:$("#id").val(),
-            opStr:encodeURI($("#opinion").val())
+            opStr:opinion
         }, function(data, status) {
             if (data.success) {
             		 Xt.showChooseUserDialog({
@@ -174,7 +181,7 @@ xfjbl.dbxfj.detail.showWin=function(flag){
                              $.post($.ctx + "/dbxfj/submit", {
                                  step:rows[0].step,
                                  usersStr:encodeURI(rows[0].users),
-                                 yj:encodeURI($("#opinion").val()),
+                                 yj:opinion,
                                  id:$("#id").val(),
                                  days:rows[0].days
                              }, function(data, status) {
@@ -345,7 +352,11 @@ xfjbl.dbxfj.detail.opWin=function(){
 	        if (!status) { return; }
 	    	var flag = $("#opinionflag").val();
 	    	var opinion = $('#opinion1').val();
-	    	opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
+	        opinion = opinion.replace(/&/g, "&amp");
+            opinion = opinion.replace(/</g, "&lt");
+            opinion = opinion.replace(/>/g, "&gt");
+            opinion = opinion.replace(/"/g, "&quot");
+	    	//opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
 	    	$("#opinion").val(opinion);
 	    	var str = "<span style='color:blue;cursor: pointer;' onclick='xfjbl.dbxfj.detail.opWin()'>修改</span>&nbsp;"+
 	        "<span style='color:blue;cursor: pointer;' onclick='xfjbl.dbxfj.detail.delop()'>删除</span>";

gkoa/trunk/gkoa/WebContent/static/xt/js/zwxx/dbzw/detail.js

@@ -127,11 +127,18 @@ zwxx.dbzw.detail.showWin = function(flag) {
         }, "json");
     }
     else {
+        var opinion= $("#opinion").val();
+        if(!isEmpty(opinion)){
+            opinion = opinion.replace(/&amp/g, "&");
+            opinion = opinion.replace(/&lt/g, "<");
+            opinion = opinion.replace(/&gt/g, ">");
+            opinion = opinion.replace(/&quot/g, "\"");
+        }
         $.post($.ctx + "/dbzw/isLastStep", {
             wfid : 'zw',
             taskId : $("#taskId").val(),
             id : $("#id").val(),
-            opStr:encodeURI($("#opinion").val())
+            opStr:opinion
         }, function(data, status) {
             if (data.success) {
                 //var flag = data.attrs.flag
@@ -146,7 +153,7 @@ zwxx.dbzw.detail.showWin = function(flag) {
                             step:rows[0].step,
                             usersStr:encodeURI(rows[0].users),
                             id:$("#id").val(),
-                            opStr:encodeURI($("#opinion").val()),
+                            opStr:opinion,
                             days:rows[0].days
                         }, function(data, status) {
                             if (data.success) {
@@ -335,7 +342,11 @@ zwxx.dbzw.detail.opWin = function() {
 	        if (!status) { return; }
 	    	var flag = $("#opflag").val();
 	    	var opinion = $('#opinion1').val();
-	    	opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
+	    	opinion = opinion.replace(/&/g, "&amp");
+            opinion = opinion.replace(/</g, "&lt");
+            opinion = opinion.replace(/>/g, "&gt");
+            opinion = opinion.replace(/"/g, "&quot");
+	    	//opinion = opinion.replace(/(^\s*)|(\s*$)/g, "");
 	    	$("#opinion").val(opinion);
 	    	var str = "<span style='color:blue;cursor: pointer;' onclick='zwxx.dbzw.detail.opWin()'>修改</span>&nbsp;"
 	    			+ "<span style='color:blue;cursor: pointer;' onclick='zwxx.dbzw.detail.delop()'>删除</span>";