Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28494 -r28496
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28494)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28496)
@@ -7,6 +7,7 @@
var lastSelectimageTypeTousse;
var lastSelectVedioName;
var lastSelectTdId;
+var lastSelectTaskId;
var packingToussesArray = []; // 装配的器械包数组,用于Selenium自动化测试
var packedToussesArray = [];// 用于一次打印所有装配的包
@@ -1022,7 +1023,7 @@
align:'center',
sortable: true,
renderer: function(v,p,record,rowIndex, columnIndex, store){
- var str = '
';
+ var str = '
';
if(record.get('leaf')){
var taskid = record.get('taskId');
var tousseName = record.get('tousseName');
@@ -2499,7 +2500,7 @@
iconCls : 'btn_ext_application_add',
handler : function() {
var materialGrid = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
- addAndEditRecyclingLostRecord('', LINKTYPE_PACKINGRECORD_ERROR,{},materialGrid,lastSelectTousseName);
+ addAndEditRecyclingLostRecord('', LINKTYPE_PACKINGRECORD_ERROR,{},materialGrid,lastSelectTousseName,lastSelectTaskId);
}
},"-",{
text : '质量监测',
@@ -4058,7 +4059,7 @@
listeners:{
// cellclick事件改为select事件,便于selenium进行测试
itemclick : function( thiz, record, index, eOpts ){
- var tousseName = record.get('tousseName');
+ var tousseName = record.get('tousseName');
var sterilingMethod = record.get('sterilingMethod');
var packageType = record.get('packageType');
var tousseType = record.get('tousseType');
@@ -4431,13 +4432,15 @@
var isPrint = record.get('isPrint');
var isReview = record.get('isReview');
var vedioName = record.get('uuid_vedioNames');
- var td_id = record.get('tousseID');
+ var td_id = record.get('tousseID');
+ var taskId = record.get('taskId');
updateNoteWindow(record);
loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id,isTraceable);
lastSelectTousseName = tousseName;
lastSelectimageTypeTousse = imageType_tousse;
lastSelectVedioName = vedioName;
- lastSelectTdId = td_id;
+ lastSelectTdId = td_id;
+ lastSelectTaskId = taskId;
if(packingPageAutoSetSterilizationProgramAfterSelectTousse){
Ext4.getCmp('sterilingType').setValue(sterilingMethod);
//根据灭菌程序设置灭菌方式的值
Index: ssts-web/src/main/webapp/disinfectsystem/packing/recyclingLostRecordForm.js
===================================================================
diff -u -r28138 -r28496
--- ssts-web/src/main/webapp/disinfectsystem/packing/recyclingLostRecordForm.js (.../recyclingLostRecordForm.js) (revision 28138)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/recyclingLostRecordForm.js (.../recyclingLostRecordForm.js) (revision 28496)
@@ -1,4 +1,5 @@
var recordId = '';
+var lastSelectTaskId = '';
function removeGridLostItem(){
var recyclingLostItemStore = top.Ext.getCmp('recyclingLostItemGrid').getStore();
var rows = top.Ext.getCmp('recyclingLostItemGrid').getSelectionModel().getSelections();// 返回值为
@@ -193,8 +194,9 @@
return false;
}
-function addAndEditRecyclingLostRecord(id, linkType, param, materialGrid, lastSelectTousseName) {
+function addAndEditRecyclingLostRecord(id, linkType, param, materialGrid, lastSelectTousseName,lastSelectTaskId) {
var tempAmount = 0;
+ lastSelectTaskId = lastSelectTaskId;
var tousseLostStore = tousseLostStore = new Ext.data.Store({
proxy : new Ext.data.HttpProxy({
url : WWWROOT + '/disinfectSystem/MaterialErrorDamageAction!findToussesDef.do',
@@ -876,11 +878,12 @@
data.push({
materialName : record.get('materialName'),
materialDefinitionId : record.get('materialDefinitionId'),
- tousseDefinitionId : "",
- amount : record.get('amount')
+ tousseDefinitionId : record.id,
+ amount : record.get('amount'),
+ tousseName : record.get('tousseName'),
+ packingTaskId:lastSelectTaskId
});
}
-
var params = {};
params.depart = top.Ext.getCmp('depart2').getValue();
params.departCoding = top.Ext.getCmp('departCoding2').getValue();
@@ -899,6 +902,8 @@
if(action.result.success){
showResult("保存成功!" , null , sstsConfig.messagePauseTimeOnPackingPage);
top.Ext.getCmp('recyclingLostRecordWin').close();
+ var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+ waitPackingTreeGrid.getStore().reload();
}else{
showResult(action.result.message , null , sstsConfig.messagePauseTimeOnPackingPage);
}