"; - result += "

"; - } else if (sstsConfig.enableUrgentFunction && record.data.isUrgentTousse && record.data.isUrgentTousse == "是" && record.data.urgentLevel && record.data.urgentLevel.colorCode == undefined) {//灰色加急 - result += "

"; - result += "

"; + if (sstsConfig.enableUrgentFunction) { + if (record.leaf) { + if (record.urgentLevel && record.urgentLevel.colorCode != undefined) {//背景色加急级别 + var colorClassName = getClassNameForColor(record.data.urgentLevel.colorCode); + result += ""; + result += "

"; + } else if (record.isUrgentTousse && record.isUrgentTousse == "是" && record.urgentLevel && record.urgentLevel.colorCode == undefined) {//灰色加急 + result += ""; + result += "

"; + } else { + result += v; + } + } else { + result += v; + } } else { result += v; } @@ -1630,10 +1638,10 @@ //待灭菌装载数据源 waitSterileLoadingTousseStore = new Ext.data.Store({ autoLoad: false, - proxy: new Ext.data.HttpProxy({ + proxy: new Ext.data.HttpProxy({ url: WWWROOT + '/disinfectSystem/tousseInstanceAction!getWaitSterileLoadingTousseInstance.do', timeout: 100000 - }), + }), pageSize: pageSize, reader: new Ext.data.JsonReader({ type: 'json', @@ -1877,9 +1885,9 @@ var sterilingModeArray = []; var alreadyAddBlankSterilingMode = false; for (var i = 0; i < selectRows.length; i++) { - if(selectRows[i].json.isTraceable == '是'){ + if (selectRows[i].json.isTraceable == '是') { selectedBarcodeArray.push({ "barcode": selectRows[i].data["objBarcode"] }); - }else { + } else { fixedBarcodeArray.push({ "barcode": selectRows[i].data["objBarcode"] }); } var sterilingModeData = selectRows[i].data["sterilingMode"]; @@ -1899,12 +1907,8 @@ showResult("所选的器械包有多种不同的灭菌方式,请选择相同灭菌方式的器械入筐"); return false; } - if(fixedBarcodeArray.length > 0){ - for(var i=0;i 0){ + if (selectedBarcodeArray.length > 0) { + DWREngine.setAsync(false); SterileLoadingTableManager.getResultJsonStrByBarcode(barcode + ";" + barcodeEnd, getTousseStoreBarcodes(), Ext.getCmp('basketBarcode').getValue(), function (jsonStr) { var obj = Ext.util.JSON.decode(jsonStr); var returnType = obj.returnType; @@ -1930,15 +1934,21 @@ } } else {//不为器械包实例条码 // showResult("条码(尾)只能扫描器械包条码"); - if(obj.message){ + if (obj.message) { showResult(obj.message); Ext.getCmp('barcodeEnd').setValue(''); } } }); obj.tousseInstances = selectedBarcodeArray; processMultiTousseInstance(obj); + DWREngine.setAsync(true); } + if (fixedBarcodeArray.length > 0) { + for (var i = 0; i < fixedBarcodeArray.length; i++) { + scanBarcodeAndAddToBasket(fixedBarcodeArray[i].barcode, 'scanBarcode'); + } + } } else { showResult("请选择需要载入的器械包"); }