Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r41185 -r41186 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 41185) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 41186) @@ -44,10 +44,10 @@ // 回收页面进来 closeQMLayer(); } else { - try{ + try { backToAndroidListPage(); - }catch(e){ - + } catch (e) { + } if (top.Ext.getCmp('qualityMonitoringWin')) { top.Ext.getCmp('qualityMonitoringWin').close(); @@ -203,7 +203,7 @@ for (var i = 0; i <= hiddenTousseIndex; i++) { if (Ext.getCmp('tousseBagsForName_' + i + '_0')) { if (Ext.getCmp('tousseBagsForName_' + i + '_0').getValue() == record.data.tousseName && i !== tousseIndex) { - showResult(record.data.tousseName + '已存在！'); + showResultQM(record.data.tousseName + '已存在！'); this.setValue(''); isHas = true; break; @@ -339,7 +339,7 @@ for (var i = 1; i <= hiddenMaterialIndex; i++) { if (Ext.getCmp('hiddenIndexBox_' + tousseIndex + '_' + i)) { if (Ext.getCmp('materialInfosName_' + tousseIndex + '_' + i).getValue() == record.data.material) { - showResult(record.data.material + '已存在！'); + showResultQM(record.data.material + '已存在！'); this.setValue(''); isHas = true; break; @@ -483,7 +483,7 @@ for (var i = 0; i <= newHiddenMaterialIndex; i++) { if (Ext.getCmp('materialInfosName_' + hiddenTousseIndex + '_' + i)) { if (Ext.getCmp('materialInfosName_' + hiddenTousseIndex + '_' + i).getValue() == record.data.material && i !== hiddenMaterialIndex) { - showResult(record.data.material + '已存在！'); + showResultQM(record.data.material + '已存在！'); this.setValue(''); isHas = true; break; @@ -727,15 +727,15 @@ if (scope !== '材料') { var newUnQualifiedTousseAmount = Ext.getCmp('newUnQualifiedTousseAmount').getValue() || 0; if (newUnQualifiedTousseAmount < 0) { - showResult('不合格器械包数不能小于0！'); + showResultQM('不合格器械包数不能小于0！'); return } Ext.getCmp('unQualifiedTousseAmount').setValue(newUnQualifiedTousseAmount); } if (scope !== '器械包') { var newUnQualifiedMaterialAmount = Ext.getCmp('newUnQualifiedMaterialAmount').getValue() || 0; if (newUnQualifiedMaterialAmount < 0) { - showResult('不合格器械数不能小于0！'); + showResultQM('不合格器械数不能小于0！'); return } Ext.getCmp('unQualifiedMaterialAmount').setValue(newUnQualifiedMaterialAmount); @@ -768,7 +768,7 @@ function showRecordMaterialDetails(id, filedIndex, optionId, optionsLength) { var tousseAndMaterialAllData = getAllTousseAndMaterialData(); if (!tousseAndMaterialAllData || tousseAndMaterialAllData.length == 0) { - showResult('器械包或者器械不能为空！'); + showResultQM('器械包或者器械不能为空！'); return } var scope = Ext.getCmp('scope').getValue(); @@ -933,7 +933,7 @@ for (var i = 0; i <= hiddenTousseIndex; i++) { if (Ext.getCmp('tousseBagsForName_' + i + '_0')) { if (Ext.getCmp('tousseBagsForName_' + i + '_0').getValue() == record.data.tousseName && i !== 0) { - showResult(record.data.tousseName + '已存在！'); + showResultQM(record.data.tousseName + '已存在！'); this.setValue(''); isHas = true; break; @@ -1072,7 +1072,7 @@ for (var i = 1; i <= hiddenMaterialIndex_0_0; i++) { if (Ext.getCmp('hiddenIndexBox_0_' + i)) { if (Ext.getCmp('materialInfosName_0_' + i).getValue() == record.data.material) { - showResult(record.data.material + '已存在！'); + showResultQM(record.data.material + '已存在！'); isHas = true; this.setValue(''); break; @@ -1196,11 +1196,11 @@ } } if (isTousseNull) { - showResult('器械包不能为空！'); + showResultQM('器械包不能为空！'); return; } if (isShowMsg && scope == '材料和器械包') { - showResult(message); + showResultQM(message); return; } } else { @@ -1238,7 +1238,7 @@ } } if (isShowMsg) { - showResult(message); + showResultQM(message); return; } arr.push({ @@ -2055,11 +2055,11 @@ }, failure: function (response, options) { var result = Ext.decode(response.responseText); - showResult(result.message); - try{ + showResultQM(result.message); + try { speakContentThrouhtAndroid(result.message); - }catch(e){ - + } catch (e) { + } } }); @@ -3174,7 +3174,7 @@ } if (isHas) { combo.setValue(''); - showResult('抽检器械已存在！'); + showResultQM('抽检器械已存在！'); } else { combo.setValue(record.data.name); } @@ -3928,7 +3928,7 @@ continue; } else { if (uniqueScannedBarcode[q] == curBarcode) { - showResult("该器械包已存在，不能重复扫描！"); + showResultQM("该器械包已存在，不能重复扫描！"); isScanned = true; break; } @@ -4273,14 +4273,14 @@ if (isHas) { combo.setValue(''); Ext.getCmp('tousseDefinitionId' + tousseIndex).setValue(''); - showResult('器械包已存在！'); + showResultQM('器械包已存在！'); } else { var tousseName = Ext.getCmp('tousseName').getValue(); var tousseInstanceId = Ext.getCmp('tousseInstanceId').getValue(); if (tousseInstanceId == '' && tousseName == record.data.name) { combo.setValue(''); Ext.getCmp('tousseDefinitionId' + tousseIndex).setValue(''); - showResult('器械包已存在！'); + showResultQM('器械包已存在！'); return } combo.setValue(record.data.name); @@ -5995,7 +5995,7 @@ } } if (isReprint) { - showResult('本次没有添加器械包，无法进行打印标签。'); + showResultQM('本次没有添加器械包，无法进行打印标签。'); return } } @@ -7044,7 +7044,7 @@ } }); } else { - showResult('该工号或条码不存在！'); + showResultQM('该工号或条码不存在！'); } } } @@ -7189,7 +7189,7 @@ success: function (response, options) { var result = Ext.decode(response.responseText); if (result.success == false) { - showResult(result.message); + showResultQM(result.message); } else { if (result.data.length > 1) { loadScanBarcodeMsg('rinseBasketsName', 'cleaningMachinePosition', 'cleaningMachineDate', 'cleaningMachineName', 'cleaningMachineProgramName', 'cleaningStartTime', 'cleaningEndTime', 'scanWashRecord_id', barcodeValue); @@ -7595,6 +7595,7 @@ layout: 'form', columnWidth: actualWidth > 500 ? 0.08 : 0.2, labelWidth: (recycleQM && top.screen.width > 1280) ? 182 : labelWidthLeft, + id: 'uploadButton', items: [ { xtype: 'button', @@ -8004,7 +8005,7 @@ if (isHas) { combo.setValue(''); Ext.getCmp('tousseDefinitionId').setValue(''); - showResult('器械包已存在！'); + showResultQM('器械包已存在！'); } else { combo.setValue(record.data.name); Ext.getCmp('tousseDefinitionId').setValue(record.data.id); @@ -8098,7 +8099,7 @@ } if (isHas) { combo.setValue(''); - showResult('抽检器械已存在！'); + showResultQM('抽检器械已存在！'); } else { combo.setValue(record.data.name); } @@ -8295,10 +8296,10 @@ } else { showResult(msg); } - try{ + try { speakContentThrouhtAndroid(msg); - }catch(e){ - + } catch (e) { + } } @@ -8308,6 +8309,11 @@ Ext.onReady(function () { formPanel = getFormPanelContent(id); + try { + loadPage(); + } catch (e) { + + } }); //仪器图谱 @@ -8320,12 +8326,4 @@ function loadDataForPacking(responPartName, washRecordId, tousseItems, ids, remarks, newMaterialCountRecords) { materialCountRecords = newMaterialCountRecords; addQualityMonitoringByResponPart(responPartName, washRecordId, tousseItems, ids, remarks); -} - -Ext.onReady(function () { - try{ - loadPage(); - }catch(e){ - - } -}); \ No newline at end of file +} \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp =================================================================== diff -u -r41185 -r41186 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp (.../qualitymonitoringInstanceForm.jsp) (revision 41185) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp (.../qualitymonitoringInstanceForm.jsp) (revision 41186) @@ -146,7 +146,7 @@ * 隐藏文件上传控件(通常来自嵌入端,比如android,因为文件上传控件在android的webview嵌入的页面里不兼容不支持) */ function hideInputFile(){ - + Ext.getCmp('uploadButton').hide(); } Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js =================================================================== diff -u -r41185 -r41186 --- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 41185) +++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js (.../routineMonitoringForm.js) (revision 41186) @@ -60,7 +60,7 @@ }); qmInstanceStore.add(record); } else { - showResult(name + "，已添加！"); + showResultQM(name + "，已添加！"); } } @@ -406,15 +406,15 @@ } optionsArray.push({ layout: 'form', - columnWidth: .5, + columnWidth: actualWidth > 500 ? .5 : 1, labelWidth: actualWidth > 500 ? 200 : 150, style: 'margin-top:10px', items: [{ name: 'cconfigItemOption' + id, fieldLabel: optionsJson[j].name, xtype: 'checkbox', checked: checked, - columnWidth: .5, + columnWidth: actualWidth > 500 ? .5 : 1, inputValue: JSON.stringify(optionsJson[j]), listeners: { check: function (thiz, checked) { @@ -471,7 +471,7 @@ unqualifiedChecked = true; } var actualWidth = document.body.clientWidth; - var labelWidth = actualWidth > 500 ? 200 : 150; + var labelWidth = actualWidth > 500 ? 200 : 100; Ext.getCmp('addRoutineMonitoringForm').add({ id: 'resultFieldSet', xtype: "fieldset", @@ -578,12 +578,21 @@ } }, failure: function (response, options) { - showResult('系统加载出错，请稍候再试'); + showResultQM('系统加载出错，请稍候再试'); } }); } +function showResultQM(msg) { + showResult(msg); + try{ + speakContentThrouhtAndroid(msg); + }catch(e){ + + } +} + // 打开定期监测，加载包和材料的信息 function loadRoutineMonitoringTousseAndMaterialMsg(routineMonitoringGoodsList) { if (routineMonitoringGoodsList == null || routineMonitoringGoodsList == '' || routineMonitoringGoodsList.length == 0) { @@ -889,7 +898,7 @@ } }, failure: function (response, options) { - showResult('系统加载出错，请稍候再试'); + showResultQM('系统加载出错，请稍候再试'); } }); @@ -1103,7 +1112,7 @@ }] }, { layout: 'form', - columnWidth: .3, + columnWidth: actualWidth > 500 ? 0.3 : 0.5, labelWidth: 90, items: [{ id: 'recycle', @@ -1125,7 +1134,7 @@ }] }, { layout: 'form', - columnWidth: .3, + columnWidth: actualWidth > 500 ? 0.3 : 0.5, labelWidth: 90, items: [{ id: 'repacking', @@ -1147,7 +1156,7 @@ }] }, { layout: 'form', - columnWidth: .3, + columnWidth: actualWidth > 500 ? 0.3 : 0.5, labelWidth: 90, items: [{ id: 'disabledBarcode', @@ -1566,11 +1575,11 @@ Ext.getCmp('saveBtn11').hide(); } } else { - showResult("找不到该条码所对应的器械包实例"); + showResultQM("找不到该条码所对应的器械包实例"); } }, failure: function (response, options) { - showResult('系统加载出错，请稍候再试'); + showResultQM('系统加载出错，请稍候再试'); } }); } else { @@ -1722,7 +1731,7 @@ var result = Ext.decode(response.responseText); if (result.success) { if (result.isTraceble == '否') { - showResult('该物品是不追溯的包，请检查炉号炉次是否正确！'); + showResultQM('该物品是不追溯的包，请检查炉号炉次是否正确！'); } if (isQMView == true) { @@ -1779,12 +1788,12 @@ } } else { - // showResult("找不到该条码所对应的器械包实例"); - showResult(result.message); + // showResultQM("找不到该条码所对应的器械包实例"); + showResultQM(result.message); } }, failure: function (response, options) { - showResult('系统加载出错，请稍候再试'); + showResultQM('系统加载出错，请稍候再试'); } }); } @@ -1804,13 +1813,13 @@ var itemId = optionAmountArr[i]; if (Ext.getCmp('configItemOption' + itemId).getXType() != 'hidden') { if (!Ext.getCmp('configItemOption' + itemId).isValid()) { - showResult("请正确填写表单各值。"); + showResultQM("请正确填写表单各值。"); thiz.enable(); return false; } } else { if (!Ext.getCmp('configItemOption' + itemId).hidden && Ext.getCmp('configItemOption' + itemId).getValue() == '#@') { - showResult("请正确填写表单各值。"); + showResultQM("请正确填写表单各值。"); thiz.enable(); return false; } @@ -1828,7 +1837,7 @@ } } if (!checked) { - showResult(extElement.title + "是必填项"); + showResultQM(extElement.title + "是必填项"); thiz.enable(); return false; } @@ -1873,7 +1882,7 @@ } if (!Ext.getCmp('addRoutineMonitoringForm').form.isValid()) { - showResult('请正确填写表单各值。'); + showResultQM('请正确填写表单各值。'); thiz.enable(); return false; } @@ -1899,7 +1908,7 @@ waitTitle: '提交表单', success: function (form, action) { var result = Ext.decode(action.response.responseText); - showResult(result.message); + showResultQM(result.message); cancelRoutineMonitoring(); if (typeof (grid) != 'undefined' && grid != null) { grid.getStore().reload(); @@ -1910,7 +1919,7 @@ failure: function (form, action) { if (action.response != null && action.response.responseText != null) { var result = Ext.decode(action.response.responseText); - showResult(result.message); + showResultQM(result.message); } else { alert("连接服务器出错"); }