Index: ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js
===================================================================
diff -u -r39072 -r39073
--- ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js	(.../satisfactionSurveyTemplateForm.js)	(revision 39072)
+++ ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js	(.../satisfactionSurveyTemplateForm.js)	(revision 39073)
@@ -24,6 +24,11 @@
 var defaultSatisfactionOption = [];
 function addSatisfactionSurveyTemplate(id, status, ishidden, isclear) {
 	var showDefaultSatisfactionOption = false;
+	var columns = [{
+		header: '项目内容',
+		width: ishidden ? 380 : 300,
+		dataIndex: 'content'
+	}]
 	if (sstsConfig.satisfactionSurveyMode == 1) {
 		defaultSatisfactionOption = [{
 			satisfactionOption: {
@@ -42,31 +47,49 @@
 				var success = result.success;
 				if (success && result.data) {
 					for (var i = 0; i < result.data.length; i++) {
-						defaultSatisfactionOption.push({
-							satisfactionOption: {
-								id: result.data[i].satisfactionOption.id,
-								satisfaction: result.data[i].satisfactionOption.satisfaction
-							}
-						})
+						(function (temp) {
+							var satisfaction = result.data[temp].satisfaction;
+							defaultSatisfactionOption.push({
+								satisfactionOption: {
+									id: result.data[temp].satisfactionOption.id,
+									satisfaction: result.data[temp].satisfactionOption.satisfaction
+								}
+							})
+							columns.push({
+								header: satisfaction,
+								width: 70,
+								hidden: ishidden,
+								renderer: function (v, p, record) {
+									return record[satisfaction]
+								}
+							})
+						})(i)
 					}
 				}
 			}
 		});
 		if (ishidden) {
 			showDefaultSatisfactionOption = true;
+			columns.push({
+				header: '默认选项',
+				width: 100,
+				dataIndex: 'defaultSatisfactionOption',
+				renderer: function (v, p, record) {
+					var str = "<select onclick=\"var currentTab = getCurrentTab();currentTab.setClickType('select');\" onchange=\"var currentTab = getCurrentTab();currentTab.changeDefaultSatisfactionOption(this.selectedIndex);\">";
+					for (var i = 0; i < defaultSatisfactionOption.length; i++) {
+						var selectHtml = '';
+						if (record.defaultSatisfactionOptionInstance && record.defaultSatisfactionOptionInstance.satisfactionOption.id == defaultSatisfactionOption[i].satisfactionOption.id) {
+							selectHtml = 'selected';
+						}
+						str += "<option value='" + defaultSatisfactionOption[i].satisfactionOption.id + "' " + selectHtml + ">" + defaultSatisfactionOption[i].satisfactionOption.satisfaction + "</option>";
+					}
+					str += "</select>";
+					return str;
+				}
+			})
 		}
-	}
-	var satisfactionSurveyTree = new top.Ext.tree.ColumnTree({
-		rootVisible: false,
-		autoScroll: true,
-		bodyStyle: 'border:1px solid #afd7af',
-		containerScroll: true,
-		height: 290,
-		columns: [{
-			header: '项目内容',
-			width: ishidden ? 380 : 300,
-			dataIndex: 'content'
-		}, {
+	}else {
+		columns.push({
 			header: '满意',
 			width: 40,
 			hidden: ishidden,
@@ -91,53 +114,46 @@
 			width: 50,
 			hidden: ishidden,
 			dataIndex: 'noSatisfy'
-		}, {
-			header: '默认选项',
-			width: 100,
-			dataIndex: 'defaultSatisfactionOption',
-			hidden: !showDefaultSatisfactionOption,
-			renderer: function (v, p, record) {
-				var str = "<select onclick=\"var currentTab = getCurrentTab();currentTab.setClickType('select');\" onchange=\"var currentTab = getCurrentTab();currentTab.changeDefaultSatisfactionOption(this.selectedIndex);\">";
-				for (var i = 0; i < defaultSatisfactionOption.length; i++) {
-					var selectHtml = '';
-					if (record.defaultSatisfactionOptionInstance && record.defaultSatisfactionOptionInstance.satisfactionOption.id == defaultSatisfactionOption[i].satisfactionOption.id) {
-						selectHtml = 'selected';
-					}
-					str += "<option value='" + defaultSatisfactionOption[i].satisfactionOption.id + "' " + selectHtml + ">" + defaultSatisfactionOption[i].satisfactionOption.satisfaction + "</option>";
-				}
-				str += "</select>";
-				return str;
+		})
+	}
+
+	columns.push({
+		header: '删除',
+		width: 40,
+		hidden: !ishidden,
+		dataIndex: 'del',
+		renderer: function (v, p, record) {
+			return "<img src=\"" + WWWROOT + "/images/web/stop.png\" alt=\"删除\" onclick=\"var currentTab = getCurrentTab();currentTab.setClickType('del');\" >";
+		}
+	}, {
+		header: '添加',
+		width: 40,
+		hidden: !ishidden,
+		dataIndex: 'add',
+		renderer: function (v, p, record) {
+			var str = "";
+			if (!record.leaf) {
+				str = "<img src=\"" + WWWROOT + "/images/web/maximize.png\" alt=\"新增\" onclick=\"var currentTab = getCurrentTab();currentTab.setClickType('add')\" >";
 			}
-		}, {
-			header: '删除',
-			width: 40,
-			hidden: !ishidden,
-			dataIndex: 'del',
-			renderer: function (v, p, record) {
-				return "<img src=\"" + WWWROOT + "/images/web/stop.png\" alt=\"删除\" onclick=\"var currentTab = getCurrentTab();currentTab.setClickType('del');\" >";
-			}
-		}, {
-			header: '添加',
-			width: 40,
-			hidden: !ishidden,
-			dataIndex: 'add',
-			renderer: function (v, p, record) {
-				var str = "";
-				if (!record.leaf) {
-					str = "<img src=\"" + WWWROOT + "/images/web/maximize.png\" alt=\"新增\" onclick=\"var currentTab = getCurrentTab();currentTab.setClickType('add')\" >";
-				}
-				return str;
-			}
-		}, {
-			header: '上下移',
-			width: 90,
-			hidden: !ishidden,
-			dataIndex: 'remove',
-			renderer: function (v, p, record) {
-				return "<img src=\"" + WWWROOT + "/images/table/moveUp.gif\" alt=\"上移\" onclick=\"var currentTab = getCurrentTab();currentTab.setClickType('up');\" >&nbsp;&nbsp;<img src=\"" + WWWROOT + "/images/table/moveDown.gif\" alt=\"下移\" onclick=\"var currentTab = getCurrentTab();currentTab.setClickType('down')\" >";
-			}
-		}],
+			return str;
+		}
+	}, {
+		header: '上下移',
+		width: 90,
+		hidden: !ishidden,
+		dataIndex: 'remove',
+		renderer: function (v, p, record) {
+			return "<img src=\"" + WWWROOT + "/images/table/moveUp.gif\" alt=\"上移\" onclick=\"var currentTab = getCurrentTab();currentTab.setClickType('up');\" >&nbsp;&nbsp;<img src=\"" + WWWROOT + "/images/table/moveDown.gif\" alt=\"下移\" onclick=\"var currentTab = getCurrentTab();currentTab.setClickType('down')\" >";
+		}
+	})
 
+	var satisfactionSurveyTree = new top.Ext.tree.ColumnTree({
+		rootVisible: false,
+		autoScroll: true,
+		bodyStyle: 'border:1px solid #afd7af',
+		containerScroll: true,
+		height: 290,
+		columns: columns,
 		loader: new top.Ext.tree.TreeLoader({
 			url: WWWROOT + '/disinfectSystem/satisfactionsurvey/satisfactionSurveyTemplateAction!loadSatisfactionSurveyTemplateItem.do',
 			baseParams: { id: id, ishidden: ishidden },
@@ -846,7 +862,7 @@
 		waitMsg: '正在保存数据，请稍候',
 		waitTitle: '提交表单',
 		success: function (form, action) {
-			//grid.dwrReload();
+			grid.dwrReload();
 			wwindow.close();
 			if (action.result.success) {
 				showResult("保存成功！");