Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r20102 -r20171 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 20102) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 20171) @@ -262,13 +262,20 @@ var vedioName = idCardTaskNode.get('uuid_vedioNames'); var td_id = idCardTaskNode.get('tousseID'); loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id); + + } // 取消选中所有的装配任务,只选中该标识牌的 uncheckAllExceptCurrentIDCardPackingTask(); currentIDCardInfo = result.idCard; Ext4.getCmp('idCardBarcode').setValue(barcode); Ext4.getCmp('idCardName').setValue(tousseName + "(条码:" + barcode + ")"); Ext4.getCmp('idCardUseAmount').setValue(result.idCard.idCardDefinition.useAmount); + var packageType = idCardTaskNode.get("packageType"); + var sterilingType = idCardTaskNode.get("sterilingMethod"); + Ext4.getCmp('packageType').setValue(packageType); + Ext4.getCmp('sterilingType').setValue(sterilingType); + idCardBarcode = barcode; idCardInstanceID = result.idCard.id; idCardInfo = result.idCard; @@ -2271,13 +2278,9 @@ var taskId = taskNode.get("taskId"); var packageType = taskNode.get("packageType"); - if(useManualSelectPackageType()){ - packageType = Ext4.getCmp('packageType').getValue(); - } + packageType = Ext4.getCmp('packageType').getValue(); var sterilingType = taskNode.get("sterilingMethod"); - if(isUndefinedOrNullOrEmpty(sterilingType) || useManualSelectPackageType()){ - sterilingType = Ext4.getCmp('sterilingType').getValue(); - } + sterilingType = Ext4.getCmp('sterilingType').getValue(); var sType = Ext4.getCmp('sterilingType'); var tousseType = taskNode.get("tousseType"); var supplierName = taskNode.get("supplierName");