Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r29967 -r29968 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 29967) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 29968) @@ -125,15 +125,15 @@ var rootNode = sterilizationColumnTree.getRootNode(); var pTousseStr = ""; var myBarcodes = []; - leftFixedBarcodeMap.forEach(function(item,i){ + leftFixedBarcodeMap.forEach(function (item, i) { var amount = item; - if(leftFixedBarcodeMapBySterilization.get(i)){ + if (leftFixedBarcodeMapBySterilization.get(i)) { amount = amount - leftFixedBarcodeMapBySterilization.get(i); } - if(amount !== 0){ + if (amount !== 0) { myBarcodes.push({ - fixedBarcodes:i, - amount:amount + fixedBarcodes: i, + amount: amount }) } }); @@ -142,15 +142,15 @@ var isFixed = false; var pTousseName = pNode.attributes.barcode; for (var i = 0; i < myBarcodes.length; i++) { - if(myBarcodes[i].fixedBarcodes == pTousseName){ + if (myBarcodes[i].fixedBarcodes == pTousseName) { isFixed = true; break; } } - if(leftFixedBarcodeMapBySterilization.has(pTousseName)){ + if (leftFixedBarcodeMapBySterilization.has(pTousseName)) { isFixed = true; } - if(!isFixed){ + if (!isFixed) { if (!pNode.isLeaf()) {//父节点 pNode.eachChild(function (cNode) { var cAttr = cNode.attributes; @@ -173,7 +173,7 @@ } }); for (var i = 0; i < myBarcodes.length; i++) { - pTousseStr += "##" + myBarcodes[i].fixedBarcodes+',,固定条码,,'+myBarcodes[i].amount; + pTousseStr += "##" + myBarcodes[i].fixedBarcodes + ',,固定条码,,' + myBarcodes[i].amount; } return pTousseStr; } @@ -287,16 +287,16 @@ node.attributes.sterilingMode = params.sterilingMode; node.attributes.stockAmount = params.stockAmount || 0; node.attributes.scanAmount = params.scanAmount || 0; - if(params.isTraceable !== null){ + if (params.isTraceable !== null) { node.attributes.isTraceable = params.isTraceable; } - if(params.isUrgentTousse && params.isUrgentTousse !== null){ + if (params.isUrgentTousse && params.isUrgentTousse !== null) { node.attributes.isUrgentTousse = params.isUrgentTousse; } - if(params.urgentLevel && params.urgentLevel !== null){ + if (params.urgentLevel && params.urgentLevel !== null) { node.attributes.urgentLevel = params.urgentLevel; } - if(params.includeImplant && params.includeImplant !== null){ + if (params.includeImplant && params.includeImplant !== null) { node.attributes.includeImplant = params.includeImplant; } return node; @@ -685,37 +685,37 @@ if (node.attributes.isParentNode) { if (type == '器械包') { var params = { - isParentNode:true, - barcode:barcode, - name:name, - typeForSterilizationStatistics:typeForSterilizationStatistics, - depart:depart, - type:type, - position:position, - amount:amount, - reviewTime:reviewTime, - stockAmount:0, - sterilingMode:null, - scanAmount:0, - isTraceable:null + isParentNode: true, + barcode: barcode, + name: name, + typeForSterilizationStatistics: typeForSterilizationStatistics, + depart: depart, + type: type, + position: position, + amount: amount, + reviewTime: reviewTime, + stockAmount: 0, + sterilingMode: null, + scanAmount: 0, + isTraceable: null } var cloneNode = createNode(params); return cloneNode; } else { var params = { - isParentNode:true, - barcode:barcode, - name:name, - typeForSterilizationStatistics:typeForSterilizationStatistics, - depart:depart, - type:type, - position:position, - amount:amount, - reviewTime:reviewTime, - stockAmount:0, - sterilingMode:null, - scanAmount:0, - isTraceable:null + isParentNode: true, + barcode: barcode, + name: name, + typeForSterilizationStatistics: typeForSterilizationStatistics, + depart: depart, + type: type, + position: position, + amount: amount, + reviewTime: reviewTime, + stockAmount: 0, + sterilingMode: null, + scanAmount: 0, + isTraceable: null } var cloneNode = createNode(params); var childNodes = node.attributes.children; @@ -729,19 +729,19 @@ var cType = childNodes[i].type; var cReviewTime = childNodes[i].reviewTime; var params = { - isParentNode:false, - barcode:cBarcode, - name:cName, - typeForSterilizationStatistics:cTypeForSterilizationStatistics, - depart:cDepart, - type:cType, - position:'', - amount:cAmount, - reviewTime:cReviewTime, - stockAmount:0, - sterilingMode:null, - scanAmount:0, - isTraceable:null + isParentNode: false, + barcode: cBarcode, + name: cName, + typeForSterilizationStatistics: cTypeForSterilizationStatistics, + depart: cDepart, + type: cType, + position: '', + amount: cAmount, + reviewTime: cReviewTime, + stockAmount: 0, + sterilingMode: null, + scanAmount: 0, + isTraceable: null } cloneNode.appendChild(createNode(params)); } @@ -758,19 +758,19 @@ var cAmount = childNodes2[i].amount; var cReviewTime = childNodes2[i].reviewTime; var params = { - isParentNode:false, - barcode:cBarcode, - name:cName, - typeForSterilizationStatistics:cTypeForSterilizationStatistics, - depart:cDepart, - type:cType, - position:'', - amount:cAmount, - reviewTime:cReviewTime, - stockAmount:0, - sterilingMode:null, - scanAmount:0, - isTraceable:null + isParentNode: false, + barcode: cBarcode, + name: cName, + typeForSterilizationStatistics: cTypeForSterilizationStatistics, + depart: cDepart, + type: cType, + position: '', + amount: cAmount, + reviewTime: cReviewTime, + stockAmount: 0, + sterilingMode: null, + scanAmount: 0, + isTraceable: null } cloneNode.appendChild(createNode(params)); } @@ -781,19 +781,19 @@ } else { //篮筐里面的器械包 var params = { - isParentNode:false, - barcode:barcode, - name:name, - typeForSterilizationStatistics:typeForSterilizationStatistics, - depart:depart, - type:type, - position:'', - amount:amount, - reviewTime:reviewTime, - stockAmount:0, - sterilingMode:null, - scanAmount:0, - isTraceable:null + isParentNode: false, + barcode: barcode, + name: name, + typeForSterilizationStatistics: typeForSterilizationStatistics, + depart: depart, + type: type, + position: '', + amount: amount, + reviewTime: reviewTime, + stockAmount: 0, + sterilingMode: null, + scanAmount: 0, + isTraceable: null } var cloneNode = createNode(params); return cloneNode; @@ -825,7 +825,7 @@ * @param {固定条码} fixedBarcode * @param {是否载入全部数量} isLoadAll */ -function scanFixedBarcode(fixedBarcode,isLoadAll) { +function scanFixedBarcode(fixedBarcode, isLoadAll) { var rootNode = sterilizationColumnTree.getRootNode(); var leftFixedLenght = parseInt(getLeftFixedBarcodeAmount(fixedBarcode) || 0); var rightFixedLenght = parseInt(getRigthFixedBarcodeAmount(fixedBarcode) || 0); @@ -840,51 +840,51 @@ if (pNode.attributes.barcode == fixedBarcode && i < 1) { leftHasBarcode = true; i++; - if(rightFixedLenght > scanAmount && scanAmount !== 0){ - finalAmount = isLoadAll?rightFixedLenght:scanAmount; - }else { - rightFixedLenght = rightFixedLenght>0?rightFixedLenght:0; + if (rightFixedLenght > scanAmount && scanAmount !== 0) { + finalAmount = isLoadAll ? rightFixedLenght : scanAmount; + } else { + rightFixedLenght = rightFixedLenght > 0 ? rightFixedLenght : 0; finalAmount = rightFixedLenght; } - if(leftFixedLenght+finalAmount >= 2000){ - if(leftFixedLenght == 2000){ - showResult('已超过'+pNode.attributes.name+'的最大待灭菌物品总数2000！'); + if (leftFixedLenght + finalAmount >= 2000) { + if (leftFixedLenght == 2000) { + showResult('已超过' + pNode.attributes.name + '的最大待灭菌物品总数2000！'); isLast = true; return - }else if(leftFixedLenght > 2000){ + } else if (leftFixedLenght > 2000) { finalAmount = 2000 - pNode.attributes.amount; - showResult('已超过'+pNode.attributes.name+'的最大待灭菌物品总数2000！'); + showResult('已超过' + pNode.attributes.name + '的最大待灭菌物品总数2000！'); - leftFixedBarcodeMap.set(fixedBarcode,2000); - rightFixedBarcodeMap.set(fixedBarcode,0); + leftFixedBarcodeMap.set(fixedBarcode, 2000); + rightFixedBarcodeMap.set(fixedBarcode, 0); return - }else { - finalAmount -= (leftFixedLenght+finalAmount)-2000; + } else { + finalAmount -= (leftFixedLenght + finalAmount) - 2000; } } - if(rightFixedLenght == 0){ - showResult('已超过'+pNode.attributes.name+'的最大待灭菌物品总数'+leftFixedLenght+'！'); + if (rightFixedLenght == 0) { + showResult('已超过' + pNode.attributes.name + '的最大待灭菌物品总数' + leftFixedLenght + '！'); } - var newAmount = rightFixedLenght-finalAmount; - leftFixedLenght = leftFixedLenght+parseInt(finalAmount); - leftFixedBarcodeMap.set(fixedBarcode,leftFixedLenght); - rightFixedBarcodeMap.set(fixedBarcode,newAmount); + var newAmount = rightFixedLenght - finalAmount; + leftFixedLenght = leftFixedLenght + parseInt(finalAmount); + leftFixedBarcodeMap.set(fixedBarcode, leftFixedLenght); + rightFixedBarcodeMap.set(fixedBarcode, newAmount); } } }); - if(!leftHasBarcode){ + if (!leftHasBarcode) { var tousseInstan = tousseInstanMap.get(fixedBarcode); - if(tousseInstan){ + if (tousseInstan) { var scanAmount = parseInt(tousseInstan.scanAmount) || 0; var objAmount = parseInt(tousseInstan.objAmount) || 0; - if(!scanAmountMap.has(fixedBarcode)){ - scanAmountMap.set(fixedBarcode,scanAmount) + if (!scanAmountMap.has(fixedBarcode)) { + scanAmountMap.set(fixedBarcode, scanAmount) } var tousseName = tousseInstan.objName; //器械包名称 - var amount = (scanAmount>objAmount || scanAmount == 0)?objAmount:scanAmount; //每次扫描数量 - amount = isLoadAll?objAmount:amount; - leftFixedBarcodeMap.set(fixedBarcode,amount) - rightFixedBarcodeMap.set(fixedBarcode,objAmount-amount); + var amount = (scanAmount > objAmount || scanAmount == 0) ? objAmount : scanAmount; //每次扫描数量 + amount = isLoadAll ? objAmount : amount; + leftFixedBarcodeMap.set(fixedBarcode, amount) + rightFixedBarcodeMap.set(fixedBarcode, objAmount - amount); var sterilingTypeTemp = top.Ext.getCmp('sterilizationType').getValue(); var diffTousseNames = ""; var typeForSterilizationStatistics = tousseInstan.typeForSterilizationStatistics; //器械包类型（用于分类统计） @@ -901,19 +901,19 @@ var rootNode = sterilizationColumnTree.getRootNode(); var position = top.Ext.getCmp('position').getValue(); var params = { - isParentNode:true, - barcode:tousseBarcode, - name:tousseName, - typeForSterilizationStatistics:typeForSterilizationStatistics, - depart:'', - type:'器械包', - position:position, - amount:amount, - reviewTime:reviewTime, - stockAmount:0, - sterilingMode:sterilingMode, - scanAmount:scanAmount, - isTraceable:isTraceable + isParentNode: true, + barcode: tousseBarcode, + name: tousseName, + typeForSterilizationStatistics: typeForSterilizationStatistics, + depart: '', + type: '器械包', + position: position, + amount: amount, + reviewTime: reviewTime, + stockAmount: 0, + sterilingMode: sterilingMode, + scanAmount: scanAmount, + isTraceable: isTraceable } var parentNode = createNode(params); var firstChildNode = rootNode.item(0); @@ -925,13 +925,13 @@ updateRigthFixedBarcodeAmount(tousseBarcode, amount)//修改右边节点的数量 var speakBasket = new SpeakBasket(); speakBasket.addGoods('', tousseName, 1); - + if (diffTousseNames != '') { showResultWithoutSpeak("器械包" + diffTousseNames + "的灭菌程序和所选的灭菌程序不同!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); } } - }else { - if(!isLast){ + } else { + if (!isLast) { updateRigthFixedBarcodeAmount(fixedBarcode, finalAmount)//修改右边的数量 updateLeftFixedBarcodeAmount(fixedBarcode, finalAmount)//修改左边的数量 statisticsTousseAndBasket();//统计总数量 @@ -950,7 +950,7 @@ var returnAmount = 0; rootNode.eachChild(function (pNode) { if (pNode != null && pNode.attributes && pNode.attributes.barcode) { - if (pNode.attributes.barcode == fixedBarcode && i < 1) { + if (pNode.attributes.barcode == fixedBarcode && i < 1) { i++ var amount = parseInt(pNode.attributes.amount) returnAmount = amount; @@ -1011,11 +1011,11 @@ * @param {每次扫描数量} scanAmount * @param {更新类型:0减少;1增加} updateType */ -function updateRigthFixedBarcodeAmount(fixedBarcode, scanAmount,updateType) { +function updateRigthFixedBarcodeAmount(fixedBarcode, scanAmount, updateType) { var rootNode = pendingSterilizationColumnTree.getRootNode(); var i = 0; var isTrue = false; - //循环右边的节点 + //循环右边的节点 rootNode.eachChild(function (pNode) { if (pNode != null && pNode.attributes && pNode.attributes.objBarcode) { if (pNode.attributes.objBarcode == fixedBarcode && i < 1) { @@ -1030,38 +1030,38 @@ var isTraceable = pNode.attributes.isTraceable || ''; var typeForSterilizationStatistics = pNode.attributes.typeForSterilizationStatistics || ''; var amount; - if(updateType == 0){ + if (updateType == 0) { amount = amountRight + parseInt(scanAmount); - }else { + } else { amount = amountRight - parseInt(scanAmount); } if (amount > 0) { var params = { - isParentNode:true, - barcode:fixedBarcode, - name:name, - depart:depart, - type:type, - amount:amount, - reviewTime:reviewTime, - typeForSterilizationStatistics:typeForSterilizationStatistics, - sterilingMode:sterilingMode, - scanAmount:scanAmount, - isTraceable:isTraceable + isParentNode: true, + barcode: fixedBarcode, + name: name, + depart: depart, + type: type, + amount: amount, + reviewTime: reviewTime, + typeForSterilizationStatistics: typeForSterilizationStatistics, + sterilingMode: sterilingMode, + scanAmount: scanAmount, + isTraceable: isTraceable } var myNode = createNode(params) - setTimeout(function(){ + setTimeout(function () { rootNode.replaceChild(myNode, pNode); }, 10); - }else { - setTimeout(function(){ + } else { + setTimeout(function () { pNode.remove(); }, 10); } } } }); - if(!isTrue && updateType == 0){ + if (!isTrue && updateType == 0) { var rootNode = sterilizationColumnTree.getRootNode(); var j = 0 //循环左边的节点 @@ -1075,21 +1075,21 @@ var isTraceable = pNode.attributes.isTraceable; var typeForSterilizationStatistics = pNode.attributes.typeForSterilizationStatistics; var params = { - isParentNode:true, - barcode:barcode, - name:name, - type:'TOUSSE', - depart:'', - reviewTime:'', - amount:scanAmount, - sterilingMode:sterilingMode, - isTraceable:isTraceable, - scanAmount:scanAmount, - typeForSterilizationStatistics:typeForSterilizationStatistics + isParentNode: true, + barcode: barcode, + name: name, + type: 'TOUSSE', + depart: '', + reviewTime: '', + amount: scanAmount, + sterilingMode: sterilingMode, + isTraceable: isTraceable, + scanAmount: scanAmount, + typeForSterilizationStatistics: typeForSterilizationStatistics } var myNode = createNode(params) pendingSterilizationColumnTree.getRootNode().appendChild(myNode); - rightFixedBarcodeMap.set(fixedBarcode,scanAmount) + rightFixedBarcodeMap.set(fixedBarcode, scanAmount) } } }); @@ -1119,19 +1119,19 @@ var sterilingMode = pNode.attributes.sterilingMode || ''; var isTraceable = pNode.attributes.isTraceable; var params = { - isParentNode:true, - barcode:barcode, - name:name, - typeForSterilizationStatistics:typeForSterilizationStatistics, - depart:department, - type:'器械包', - position:position, - amount:amount, - reviewTime:reviewTime, - stockAmount:0, - sterilingMode:sterilingMode, - scanAmount:scanAmount, - isTraceable:isTraceable + isParentNode: true, + barcode: barcode, + name: name, + typeForSterilizationStatistics: typeForSterilizationStatistics, + depart: department, + type: '器械包', + position: position, + amount: amount, + reviewTime: reviewTime, + stockAmount: 0, + sterilingMode: sterilingMode, + scanAmount: scanAmount, + isTraceable: isTraceable } var parentNode = createNode(params); pNode.remove();//删除修改后的节点数据 @@ -1290,20 +1290,20 @@ //添加到灭菌物品视图列表的第一行 var rootNode = sterilizationColumnTree.getRootNode(); var params = { - isParentNode:true, - barcode:barcodeStr, - name:tousseName, - typeForSterilizationStatistics:typeForSterilizationStatistics, - depart:department, - type:'器械包', - position:position, - amount:1, - reviewTime:reviewTime, - stockAmount:0, - sterilingMode:sterilingMode, - isUrgentTousse:isUrgentTousse, - urgentLevel:urgentLevel, - includeImplant:newIncludeImplant + isParentNode: true, + barcode: barcodeStr, + name: tousseName, + typeForSterilizationStatistics: typeForSterilizationStatistics, + depart: department, + type: '器械包', + position: position, + amount: 1, + reviewTime: reviewTime, + stockAmount: 0, + sterilingMode: sterilingMode, + isUrgentTousse: isUrgentTousse, + urgentLevel: urgentLevel, + includeImplant: newIncludeImplant } var parentNode = createNode(params); var firstChildNode = rootNode.item(0); @@ -1390,20 +1390,20 @@ newIncludeImplant = includeImplant; } var params = { - isParentNode:true, - barcode:barcodeStr, - name:containerName, - typeForSterilizationStatistics:'', - depart:'', - type:'篮筐', - position:position, - amount:amount == 0 ? 1 : amount, - reviewTime:'', - stockAmount:0, - sterilingMode:'', - isUrgentTousse:isUrgentTousse, - urgentLevel:urgentLevel, - includeImplant:newIncludeImplant + isParentNode: true, + barcode: barcodeStr, + name: containerName, + typeForSterilizationStatistics: '', + depart: '', + type: '篮筐', + position: position, + amount: amount == 0 ? 1 : amount, + reviewTime: '', + stockAmount: 0, + sterilingMode: '', + isUrgentTousse: isUrgentTousse, + urgentLevel: urgentLevel, + includeImplant: newIncludeImplant } var parentNode = createNode(params); var firstChildNode = rootNode.item(0); @@ -1440,20 +1440,20 @@ showResultWithoutSpeak("灭菌筐[" + containerName + "]里面的器械包[" + tousseName + "]的灭菌程序和所选的灭菌程序不同!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); } var params = { - isParentNode:false, - barcode:tousseBarcode, - name:tousseName, - typeForSterilizationStatistics:typeForSterilizationStatistics, - depart:department, - type:'器械包', - position:'', - amount:amount, - reviewTime:reviewTime, - stockAmount:0, - sterilingMode:sterilingMode, - isUrgentTousse:isUrgentTousse, - urgentLevel:urgentLevel, - includeImplant:newIncludeImplant + isParentNode: false, + barcode: tousseBarcode, + name: tousseName, + typeForSterilizationStatistics: typeForSterilizationStatistics, + depart: department, + type: '器械包', + position: '', + amount: amount, + reviewTime: reviewTime, + stockAmount: 0, + sterilingMode: sterilingMode, + isUrgentTousse: isUrgentTousse, + urgentLevel: urgentLevel, + includeImplant: newIncludeImplant } var childNode = createNode(params); parentNode.appendChild(childNode); @@ -1531,19 +1531,19 @@ if (!exists) { //此包没有扫描过并且没有入审核篮筐 //添加到灭菌物品视图列表的第一行 var params = { - isParentNode:true, - barcode:tousseBarcode, - name:tousseName, - typeForSterilizationStatistics:typeForSterilizationStatistics, - depart:department, - type:'器械包', - position:position, - amount:1, - reviewTime:reviewTime, - stockAmount:0, - sterilingMode:sterilingMode, - scanAmount:0, - isTraceable:null + isParentNode: true, + barcode: tousseBarcode, + name: tousseName, + typeForSterilizationStatistics: typeForSterilizationStatistics, + depart: department, + type: '器械包', + position: position, + amount: 1, + reviewTime: reviewTime, + stockAmount: 0, + sterilingMode: sterilingMode, + scanAmount: 0, + isTraceable: null } var parentNode = createNode(params); var firstChildNode = rootNode.item(0); @@ -1625,19 +1625,19 @@ if (!exists) { //添加到灭菌物品视图列表的第一行 var params = { - isParentNode:true, - barcode:virtualBasketSeqNum, - name:'虚拟篮筐', - typeForSterilizationStatistics:'', - depart:'', - type:'篮筐', - position:position, - amount:1, - reviewTime:'', - stockAmount:0, - sterilingMode:null, - scanAmount:0, - isTraceable:null + isParentNode: true, + barcode: virtualBasketSeqNum, + name: '虚拟篮筐', + typeForSterilizationStatistics: '', + depart: '', + type: '篮筐', + position: position, + amount: 1, + reviewTime: '', + stockAmount: 0, + sterilingMode: null, + scanAmount: 0, + isTraceable: null } currentParentNode = createNode(params); var firstChildNode = rootNode.item(0); @@ -1647,19 +1647,19 @@ rootNode.insertBefore(currentParentNode, firstChildNode); } var params1 = { - isParentNode:false, - barcode:tousseBarcode, - name:tousseName, - typeForSterilizationStatistics:typeForSterilizationStatistics, - depart:department, - type:'器械包', - position:'', - amount:1, - reviewTime:reviewTime, - stockAmount:0, - sterilingMode:sterilingMode, - scanAmount:0, - isTraceable:null + isParentNode: false, + barcode: tousseBarcode, + name: tousseName, + typeForSterilizationStatistics: typeForSterilizationStatistics, + depart: department, + type: '器械包', + position: '', + amount: 1, + reviewTime: reviewTime, + stockAmount: 0, + sterilingMode: sterilingMode, + scanAmount: 0, + isTraceable: null } var childNode = createNode(params1); currentParentNode.appendChild(childNode); @@ -1678,19 +1678,19 @@ } if (!existsCNode) { var params2 = { - isParentNode:false, - barcode:tousseBarcode, - name:tousseName, - typeForSterilizationStatistics:typeForSterilizationStatistics, - depart:department, - type:'器械包', - position:'', - amount:1, - reviewTime:reviewTime, - stockAmount:0, - sterilingMode:null, - scanAmount:0, - isTraceable:null + isParentNode: false, + barcode: tousseBarcode, + name: tousseName, + typeForSterilizationStatistics: typeForSterilizationStatistics, + depart: department, + type: '器械包', + position: '', + amount: 1, + reviewTime: reviewTime, + stockAmount: 0, + sterilingMode: null, + scanAmount: 0, + isTraceable: null } var childNode = createNode(params2); currentParentNode.appendChild(childNode); @@ -1756,19 +1756,19 @@ if ('器械包' == data.type) { if (newBarcodeArray.indexOf(data.barcode) == -1) { var params = { - isParentNode:true, - barcode:data.barcode, - name:data.name, - typeForSterilizationStatistics:data.typeForSterilizationStatistics, - depart:data.depart, - type:'器械包', - position:position, - amount:data.amount, - reviewTime:data.reviewTime, - stockAmount:0, - sterilingMode:data.sterilingMode, - scanAmount:0, - isTraceable:null + isParentNode: true, + barcode: data.barcode, + name: data.name, + typeForSterilizationStatistics: data.typeForSterilizationStatistics, + depart: data.depart, + type: '器械包', + position: position, + amount: data.amount, + reviewTime: data.reviewTime, + stockAmount: 0, + sterilingMode: data.sterilingMode, + scanAmount: 0, + isTraceable: null } parentNode = createNode(params); } else { @@ -1784,38 +1784,38 @@ amount = amount + parseInt(tousseInstanceArr[j].amount); } var params = { - isParentNode:true, - barcode:data.barcode, - name:data.name, - typeForSterilizationStatistics:'', - depart:data.depart, - type:'篮筐', - position:position, - amount:data.amount, - reviewTime:'', - stockAmount:0, - sterilingMode:null, - scanAmount:0, - isTraceable:null + isParentNode: true, + barcode: data.barcode, + name: data.name, + typeForSterilizationStatistics: '', + depart: data.depart, + type: '篮筐', + position: position, + amount: data.amount, + reviewTime: '', + stockAmount: 0, + sterilingMode: null, + scanAmount: 0, + isTraceable: null } parentNode = createNode(params); if (tousseInstanceArr && tousseInstanceArr.length > 0) { for (var k = 0; k < tousseInstanceArr.length; k++) { var ti = tousseInstanceArr[k]; var params1 = { - isParentNode:false, - barcode:ti.barcode, - name:ti.name, - typeForSterilizationStatistics:ti.typeForSterilizationStatistics, - depart:ti.depart, - type:'器械包', - position:position, - amount:ti.amount, - reviewTime:ti.reviewTime, - stockAmount:0, - sterilingMode:data.sterilingMode, - scanAmount:0, - isTraceable:null + isParentNode: false, + barcode: ti.barcode, + name: ti.name, + typeForSterilizationStatistics: ti.typeForSterilizationStatistics, + depart: ti.depart, + type: '器械包', + position: position, + amount: ti.amount, + reviewTime: ti.reviewTime, + stockAmount: 0, + sterilingMode: data.sterilingMode, + scanAmount: 0, + isTraceable: null } var childNode = createNode(params1); parentNode.appendChild(childNode); @@ -1834,23 +1834,23 @@ rootNode.eachChild(function (pNode) { if (pNode.attributes.barcode == newObj.barcode) { var amount = parseInt(pNode.attributes.amount) + parseInt(newObj.amount); - if(amount > 2000){ + if (amount > 2000) { amount = 2000; } var params1 = { - isParentNode:true, - barcode:newObj.barcode, - name:newObj.name, - typeForSterilizationStatistics:newObj.typeForSterilizationStatistics, - depart:newObj.depart, - type:'器械包', - position:position, - amount:amount, - reviewTime:newObj.reviewTime, - stockAmount:0, - sterilingMode:newObj.sterilingMode, - scanAmount:0, - isTraceable:null + isParentNode: true, + barcode: newObj.barcode, + name: newObj.name, + typeForSterilizationStatistics: newObj.typeForSterilizationStatistics, + depart: newObj.depart, + type: '器械包', + position: position, + amount: amount, + reviewTime: newObj.reviewTime, + stockAmount: 0, + sterilingMode: newObj.sterilingMode, + scanAmount: 0, + isTraceable: null } var newNode = createNode(params1); rootNode.replaceChild(newNode, pNode); @@ -2084,7 +2084,7 @@ * @param sterilingMode 灭菌方式 * @returns */ -function createPendingSterilizationGoodsNode(objBarcode, objName, objAmount, type, depart, reviewTime, sterilingMode,isTraceable,scanAmount,typeForSterilizationStatistics) { +function createPendingSterilizationGoodsNode(objBarcode, objName, objAmount, type, depart, reviewTime, sterilingMode, isTraceable, scanAmount, typeForSterilizationStatistics) { var node; if (type == 'BASKET') { //创建父节点 @@ -2181,23 +2181,23 @@ if (pNode.attributes.objBarcode == fixedBarcode) { var amountRight = parseInt(pNode.attributes.objAmount);//右边的数量 removePendingSterilizationGoods(fixedBarcode)//删除右边的数据 - node = createPendingSterilizationGoodsNode(fixedBarcode, objName, amount + amountRight, 'TOUSSE', '', '', sterilingMode,isTraceable,scanAmount,typeForSterilizationStatistics) + node = createPendingSterilizationGoodsNode(fixedBarcode, objName, amount + amountRight, 'TOUSSE', '', '', sterilingMode, isTraceable, scanAmount, typeForSterilizationStatistics) } } }); if (!pendingSterilizationColumnTree.getRootNode().childNode) { pendingSterilizationColumnTree.getRootNode().childNode = []; } if (node == '') { - node = createPendingSterilizationGoodsNode(fixedBarcode, objName, amount, 'TOUSSE', '', reviewTime, sterilingMode,isTraceable,scanAmount,typeForSterilizationStatistics); + node = createPendingSterilizationGoodsNode(fixedBarcode, objName, amount, 'TOUSSE', '', reviewTime, sterilingMode, isTraceable, scanAmount, typeForSterilizationStatistics); pendingSterilizationColumnTree.getRootNode().appendChild(node); } else { pendingSterilizationColumnTree.getRootNode().appendChild(node); } clickNode.remove();//将当前节点移除 sterilizationRecordWin.getEl().unmask(); - if(leftFixedBarcodeMap.get(fixedBarcode)){ - leftFixedBarcodeMap.set(fixedBarcode,0); + if (leftFixedBarcodeMap.get(fixedBarcode)) { + leftFixedBarcodeMap.set(fixedBarcode, 0); } statisticsTousseAndBasket(); } @@ -2209,23 +2209,23 @@ * @param {修改后的数量} oldAmount * @param {增加或减少的类型} type */ -function updateLeftAndRightMap(thiz,newAmount,oldAmount,type){ +function updateLeftAndRightMap(thiz, newAmount, oldAmount, type) { var editNode = thiz.editNode; var barcode = editNode.attributes.barcode; var amount; - if(type == 1){ - leftFixedBarcodeMap.set(barcode,newAmount); - amount = parseInt(newAmount-oldAmount); - if(rightFixedBarcodeMap.get(barcode)){ + if (type == 1) { + leftFixedBarcodeMap.set(barcode, newAmount); + amount = parseInt(newAmount - oldAmount); + if (rightFixedBarcodeMap.get(barcode)) { var amount1 = rightFixedBarcodeMap.get(barcode); - rightFixedBarcodeMap.set(barcode,amount1-amount); + rightFixedBarcodeMap.set(barcode, amount1 - amount); } - }else { - leftFixedBarcodeMap.set(barcode,newAmount); - amount = parseInt(oldAmount-newAmount); - if(rightFixedBarcodeMap.get(barcode)){ + } else { + leftFixedBarcodeMap.set(barcode, newAmount); + amount = parseInt(oldAmount - newAmount); + if (rightFixedBarcodeMap.get(barcode)) { var amount1 = rightFixedBarcodeMap.get(barcode); - rightFixedBarcodeMap.set(barcode,amount1+amount); + rightFixedBarcodeMap.set(barcode, amount1 + amount); } } var name = editNode.attributes.name; @@ -2239,24 +2239,24 @@ var scanAmount = editNode.attributes.scanAmount; var rootNode = sterilizationColumnTree.getRootNode(); var params = { - isParentNode:true, - barcode:barcode, - name:name, - typeForSterilizationStatistics:typeForSterilizationStatistics, - depart:department, - type:'器械包', - position:position, - amount:newAmount, - reviewTime:reviewTime, - stockAmount:stockAmount, - sterilingMode:sterilingMode, - scanAmount:scanAmount, - isTraceable:isTraceable + isParentNode: true, + barcode: barcode, + name: name, + typeForSterilizationStatistics: typeForSterilizationStatistics, + depart: department, + type: '器械包', + position: position, + amount: newAmount, + reviewTime: reviewTime, + stockAmount: stockAmount, + sterilingMode: sterilingMode, + scanAmount: scanAmount, + isTraceable: isTraceable } var parentNode = createNode(params); editNode.remove();//删除修改后的节点数据 rootNode.appendChild(parentNode);//追加修改前的数据 - updateRigthFixedBarcodeAmount(barcode, amount,type)//修改右边的数量 + updateRigthFixedBarcodeAmount(barcode, amount, type)//修改右边的数量 sterilizationRecordWin.getEl().unmask();//关闭进度条 } @@ -2382,29 +2382,29 @@ }, load: function (_this, node, response) { statisticsTousseAndBasket(); - if(response.responseText == ''){ + if (response.responseText == '') { sterilizationColumnTree.getEl().unmask(); return; } var result = Ext.decode(response.responseText); - if(result && result.length > 0){ - for(var i=0;i 0) { + for (var i = 0; i < result.length; i++) { + if (result[i].unTraceable == '是') { + if (!tousseInstanMap.has(result[i].barcode)) { var tousseInstan = { - objBarcode:result[i].barcode, - objName:result[i].name, - isTraceable:(result[i].unTraceable=='是')?'否':'是', - objAmount:result[i].amount, - reviewTime:'', - scanAmount:result[i].scanAmount, - typeForSterilizationStatistics:result[i].typeForSterilizationStatistics, - sterilingMode:result[i].sterilingMode + objBarcode: result[i].barcode, + objName: result[i].name, + isTraceable: (result[i].unTraceable == '是') ? '否' : '是', + objAmount: result[i].amount, + reviewTime: '', + scanAmount: result[i].scanAmount, + typeForSterilizationStatistics: result[i].typeForSterilizationStatistics, + sterilingMode: result[i].sterilingMode } - tousseInstanMap.set(result[i].barcode,tousseInstan); + tousseInstanMap.set(result[i].barcode, tousseInstan); } - leftFixedBarcodeMap.set(result[i].barcode,result[i].amount); - leftFixedBarcodeMapBySterilization.set(result[i].barcode,result[i].amount); + leftFixedBarcodeMap.set(result[i].barcode, result[i].amount); + leftFixedBarcodeMapBySterilization.set(result[i].barcode, result[i].amount); } } } @@ -2466,23 +2466,23 @@ var rigthAmount = getRigthFixedBarcodeAmount(barcode); var fixedBarcode = attr.barcode; if (newAmount > oldAmount) {//如果是增加数量 - if(!rightFixedBarcodeMap.get(fixedBarcode) || rightFixedBarcodeMap.get(fixedBarcode) == 0){ + if (!rightFixedBarcodeMap.get(fixedBarcode) || rightFixedBarcodeMap.get(fixedBarcode) == 0) { var sumAmount = leftFixedBarcodeMap.get(fixedBarcode); - showResult('已超过'+attr.name+'的最大待灭菌物品总数'+sumAmount+'！'); + showResult('已超过' + attr.name + '的最大待灭菌物品总数' + sumAmount + '！'); sterilizationRecordWin.getEl().unmask(); return false; } var amount = parseInt(newAmount) - parseInt(oldAmount); var leftAmount = parseInt(getLeftFixedBarcodeAmount(barcode)); if (amount > rigthAmount || (amount + leftAmount > 2000)) { - var sumAmount = (leftAmount+rigthAmount)>2000?2000:(leftAmount+rigthAmount); + var sumAmount = (leftAmount + rigthAmount) > 2000 ? 2000 : (leftAmount + rigthAmount); sterilizationRecordWin.getEl().unmask(); - showResult('已超过'+attr.name+'的最大待灭菌物品总数'+sumAmount+'！'); + showResult('已超过' + attr.name + '的最大待灭菌物品总数' + sumAmount + '！'); return false; } - updateLeftAndRightMap(thiz,newAmount,oldAmount,1); + updateLeftAndRightMap(thiz, newAmount, oldAmount, 1); } else if (newAmount < oldAmount) { - updateLeftAndRightMap(thiz,newAmount,oldAmount,0); + updateLeftAndRightMap(thiz, newAmount, oldAmount, 0); } statisticsTousseAndBasket(); @@ -2633,20 +2633,20 @@ Ext.each(rootNode.childNodes, function (cNode) { if (cNode != null && cNode.attributes && cNode.attributes.objBarcode) { var objBarcode = cNode.attributes.objBarcode; - if(cNode.attributes["isTraceable"] == '否'){ + if (cNode.attributes["isTraceable"] == '否') { fixedBarcodeArr.push(objBarcode); - }else { + } else { waitSterilingBarcodeArray.push(objBarcode); } } }); - if(waitSterilingBarcodeArray.length == 0){ + if (waitSterilingBarcodeArray.length == 0) { for (var i = 0; i < fixedBarcodeArr.length; i++) { - scanFixedBarcode(fixedBarcodeArr[i],true); + scanFixedBarcode(fixedBarcodeArr[i], true); } } statisticsTousseAndBasket();//统计总数量 - if(waitSterilingBarcodeArray.length > 0){ + if (waitSterilingBarcodeArray.length > 0) { Ext.Ajax.timeout = 90000; pendingSterilizationColumnTree.getEl().mask("正在加载中.请稍等...", "x-mask-loading"); Ext.Ajax.request({ @@ -2664,7 +2664,7 @@ if (result.success) { //判断是否含有植入物 var includeImplant = result.includeImplant; - + if (includeImplant == '是') { showResult('篮筐内物品含有植入物，请做生物监测', null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); } @@ -2675,7 +2675,7 @@ removePendingSterilizationGoods(waitSterilingBarcodeArray[i]); } for (var i = 0; i < fixedBarcodeArr.length; i++) { - scanFixedBarcode(fixedBarcodeArr[i],true); + scanFixedBarcode(fixedBarcodeArr[i], true); } pendingSterilizationColumnTree.getEl().unmask(); statisticsTousseAndBasket();//统计总数量 @@ -2691,7 +2691,7 @@ }, failure: function (response, options) { showResult("后台运行异常,请稍候再试...", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); - + formObj.getEl().unmask(); } }); @@ -2722,21 +2722,21 @@ top.Ext.getCmp("btnBatchAddTousse").enable(); } var result = Ext.decode(response.responseText); - for(var i=0;i