Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js =================================================================== diff -u -r23440 -r23454 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js (.../workFlowForm.js) (revision 23440) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js (.../workFlowForm.js) (revision 23454) @@ -663,7 +663,7 @@ } } },{ - header: '允许修改选项', dataIndex : 'allowChangeOption', width: 100, align: 'center', sortable: false, + header: '允许修改勾选项', dataIndex : 'allowChangeOption', width: 100, align: 'center', sortable: false, editor: { inputId: 'allowChangeOption', displayField : 'name', Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js =================================================================== diff -u -r23440 -r23454 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 23440) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 23454) @@ -330,7 +330,7 @@ fieldLabel : '省平台产品', id: 'isProvinceProduct', labelWidth: 90, - width : 230, + width : 180, columns : 2, disabled : !allowChangeOption, items :[ @@ -351,7 +351,7 @@ fieldLabel : '院内目录产品', id : 'isHospitalProduct', labelWidth : 103, - width : 230, + width : 190, columns : 2, disabled : !allowChangeOption, items :[ @@ -371,7 +371,7 @@ fieldLabel : '平台授权配送企业', id : 'isPlatformAuthorizedEnterprise', labelWidth : 125, - width : 250, + width : 210, columns : 2, disabled : !allowChangeOption, items :[ @@ -455,7 +455,7 @@ fieldLabel : '省平台产品', id: 'isProvinceProduct', labelWidth: 90, - width : 230, + width : 180, columns : 2, disabled : !allowChangeOption, items :[ @@ -476,7 +476,7 @@ fieldLabel : '院内目录产品', id : 'isHospitalProduct', labelWidth : 103, - width : 230, + width : 190, columns : 2, disabled : !allowChangeOption, items :[ @@ -496,7 +496,7 @@ fieldLabel : '平台授权配送企业', id : 'isPlatformAuthorizedEnterprise', labelWidth : 125, - width : 250, + width : 210, columns : 2, disabled : !allowChangeOption, items :[ @@ -625,7 +625,7 @@ fieldLabel : '省平台产品', id: 'isProvinceProduct', labelWidth: 90, - width : 230, + width : 180, columns : 2, disabled : !allowChangeOption, items :[ @@ -646,7 +646,7 @@ fieldLabel : '院内目录产品', id : 'isHospitalProduct', labelWidth : 103, - width : 230, + width : 190, columns : 2, disabled : !allowChangeOption, items :[ @@ -667,7 +667,7 @@ fieldLabel : '平台授权配送企业', id : 'isPlatformAuthorizedEnterprise', labelWidth : 125, - width : 250, + width : 210, columns : 2, disabled : !allowChangeOption, items :[ Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp =================================================================== diff -u -r23440 -r23454 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp (.../workFlowApprovalTask.jsp) (revision 23440) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTask.jsp (.../workFlowApprovalTask.jsp) (revision 23454) @@ -1,5 +1,6 @@ <%@page language="java" contentType="text/html; charset=UTF-8"%> <%@page import="com.forgon.workflow.model.WorkFlowApprovalTask" %> +<%@page import="com.forgon.Constants"%> <%-- 引入JSP标签 --%> <%@include file="/common/taglibs.jsp"%> <%-- 引入ExtJs4.2.5框架 --%> @@ -24,8 +25,8 @@ var APPROVALRESULT_SUBMIT = <%=WorkFlowApprovalTask.APPROVALRESULT_SUBMIT%> //申请人针对回退的申请单在待办任务列表的修改操作 var APPROVALRESULT_NOTICE = <%=WorkFlowApprovalTask.APPROVALRESULT_NOTICE%> //申请人正常通知申请单人 var APPROVALRESULT_NOTICEFAIL = <%=WorkFlowApprovalTask.APPROVALRESULT_NOTICEFAIL%> //申请人针对审批不通过通知申请单人 - var OPTION_YES = '<%=WorkFlowApprovalTask.OPTION_YES%>'; //选项状态:是 - var OPTION_NO = '<%=WorkFlowApprovalTask.OPTION_NO%>'; //选项状态:否 + var OPTION_YES = '<%=Constants.STR_YES%>'; //选项状态:是 + var OPTION_NO = '<%=Constants.STR_NO%>'; //选项状态:否 var FormType = '${FormType}'; //高值耗材申请单类型 Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp =================================================================== diff -u -r23440 -r23454 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp (.../workFlowApprovalTaskRecord.jsp) (revision 23440) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp (.../workFlowApprovalTaskRecord.jsp) (revision 23454) @@ -1,5 +1,6 @@ <%@page language="java" contentType="text/html; charset=UTF-8"%> <%@page import="com.forgon.workflow.model.WorkFlowApprovalTask"%> +<%@page import="com.forgon.Constants"%> <%-- 引入JSP标签 --%> <%@include file="/common/taglibs.jsp"%> <%-- 引入ExtJs4.2.5框架 --%> @@ -10,8 +11,8 @@ request.setAttribute("formId",request.getParameter("formId"));//表单id %>