Index: ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js =================================================================== diff -u -r32360 -r35821 --- ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js (.../satisfactionSurveyTableForm.js) (revision 32360) +++ ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js (.../satisfactionSurveyTableForm.js) (revision 35821) @@ -322,7 +322,7 @@ var remark = top.Ext4.getCmp('remark').getValue(); if (childNode.get('leaf')) { var satisfaction = childNode.get('satisfaction'); - if (!satisfaction) { + if (!satisfaction || satisfaction == '无') { showResult("请为“" + node.content + "”内容项选择满意度!"); return false; } else if (satisfaction == NOTVERYSATISFACTION && !remark) { @@ -343,7 +343,7 @@ node2.id = childNode2.get('id'); node2.content = childNode2.get('content'); var satisfaction = childNode2.get('satisfaction'); - if (!satisfaction) { + if (!satisfaction || satisfaction == '无') { showResult("请为“" + node2.content + "”内容项选择满意度!"); return false; } else if (satisfaction == NOTVERYSATISFACTION && !remark) { Index: ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js =================================================================== diff -u -r32450 -r35821 --- ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js (.../satisfactionSurveyTemplateForm.js) (revision 32450) +++ ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js (.../satisfactionSurveyTemplateForm.js) (revision 35821) @@ -17,7 +17,11 @@ if(isExist) { return; } - var childNode = createNode(true,'',templateContent); + var defaultSatisfaction = '无'; + if(sstsConfig.enableDefaultSatisfactionOptionsFunction){ + defaultSatisfaction = top.Ext.getCmp('defaultSatisfaction').getValue(); + } + var childNode = createNode(true,'',templateContent,defaultSatisfaction); rootNode.appendChild(childNode); } @@ -365,6 +369,35 @@ handler : function() { addItem(satisfactionSurveyTree); } + },'->',{ + text:'默认满意度:', + hidden:!sstsConfig.enableDefaultSatisfactionOptionsFunction + },{ + xtype : 'combo', + id : 'defaultSatisfaction', + name : 'defaultSatisfaction', + hidden:!sstsConfig.enableDefaultSatisfactionOptionsFunction, + valueField : 'value', + displayField : 'text', + width:100, + store : new Ext.data.SimpleStore({ + fields: ['text','value'], + data : [ + ['无',''], + ['满意', SATISFACTION], + ['较满意',MORESATISFACTION], + ['基本满意',BASICSATISFACTION], + ['不太满意',NOTVERYSATISFACTION], + ['不满意',NOSATISFACTION] + ] + }), + forceSelection : true, + allowBlank: false, + editable:false, + mode : 'local', + value:'无', + triggerAction : 'all', + anchor : '95%' }], items:[ satisfactionSurveyTree @@ -586,7 +619,7 @@ /** * 创建节点 */ -function createNode(isParentNode,attrId,content){ +function createNode(isParentNode,attrId,content,defaultSatisfaction){ var node; if(isParentNode==true){ //创建父节点 @@ -596,6 +629,7 @@ cls:'master-task', iconCls:'task-folder', uiProvider:top.Ext.tree.ColumnNodeUI, + defaultSatisfaction:defaultSatisfaction, leaf:false, expanded:true }); @@ -606,6 +640,7 @@ //text:'', iconCls:'task', uiProvider:top.Ext.tree.ColumnNodeUI, + defaultSatisfaction:defaultSatisfaction, leaf:true, expanded:true }); @@ -674,11 +709,15 @@ rootNode.eachChild(function(pNode){ if(!pNode.isLeaf()){//父节点 var parentContent = pNode.attributes[0] ? pNode.attributes[0]:pNode.attributes.content; + var defaultSatisfaction = pNode.attributes.defaultSatisfaction; valArr.push("{id:'"); valArr.push("'"); valArr.push(",content:'"); valArr.push(replaceStr(parentContent)); valArr.push("'"); + valArr.push(",defaultSatisfaction:'"); + valArr.push(defaultSatisfaction); + valArr.push("'"); valArr.push(",children:["); pNode.eachChild(function(cNode){ var lastContent = cNode.attributes[0] ? cNode.attributes[0]:cNode.attributes.content; Index: ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp =================================================================== diff -u -r31216 -r35821 --- ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp (.../satisfactionSurveyTemplateView.jsp) (revision 31216) +++ ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp (.../satisfactionSurveyTemplateView.jsp) (revision 35821) @@ -3,6 +3,7 @@ <%@ page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition" %> <%@ page import="com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition" %> +<%@page import="com.forgon.disinfectsystem.entity.satisfactionsurvey.Satisfaction"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> @@ -13,6 +14,7 @@ <%@ include file="/common/includeExtJsAndCss.jsp"%> + @@ -39,6 +41,11 @@ var STAUTS_START = '<%=SatisfactionSurveyTemplate.STATUS_START%>'; var STAUTS_END = '<%=SatisfactionSurveyTemplate.STATUS_END%>'; var userName = '<%=request.getAttribute("userName")%>'; +var SATISFACTION = "<%=Satisfaction.SATISFACTION%>";//满意 +var MORESATISFACTION = "<%=Satisfaction.MORESATISFACTION%>";//较满意 +var BASICSATISFACTION = "<%=Satisfaction.BASICSATISFACTION%>";//基本满意 +var NOTVERYSATISFACTION = "<%=Satisfaction.NOTVERYSATISFACTION%>";//不太满意 +var NOSATISFACTION = "<%=Satisfaction.NOSATISFACTION%>";//不满意