Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
===================================================================
diff -u -r39474 -r40624
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js (.../foreignTousseDefinitionForm.js) (revision 39474)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js (.../foreignTousseDefinitionForm.js) (revision 40624)
@@ -938,6 +938,11 @@
if(tousseDefinition.riskLevel == 0){
top.Ext.getCmp("riskLevel").setValue('')
}
+ var applicatedAmount = tousseDefinition.applicatedAmount;
+ if(applicatedAmount == 0){
+ top.Ext.getCmp("name").enable();
+ top.Ext.getCmp("supplierName").enable();
+ }
top.Ext.getCmp('previewNote').setValue(tousseDefinition.note || '');
},
failure : function(form, action) {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp
===================================================================
diff -u -r36807 -r40624
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp (.../foreignTousseView.jsp) (revision 36807)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp (.../foreignTousseView.jsp) (revision 40624)
@@ -33,6 +33,7 @@
+
外来器械包
@@ -84,6 +85,18 @@
SSTS_Tousse_Update = false;
+var isUpdate1 = false;
+var isUpdate2 = false;
+if(!SSTS_Tousse_Update){
+ if(sstsConfig.enableBulkModificationOfForeignTousseDefinitionFunction){
+ isUpdate1 = false;
+ isUpdate2 = true;
+ }else {
+ isUpdate1 = true;
+ isUpdate2 = false;
+ }
+}
+
/**
* 《器械包删除》权限
*/
@@ -118,7 +131,6 @@
var optionType_washClassify = '<%=HttpOption.SYSTEMSETTING_MATERIAL_WASH_CLASSIFY%>';
-
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js
===================================================================
diff -u -r38560 -r40624
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js (.../foreignTousseView.js) (revision 38560)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js (.../foreignTousseView.js) (revision 40624)
@@ -16,9 +16,9 @@
function downLoadImageFile(id){
location.href = WWWROOT + "/disinfectsystem/basedatamanager/tousse/downloadImage.jsp?id="+id;
}
+
// 删除
function deleteTousse(grid) {
-
var records = grid.getSelectionModel().getSelections();
if (records.length == 0) {
@@ -33,30 +33,29 @@
ids = ids + ';' + records[i].data['id'];
}
}
- top.Ext.MessageBox.confirm("请确认","是否确定要删除选中的器械包信息？",
- function(button, text) {
- if ("yes" == button)
- Ext.Ajax.request( {
- url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!deleteTousseDefinition.do',
- params : {ids : ids},
- success : function(response, options) {
- var result = Ext.decode(response.responseText);
- var success = result.success;
- if (true != success) {
- showResult(result.cause);
- return;
- } else {
- showResult('删除成功');
- grid.dwrReload();
- }
- },
- failure : function(response, options) {
- var result = Ext.decode(response.responseText);
+ top.Ext.MessageBox.confirm("请确认","是否确定要删除选中的外来器械包信息？",function(button, text) {
+ if ("yes" == button){
+ Ext.Ajax.request( {
+ url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!deleteTousseDefinition.do',
+ params : {ids : ids},
+ success : function(response, options) {
+ var result = Ext.decode(response.responseText);
+ var success = result.success;
+ if (true != success) {
showResult(result.cause);
+ return;
+ } else {
+ showResult('删除成功');
+ grid.dwrReload();
}
- });
- });
-
+ },
+ failure : function(response, options) {
+ var result = Ext.decode(response.responseText);
+ showResult(result.cause);
+ }
+ });
+ }
+ });
}
//SZSLGZXYY-20：批量修改
@@ -520,7 +519,7 @@
}
}, '-', {//若有其他修改功能则隐藏该修改按钮
text : '修改',
- hidden : sstsConfig.enableBulkModificationOfForeignTousseDefinitionFunction,
+ hidden : !isUpdate1,
iconCls : 'btn_ext_application_edit',
id : 'editTbar',
handler : function() {
@@ -530,7 +529,7 @@
type: 'button',
text: '修改',
iconCls : 'btn_ext_application_edit',
- hidden : !sstsConfig.enableBulkModificationOfForeignTousseDefinitionFunction,
+ hidden : !isUpdate2,
menu: new Ext.menu.Menu({
items: [
{text:'修改',handler: function(){
@@ -544,6 +543,14 @@
]
})
},{
+ text : '删除',
+ hidden : SSTS_Tousse_Delete,
+ iconCls : 'btn_ext_application_del',
+ handler : function() {
+ deleteTousse(grid)
+
+ }
+ },{
text : '打印器械包明细单',
hidden : true, //SSTS_Tousse_Delete,
iconCls : 'icon_print',