Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r18217 -r18219
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 18217)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 18219)
@@ -20,6 +20,9 @@
}
var packingPageAutoSetSterilizationProgramAfterSelectTousse = true;
+//丢失报废按钮响应函数
+var onErrorDamageBtnClick = null;
+
//申请科室Store
var appDepartJsonStoreExt2 = new Ext4.data.Store({
proxy : new Ext4.data.HttpProxy({
@@ -453,11 +456,11 @@
}
}
if(!supplent){
- str += "";
+ str += "";
}
var damages = record.get('damages');
if(damages.length > 0){
- str += "";
+ str += "";
}
}
if(record.get('tousseType') == '外来器械包' && treeId == 'basketTreeGrid'){
@@ -1650,7 +1653,45 @@
},
folderSort: true
})
+function getErrorOrDamageRemark(type,taskId){
+ function findNode(rootNode,taskId){
+ if(rootNode){
+ var isLeaf = rootNode.get('leaf');
+ if(isLeaf){
+ var tid = rootNode.get('taskId');
+ if(tid == taskId){
+ return rootNode;
+ }else{
+ return null;
+ }
+ }else{
+ for(var i = 0; i < rootNode.childNodes.length;++i){
+ var fNode = findNode(rootNode.childNodes[i],taskId);
+ if(fNode){
+ return fNode;
+ }
+ }
+ }
+ }
+ }
+ var rootNode = waitPackingTaskStore.getRootNode();
+ var fNode = findNode(rootNode,taskId);
+ if(fNode){
+ if(type_lost == type){
+ return fNode.get('errorRemark');
+ }else{
+ return fNode.get('damageRemark');
+ }
+ }
+}
+function errorDamageBtnClick(type,taskId){
+ var remak = getErrorOrDamageRemark(type,taskId);
+ additionalMaterial(type,taskId,remak);
+}
+//赋值给全局变量
+onErrorDamageBtnClick = errorDamageBtnClick;
+
function addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
taskStatus,department,tousseType, packageType,
sterilingMethod,recyclingTime,isTraceable,isPrint,isReview,errors,