Index: ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.js
===================================================================
diff -u -r12331 -r15072
--- ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.js	(.../satisfactionSurveyTableView.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.js	(.../satisfactionSurveyTableView.js)	(revision 15072)
@@ -63,8 +63,7 @@
 	    {header : "姓名",width : 80,dataIndex : 'userName'},
 	    {header : "填表时间",width : 120,dataIndex : 'surveyDate',renderer : myDateFormatByMinute},
 	    {header : "所属科室",width : 150,dataIndex : 'depart'},
-	    {header : "备注",width : 120,dataIndex : 'remark'},
-	    {header : "满意度调查表说明",width : 120,dataIndex : 'instructions',id:'autoWidth'}
+	    {header : "意见或建议",width : 120,dataIndex : 'remark',id:'autoWidth'}
 	];
 	
 	var filters = new Ext.grid.GridFilters({
Index: ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableWinForm.js
===================================================================
diff -u -r12331 -r15072
--- ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableWinForm.js	(.../satisfactionSurveyTableWinForm.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableWinForm.js	(.../satisfactionSurveyTableWinForm.js)	(revision 15072)
@@ -111,7 +111,7 @@
         	xtype:"fieldset", 
             layout:'column',
             title :'基础信息', 
-            height:180,
+            height:300,
             items:[{
 				layout : 'column',
 				items : [{
@@ -146,15 +146,15 @@
 				},{
 					columnWidth : 1,
 					layout : 'form',
-					labelWidth : 120,
+					labelWidth : 100,
 					items : [{
 						xtype : 'textarea',
 						fieldLabel : '描述说明',
 						id : 'instructions',
 						name : 'instructions',
 //						style:'margin-left:90px;text-align:center;',
 						maxLength : 2000,
-						height : 40,
+						height : 100,
 						allowBlank : true,
 						readOnly:true,
 						value:instructions,
@@ -164,7 +164,7 @@
 				},{
 					columnWidth : 0.5,
 					layout : 'form',
-					labelWidth : 120,
+					labelWidth : 100,
 					items : [{
 						xtype : 'textfield',
 						fieldLabel : '用户名',
@@ -180,7 +180,7 @@
 				},{
 					columnWidth : 0.5,
 					layout : 'form',
-					labelWidth : 120,
+					labelWidth : 100,
 					items : [{
 						xtype : 'textfield',
 						fieldLabel : '填表时间',
@@ -196,7 +196,7 @@
 				},{
 					columnWidth : 1,
 					layout : 'form',
-					labelWidth : 120,
+					labelWidth : 100,
 					items : [{
 						xtype : 'textfield',
 						fieldLabel : '所属科室',
@@ -212,14 +212,14 @@
 				},{
 					columnWidth : 1,
 					layout : 'form',
-					labelWidth : 120,
+					labelWidth : 100,
 					items : [{
 						xtype : 'textarea',
 						fieldLabel : '意见或建议',
 						id : 'remark',
 						name : 'remark',
 						maxLength : 200,
-						height : 40,
+						height : 100,
 						allowBlank : true,
 						anchor : '90%'
 					}]
@@ -330,7 +330,7 @@
 				valArr.push("'");
 				valArr.push(",satisfaction:'");
 				valArr.push(cNode.attributes.satisfaction);
-				//如果选择了不满意，让那货写明为啥不满意
+				//如果选择了不满意，需要写明为啥不满意
 				if(pNode.attributes.satisfaction=="NOSATISFACTION"){
 					var adviser = Ext.get('remark').getValue();
 					if(adviser==null||adviser.length==0||adviser.trim().length==0){
@@ -339,8 +339,8 @@
 						return false;
 					}
 				}
-				//如果选择了不太满意，让那货写明为啥不太满意
-				if(pNode.attributes.satisfaction=="NOTVERYSATISFACTION"){
+				//如果选择了不太满意，需要写明为啥不太满意
+				else if(pNode.attributes.satisfaction=="NOTVERYSATISFACTION"){
 					var adviser = Ext.get('remark').getValue();
 					if(adviser==null||adviser.length==0||adviser.trim().length==0){
 						isCheckedAll = false;
@@ -365,7 +365,7 @@
 			}
 			valArr.push(",satisfaction:'");
 			valArr.push(pNode.attributes.satisfaction);
-			//如果选择了不满意，让那货写明为啥不满意
+			//如果选择了不满意，需要写明为啥不满意
 			if(pNode.attributes.satisfaction=="NOSATISFACTION"){
 				var adviser = Ext.get('remark').getValue();
 				if(adviser==null||adviser.length==0||adviser.trim().length==0){
@@ -374,8 +374,8 @@
 					return false;
 				}
 			}
-			//如果选择了不太满意，让那货写明为啥不太满意
-			if(pNode.attributes.satisfaction=="NOTVERYSATISFACTION"){
+			//如果选择了不太满意，需要写明为啥不太满意
+			else if(pNode.attributes.satisfaction=="NOTVERYSATISFACTION"){
 				var adviser = Ext.get('remark').getValue();
 				if(adviser==null||adviser.length==0||adviser.trim().length==0){
 					isCheckedAll = false;
@@ -424,7 +424,10 @@
 
 
 function rendererHrefLink(v, p, record){
-	return "<a href=\"#\" onclick=\"showSatisfactionSurveyTableWin("+record.data['id']+", '"+v+"', '"+record.data['instructions']+"', function(){reloadSatisfactionSurveyTemplateTableTips()});return false;\">"+v+"</a>";
+	var instructions = record.data['instructions'];
+	instructions = instructions.replace('\n',''); //替换回车符，避免js函数的参数传值导致代码执行不成功
+	instructions = instructions.replace('\r','');
+	return "<a href=\"#\" onclick=\"showSatisfactionSurveyTableWin("+record.data['id']+", '"+v+"', '"+instructions+"', function(){reloadSatisfactionSurveyTemplateTableTips()});return false;\">"+v+"</a>";
 	//showSatisfactionSurveyTableWin(poId, name, instructions, function(){reloadSatisfactionSurveyTemplateTableTips()});
 }