Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r31716 -r33529 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 31716) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 33529) @@ -3,8 +3,8 @@ var washingModeStore;// 清洗方式 var washingMachineStore;// 清洗程序 var rinserStore;// 清洗机 -var mergeSameDefinitionItemInClassifyBasket = getSystemSetConfig("mergeSameDefinitionItemInClassifyBasket",false); //对于一个篮筐中，来自与不同回收记录的相同id的器械包（材料）是否要合并。如果合并，则不显示回收科室与回收时间 -var enableIdCardBasketBinding = getSystemSetConfig("enableIdCardBasketBinding",false); +var mergeSameDefinitionItemInClassifyBasket = getSystemSetConfig("mergeSameDefinitionItemInClassifyBasket", false); //对于一个篮筐中，来自与不同回收记录的相同id的器械包（材料）是否要合并。如果合并，则不显示回收科室与回收时间 +var enableIdCardBasketBinding = getSystemSetConfig("enableIdCardBasketBinding", false); // 删除 function deleteWashAndDisinfectRecord(grid) { @@ -14,33 +14,33 @@ showResult("请选择要删除的清洗消毒记录！"); return false; } - + var ids = ""; for (var i = 0, len = records.length; i < len; i++) { - if(ids != ""){ + if (ids != "") { ids += ";"; } ids += records[i].data['id']; } - if(ids == ""){ + if (ids == "") { showResult("请选择要删除的清洗记录！"); return false; } - - Ext.MessageBox.confirm("请确认", "是否确定要删除选中的清洗消毒记录?", function(button, text) { + + Ext.MessageBox.confirm("请确认", "是否确定要删除选中的清洗消毒记录?", function (button, text) { if ("yes" == button) { Ext.Ajax.request({ - url : WWWROOT - + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!deleteWashAndDisinfectRecord.do', - params : { - ids : ids + url: WWWROOT + + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!deleteWashAndDisinfectRecord.do', + params: { + ids: ids }, - success : function(response, options) { + success: function (response, options) { var result = Ext.decode(response.responseText); showResult(result.message); grid.dwrReload(); }, - failure : function(response, options) { + failure: function (response, options) { var result = Ext.decode(response.responseText); showResult(result.message); } @@ -49,7 +49,7 @@ }); } -var loadFormData = function(grid) { +var loadFormData = function (grid) { var records = grid.getSelectionModel().getSelections(); if (records.length == 0) { showResult("请选择要修改的清洗消毒记录！"); @@ -61,10 +61,10 @@ } id = records[0].data['id']; var isWashAgain = false; - if(records[0].data['washStatus'] == washfaild){ + if (records[0].data['washStatus'] == washfaild) { isWashAgain = true; } - addAndEditWashAndDisinfectRecord(id,isWashAgain); + addAndEditWashAndDisinfectRecord(id, isWashAgain); top.Ext.getCmp('washAndDisinfectRecordWin').setTitle('清洗消毒记录'); }; @@ -77,154 +77,154 @@ } //打开清洗记录拍照的图片 -function openWashPhoto(id){ - top.showUploadImagesForWin(id,'清洗记录图片'); +function openWashPhoto(id) { + top.showUploadImagesForWin(id, '清洗记录图片'); } -function openWashDataLineChart(id){ +function openWashDataLineChart(id) { Ext.Ajax.request({ - url:WWWROOT +'/disinfectSystem/washData/washDataLineChartAction!getRinserTypeInfo.do?washAndDisinfectRecordId='+id+'&time='+new Date().getTime(), - success:function(result){ - var resultStr = Ext.decode(result.responseText); - var data = resultStr.data; - if(data.deviceBrand == changLong){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - }else if (data.deviceBrand == marge){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp?washAndDisinfectRecordId='+id+'&deviceModel='+data.deviceModel,'', '清洗参数', '800', '600'); - }else if(data.deviceBrand == xinHua){ - if(sstsConfig.washDataLineChartType == 1){ - if(data.deviceModel == changlong_DC_4){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaChangLong.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); + url: WWWROOT + '/disinfectSystem/washData/washDataLineChartAction!getRinserTypeInfo.do?washAndDisinfectRecordId=' + id + '&time=' + new Date().getTime(), + success: function (result) { + var resultStr = Ext.decode(result.responseText); + var data = resultStr.data; + if (data.deviceBrand == changLong) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else if (data.deviceBrand == marge) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/wahsDataChartOfMarge.jsp?washAndDisinfectRecordId=' + id + '&deviceModel=' + data.deviceModel, '', '清洗参数', '800', '600'); + } else if (data.deviceBrand == xinHua) { + if (sstsConfig.washDataLineChartType == 1) { + if (data.deviceModel == changlong_DC_4) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } } else { - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); + if (data.deviceModel == changlong_DC_5) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + // ZJJSRM-6新华清洗机(负压清洗机和单舱清洗机（super6000）清洗参数显示) + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } } + } else if (data.deviceBrand == GETINGE) { + if (data.deviceModel == GETING_86_SERIES || data.deviceModel == GETING_SUZHOUJIEDING_46_5) { + // KLMY洁定清洗机接口 + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfGeting86Series.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } + } else if (data.deviceBrand == YOUYUAN) { + // DGSDBZXYY-114 连云港佑源减压沸腾清洗消毒机的接口开发 + if (data.deviceModel == YOUYUAN_YZQ_230) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfYouYuan.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } + } else if (data.deviceBrand == STERIS) { + // DGSFYBJY-54 史帝瑞清洗机(型号：AMSCO 3052) + if (data.deviceModel == STERIS_AMSCO_3052) { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfSterisMSCO3052.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } else { + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); + } } else { - if(data.deviceModel == changlong_DC_5){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHua_ChangLong.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); + if (sstsConfig.belimedLineChartType == 1) { + // ZJJSRM-15倍力曼清洗机接口 + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); } else { - // ZJJSRM-6新华清洗机(负压清洗机和单舱清洗机（super6000）清洗参数显示) - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); + openModalWindowForExt(WWWROOT + '/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId=' + id, '', '清洗参数', '800', '600'); } } - }else if(data.deviceBrand == GETINGE){ - if(data.deviceModel == GETING_86_SERIES || data.deviceModel == GETING_SUZHOUJIEDING_46_5){ - // KLMY洁定清洗机接口 - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfGeting86Series.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } else { - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } - }else if(data.deviceBrand == YOUYUAN){ - // DGSDBZXYY-114 连云港佑源减压沸腾清洗消毒机的接口开发 - if(data.deviceModel == YOUYUAN_YZQ_230){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfYouYuan.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } - }else if(data.deviceBrand == STERIS){ - // DGSFYBJY-54 史帝瑞清洗机(型号：AMSCO 3052) - if(data.deviceModel == STERIS_AMSCO_3052){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfSterisMSCO3052.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } else { - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } - }else{ - if(sstsConfig.belimedLineChartType == 1){ - // ZJJSRM-15倍力曼清洗机接口 - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfBelimed.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } else { - openModalWindowForExt(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id,'', '清洗参数', '800', '600'); - } } - }}); + }); } -function updateWashStatus(status){ +function updateWashStatus(status) { var records = grid.getSelectionModel().getSelections(); if (records.length == 0) { showResult("请至少选中一条清洗记录！"); return false; - }else if(records.length == 1){ + } else if (records.length == 1) { var data = records[0].data; qualityMonitoringWRRecordID = data['id']; - }else if(records.length > 1 && status == washfaild){ + } else if (records.length > 1 && status == washfaild) { showResult("一次只能选中一条清洗记录！"); return false; } var ids = ""; - for(var i = 0;i < records.length;i++){ - if(records[i].data["washStatus"] == "清洗完成" || records[i].data["washStatus"] == "清洗失败"){ + for (var i = 0; i < records.length; i++) { + if (records[i].data["washStatus"] == "清洗完成" || records[i].data["washStatus"] == "清洗失败") { showResult("不能修改已清洗完成及清洗失败的清洗记录！"); return false; } - if(ids != ""){ + if (ids != "") { ids += ";"; } ids += records[i].data["id"]; } Ext.getCmp('washSaveConfirm').setValue("0"); - top.Ext.MessageBox.confirm("请确认","确定"+status+"吗？", - function(button, text) { - if ("yes" == button){ - - Ext.MessageBox.show({ - msg: '正在提交，请稍候...', - width:300, - wait:true, - waitConfig: {interval:300} - }); - Ext.Ajax.request({ - url : WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!washConfirm.do', - params : {ids : ids , confirmType : status}, - success : function(response, options) { - hideMessageBox(false); - var result = Ext.decode(response.responseText); - var success = result.success; - if (true != success) { - showResult("提交失败！"); - Ext.getCmp('washSaveConfirm').setValue("-1"); - grid.dwrReload(); - } else { - showResult("提交成功！"); - Ext.getCmp('washSaveConfirm').setValue("1"); - grid.dwrReload(); - if(status == washfaild){ - otherPartAddQM = true; - addQualityMonitoringByResponPart("清洗消毒"); + top.Ext.MessageBox.confirm("请确认", "确定" + status + "吗？", + function (button, text) { + if ("yes" == button) { + + Ext.MessageBox.show({ + msg: '正在提交，请稍候...', + width: 300, + wait: true, + waitConfig: { interval: 300 } + }); + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!washConfirm.do', + params: { ids: ids, confirmType: status }, + success: function (response, options) { + hideMessageBox(false); + var result = Ext.decode(response.responseText); + var success = result.success; + if (true != success) { + showResult("提交失败！"); + Ext.getCmp('washSaveConfirm').setValue("-1"); + grid.dwrReload(); + } else { + showResult("提交成功！"); + Ext.getCmp('washSaveConfirm').setValue("1"); + grid.dwrReload(); + if (status == washfaild) { + otherPartAddQM = true; + addQualityMonitoringByResponPart("清洗消毒"); + } } + }, + failure: function (response, options) { + Ext.getCmp('washSaveConfirm').setValue("-1"); + showResult("提交失败！"); } - }, - failure : function(response, options) { - Ext.getCmp('washSaveConfirm').setValue("-1"); - showResult("提交失败！"); - } - }); - - } - }); + }); + + } + }); } /* * 添加质量监测 */ -function addQualityMonitoringWash() -{ +function addQualityMonitoringWash() { var records = grid.getSelectionModel().getSelections(); - - if(records.length == 1){ + + if (records.length == 1) { var data = records[0].data; qualityMonitoringWRRecordID = data['id']; - }else if(records.length > 1 ){ + } else if (records.length > 1) { showResult("一次只能选中一条清洗记录！"); return false; } otherPartAddQM = true; addQualityMonitoringByResponPart("清洗消毒"); } -Ext.onReady(function() { +Ext.onReady(function () { Ext.QuickTips.init(); Ext4.tip.QuickTipManager.init(); Ext4.apply(Ext4.tip.QuickTipManager.getQuickTip(), { - dismissDelay: 0, - showDelay: 0 + dismissDelay: 0, + showDelay: 0 }); // 记录cookie（3步） function renderColor(v, p, record) { @@ -237,255 +237,257 @@ } return "

" + v + "

"; } - - function actionFun(v, p, record){ - if(v == washfaild){ + + function actionFun(v, p, record) { + if (v == washfaild) { var id = record.data['id']; - var str = ""; + var str = ""; return str; } return; } var columns = [ - {header : "流水号",width : 80,dataIndex : 'serialNumber',renderer : modifyRecord}, - {header : "操作员",width : 80,dataIndex : 'operator'}, - {header : "清洗方式",width : 80,hidden:true,dataIndex : 'washingMode'}, - {header : "清洗机名称",width : 120,dataIndex : 'disinfectIdentification'}, - {header : "清洗程序",width : 150,dataIndex : 'disinfectProgram'}, - {header : "清洗状态",width : 120,dataIndex : 'washStatus',renderer : renderColor}, - {header : "开始时间",width : 140,dataIndex : 'startDate',renderer : myDateFormatBySecond}, - {header : "结束时间",width : 140,dataIndex : 'endDate',renderer : myDateFormatBySecond}, - {header : "操作",width : 120,dataIndex : 'washStatus',renderer : actionFun}, - {header : "清洗参数",dataIndex : 'washDataAmount',sortable :false,renderer: function(v,p,record){ - var buttonGroup = ""; - if(record.data.washDataAmount > 0){ - buttonGroup += ""; - } - if(record.data.hasPicture){ - buttonGroup += ""; + { header: "流水号", width: 80, dataIndex: 'serialNumber', renderer: modifyRecord }, + { header: "操作员", width: 80, dataIndex: 'operator' }, + { header: "清洗方式", width: 80, hidden: true, dataIndex: 'washingMode' }, + { header: "清洗机名称", width: 120, dataIndex: 'disinfectIdentification' }, + { header: "清洗程序", width: 150, dataIndex: 'disinfectProgram' }, + { header: "清洗状态", width: 120, dataIndex: 'washStatus', renderer: renderColor }, + { header: "开始时间", width: 140, dataIndex: 'startDate', renderer: myDateFormatBySecond }, + { header: "结束时间", width: 140, dataIndex: 'endDate', renderer: myDateFormatBySecond }, + { header: "操作", width: 120, dataIndex: 'washStatus', renderer: actionFun }, + { + header: "清洗参数", dataIndex: 'washDataAmount', sortable: false, renderer: function (v, p, record) { + var buttonGroup = ""; + if (record.data.washDataAmount > 0) { + buttonGroup += ""; + } + if (record.data.hasPicture) { + buttonGroup += ""; + } + return buttonGroup; } - return buttonGroup; - }}, - {id : 'autoWidthColumn',header : "清洗总数",width : 140,dataIndex : 'washMaterialAmount',sortable: false} + }, + { id: 'autoWidthColumn', header: "清洗总数", width: 140, dataIndex: 'washMaterialAmount', sortable: false } ]; // 是否有清洗机需要确认完成 var haveNeedConfirn = false; DWREngine.setAsync(false); - WashAndDisinfectRecordTableManager.isRinserNeedConfirn(function(result){ - haveNeedConfirn = result; - }); + WashAndDisinfectRecordTableManager.isRinserNeedConfirn(function (result) { + haveNeedConfirn = result; + }); DWREngine.setAsync(true); // 清洗机 rinserStore = new Ext.data.SimpleStore({ - fields : ['rinserName','conCurrent', 'rinserBarcode', 'cleanMethodDataList'], - autoLoad : true, - url : WWWROOT+ '/disinfectSystem/baseData/rinserAction!getAllRinserListData.do?useStatus=' + encodeURI('在用') + fields: ['rinserName', 'conCurrent', 'rinserBarcode', 'cleanMethodDataList'], + autoLoad: true, + url: WWWROOT + '/disinfectSystem/baseData/rinserAction!getAllRinserListData.do?useStatus=' + encodeURI('在用') }); // 清洗程序 washingMachineStore = new Ext.data.SimpleStore({ - fields : ['id', 'cleanMethod', 'barcode', 'cleanMinutes'], - autoLoad : true, - url : WWWROOT - + '/disinfectSystem/baseData/cleanMethodAction!findCleanMethodArr.do' + fields: ['id', 'cleanMethod', 'barcode', 'cleanMinutes'], + autoLoad: true, + url: WWWROOT + + '/disinfectSystem/baseData/cleanMethodAction!findCleanMethodArr.do' }); // 清洗列表默认是否显示当天的 - if(sstsConfig.hasOwnProperty('washAndDisinfectRecordListDefaultToday') && sstsConfig.washAndDisinfectRecordListDefaultToday){ + if (sstsConfig.hasOwnProperty('washAndDisinfectRecordListDefaultToday') && sstsConfig.washAndDisinfectRecordListDefaultToday) { $Id('parm_s_queryCurDay').value = "today"; } washingMachineStore.load(); var filters = new Ext.grid.GridFilters({ - filters : [ - {type : 'string',dataIndex : 'serialNumber'}, - {type : 'string',dataIndex : 'operator'}, - {type : 'string',dataIndex : 'disinfectIdentification'}, - {type : 'string',dataIndex : 'disinfectProgram'}, - {type : 'date',dataIndex : 'startDate'}, - {type : 'date',dataIndex : 'endDate'}, - {type : 'numeric',dataIndex : 'washMaterialAmount'}, - {type : 'string',dataIndex : 'washStatus'}, - {type : 'list',dataIndex : 'washingMode',options : [washMachine, washManual],phpMode : true} + filters: [ + { type: 'string', dataIndex: 'serialNumber' }, + { type: 'string', dataIndex: 'operator' }, + { type: 'string', dataIndex: 'disinfectIdentification' }, + { type: 'string', dataIndex: 'disinfectProgram' }, + { type: 'date', dataIndex: 'startDate' }, + { type: 'date', dataIndex: 'endDate' }, + { type: 'numeric', dataIndex: 'washMaterialAmount' }, + { type: 'string', dataIndex: 'washStatus' }, + { type: 'list', dataIndex: 'washingMode', options: [washMachine, washManual], phpMode: true } ] }); var readerDetail = [ - {name : 'id'}, - {name : 'serialNumber'}, - {name : 'operator'}, - {name : 'disinfectIdentification'}, - {name : 'disinfectProgram'}, - {name : 'startDate'}, - {name : 'endDate'}, - {name : 'washingMode'}, - {name : 'washDataAmount'}, - {name : 'washMaterialAmount'}, - {name : 'washStatus'}, - {name : 'hasPicture'} + { name: 'id' }, + { name: 'serialNumber' }, + { name: 'operator' }, + { name: 'disinfectIdentification' }, + { name: 'disinfectProgram' }, + { name: 'startDate' }, + { name: 'endDate' }, + { name: 'washingMode' }, + { name: 'washDataAmount' }, + { name: 'washMaterialAmount' }, + { name: 'washStatus' }, + { name: 'hasPicture' } ]; var tbar = new Array(); - - if(!SSTS_WashRecord_Create){ + + if (!SSTS_WashRecord_Create) { tbar.push({ - text : '添加', - hidden : SSTS_WashRecord_Create, - iconCls : 'btn_ext_application_add', - handler : function() { - addAndEditWashAndDisinfectRecord(0,false,false); + text: '添加', + hidden: SSTS_WashRecord_Create, + iconCls: 'btn_ext_application_add', + handler: function () { + addAndEditWashAndDisinfectRecord(0, false, false); } }); tbar.push('-'); }; - if(!SSTS_WashRecord_Update){ + if (!SSTS_WashRecord_Update) { tbar.push({ - text : '修改', - hidden : SSTS_WashRecord_Update, - iconCls : 'btn_ext_application_edit', - id : 'editTbar', - handler : function() { + text: '修改', + hidden: SSTS_WashRecord_Update, + iconCls: 'btn_ext_application_edit', + id: 'editTbar', + handler: function () { loadFormData(grid); } }); tbar.push('-'); }; - if(!(SSTS_WashRecord_Create || (!haveNeedConfirn))){ + if (!(SSTS_WashRecord_Create || (!haveNeedConfirn))) { tbar.push({ - text : '清洗完成', - hidden : SSTS_WashRecord_Create || (!haveNeedConfirn), - iconCls : 'btn_ext_application_save', - id : 'editTbar', - handler : function() { + text: '清洗完成', + hidden: SSTS_WashRecord_Create || (!haveNeedConfirn), + iconCls: 'btn_ext_application_save', + id: 'editTbar', + handler: function () { updateWashStatus(washed); } }); tbar.push('-'); }; - if(!(SSTS_WashRecord_Create || (!haveNeedConfirn))){ + if (!(SSTS_WashRecord_Create || (!haveNeedConfirn))) { tbar.push({ - text : '清洗失败', - hidden : SSTS_WashRecord_Create || (!haveNeedConfirn), - iconCls : 'btn_ext_application_error', - id : 'editTbar', - handler : function() { + text: '清洗失败', + hidden: SSTS_WashRecord_Create || (!haveNeedConfirn), + iconCls: 'btn_ext_application_error', + id: 'editTbar', + handler: function () { updateWashStatus(washfaild); } }); tbar.push('-'); }; - if(!SSTS_WashRecord_Delete){ + if (!SSTS_WashRecord_Delete) { tbar.push({ - text : '删除', - hidden : SSTS_WashRecord_Delete, - iconCls : 'btn_ext_application_del', - handler : function() { + text: '删除', + hidden: SSTS_WashRecord_Delete, + iconCls: 'btn_ext_application_del', + handler: function () { deleteWashAndDisinfectRecord(grid); } }); tbar.push('-'); }; - if(!SSTS_DamageRecord_Create){ + if (!SSTS_DamageRecord_Create) { tbar.push({ - text : '添加报损器材', - hidden : SSTS_DamageRecord_Create, - iconCls : 'btn_ext_add', - handler : function() { + text: '添加报损器材', + hidden: SSTS_DamageRecord_Create, + iconCls: 'btn_ext_add', + handler: function () { addAndEditRecyclingDamageRecord('', LINKTYPE_WASHANDDISINFECTRECORD); } }); tbar.push('-'); }; - if(!SSTS_QualityRecord_Create){ + if (!SSTS_QualityRecord_Create) { tbar.push({ - text : '质量监测', - hidden:SSTS_QualityRecord_Create, - iconCls : 'btn_ext_application_add', - handler : function() { - addQualityMonitoringWash(); - } + text: '质量监测', + hidden: SSTS_QualityRecord_Create, + iconCls: 'btn_ext_application_add', + handler: function () { + addQualityMonitoringWash(); + } }); tbar.push('-'); }; tbar.push({ - text : '清洗日期:' + text: '清洗日期:' }); tbar.push({ - xtype : 'combo', - id : 'applyDate', - name : 'applyDate', - valueField : 'value', - displayField : 'key', - allowBlank : true, - editable : false, - width : 120, - emptyText:'请选择清洗消毒日期', - mode:'local', - store : new Ext.data.SimpleStore({ - data:applyDateDataArray, - fields:['key','value'] + xtype: 'combo', + id: 'applyDate', + name: 'applyDate', + valueField: 'value', + displayField: 'key', + allowBlank: true, + editable: false, + width: 120, + emptyText: '请选择清洗消毒日期', + mode: 'local', + store: new Ext.data.SimpleStore({ + data: applyDateDataArray, + fields: ['key', 'value'] }), - forceSelection : true, - triggerAction : 'all', - listeners : { - select : function(combo, record, index){ + forceSelection: true, + triggerAction: 'all', + listeners: { + select: function (combo, record, index) { var value = combo.value; $Id('parm_s_queryCurDay').value = value; grid.dwrReload(); } }, - anchor : '95%' + anchor: '95%' }); tbar.push({ - id:'washSaveSubmitResult', - xtype:'hidden', - value:"0" + id: 'washSaveSubmitResult', + xtype: 'hidden', + value: "0" }); tbar.push({ - id:'washSaveConfirm', - xtype:'hidden', - value:"0" + id: 'washSaveConfirm', + xtype: 'hidden', + value: "0" }); - + var dwrCallParams = null; - Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() { + Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function () { }; // 清洗方式 washingModeStore = new Ext.data.SimpleStore({ - fields : ['typeName'], - data : [[washMachine], [washManual]] + fields: ['typeName'], + data: [[washMachine], [washManual]] }); - + grid = new Ext.ux.ForgonPageGrid({ - title : '清洗消毒记录', - tbar : tbar, - pageSize : 20, - defaultSortField : 'startDate', - defaultSortDirection : 'DESC', - isCheckboxSelectionModel : true, - rememberSelected : false, - isShowSearchField : true, - columns : columns, - plugins : filters, - autoExpandColumn : 'autoWidthColumn', - renderTo : 'gridDiv', - frame : false - }, + title: '清洗消毒记录', + tbar: tbar, + pageSize: 20, + defaultSortField: 'startDate', + defaultSortDirection: 'DESC', + isCheckboxSelectionModel: true, + rememberSelected: false, + isShowSearchField: true, + columns: columns, + plugins: filters, + autoExpandColumn: 'autoWidthColumn', + renderTo: 'gridDiv', + frame: false + }, readerDetail, WashAndDisinfectRecordTableManager.findWashAndDisinfectRecordTableList, dwrCallParams // 这个参数只是占位作用 ); if (!sstsConfig.disableWashViewMouseover) { var tableContent; - grid.on('mouseover', function(e) {// 添加mouseover事件 + grid.on('mouseover', function (e) {// 添加mouseover事件 var index = grid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到行的位置 if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false） var record = this.getStore().getAt(index); tableContent = record.data['htmlContent']; - //控制前三列显示悬浮框 + //控制前三列显示悬浮框 //鼠标所在列的下标的判断 var positiona = 100; //将表头的列获取到（未隐藏的除外） @@ -495,13 +497,13 @@ //表头数组对象 var tableHeader = new Array(); var thead = new Array(); - if(confObj == false){ + if (confObj == false) { return false; } //依次遍历，保存每列的dataIndex和header - for(var i = 1; i < confObj.length; i ++){ -  //如果栏位显示 - if(confObj[i].hidden == undefined || confObj[i].hidden == false){ + for (var i = 1; i < confObj.length; i++) { + //如果栏位显示 + if (confObj[i].hidden == undefined || confObj[i].hidden == false) { //栏位数组对象 tableHeader.push(confObj[i].dataIndex); } @@ -511,113 +513,113 @@ var jsonHeader = Ext.util.JSON.encode(tableHeader); var thead = Ext.util.JSON.decode(jsonHeader); var cid = grid.getView().findCellIndex(e.getTarget()); - if(cid == false){ + if (cid == false) { return false; } var colname = grid.getColumnModel().getDataIndex(cid); //获取列名 - for(var i=0;i2||positiona==100){ + if (positiona > 2 || positiona == 100) { return false; } - //控制前三列显示悬浮框 end - if(!tableContent){ + //控制前三列显示悬浮框 end + if (!tableContent) { var content = ""; DWREngine.setAsync(false); - WashAndDisinfectRecordTableManager.findWashRecordMaterials(record.data['id'],function(resultStr){ + WashAndDisinfectRecordTableManager.findWashRecordMaterials(record.data['id'], function (resultStr) { var result = Ext4.decode(resultStr); - for(var i=0;i" + amount+""; - if(!mergeSameDefinitionItemInClassifyBasket){ - content +=" "; - content +=" "; + + content += " " + name + "" + amount + ""; + if (!mergeSameDefinitionItemInClassifyBasket) { + content += " "; + content += " "; } - content +="" + barcode+""; - content +=""; + content += "" + barcode + ""; + content += ""; //筐内材料 var materialArray = result.baskets[i].items; - if(materialArray != null && materialArray.length > 0){ - for ( var j = 0; j < materialArray.length; j++) { + if (materialArray != null && materialArray.length > 0) { + for (var j = 0; j < materialArray.length; j++) { var material = materialArray[j]; - content +="   " + material.name +"" + material.amount+""; - if(!mergeSameDefinitionItemInClassifyBasket){ - if(!("recyclingDept" in material)){ + content += "   " + material.name + "" + material.amount + ""; + if (!mergeSameDefinitionItemInClassifyBasket) { + if (!("recyclingDept" in material)) { material.recyclingDept = " "; material.recyclingTime = " "; } - content +=""+material.recyclingDept+""; - content +=""+material.recyclingTime+""; + content += "" + material.recyclingDept + ""; + content += "" + material.recyclingTime + ""; } - content +=" "; + content += " "; } } } //筐外材料 - for(var i=0;i" + amount+""; - content +=" "; - if(!mergeSameDefinitionItemInClassifyBasket){ - content +=" "; - content +=" "; + + content += " " + name + "" + amount + ""; + content += " "; + if (!mergeSameDefinitionItemInClassifyBasket) { + content += " "; + content += " "; } - content +=""; + content += ""; } }); DWREngine.setAsync(true); tableContent = ""; - + tableContent += ""; tableContent += ""; - if(!mergeSameDefinitionItemInClassifyBasket){ + if (!mergeSameDefinitionItemInClassifyBasket) { tableContent += ""; - tableContent += ""; + tableContent += ""; } tableContent += ""; tableContent += "" + content + "

物品名称

回收数量

回收科室

回收时间

回收时间

条码


"; - record.set("htmlContent",tableContent); + record.set("htmlContent", tableContent); } var maxHeight = grid.getInnerHeight(); e.getTarget().setAttribute('data-qtip', tableContent); - e.getTarget().setAttribute('data-qtitle', ' 清洗记录物品列表:'); + e.getTarget().setAttribute('data-qtitle', ' 清洗记录物品列表:'); } }); } - + var viewport = new Ext.Viewport({ - layout : 'border', - items : [{ - region : 'center', - margins : '0 0 0 0', - layout : 'fit', - items : grid + layout: 'border', + items: [{ + region: 'center', + margins: '0 0 0 0', + layout: 'fit', + items: grid }] }); - function setTimeOut(seconds){ - setTimeout(function(){ + function setTimeOut(seconds) { + setTimeout(function () { grid.dwrReload(); setTimeOut(seconds); }, seconds); } - if(sstsConfig.autoRefreshWashAndDisinfectRecordListIntervalSeconds && parseInt(sstsConfig.autoRefreshWashAndDisinfectRecordListIntervalSeconds) > 0){ + if (sstsConfig.autoRefreshWashAndDisinfectRecordListIntervalSeconds && parseInt(sstsConfig.autoRefreshWashAndDisinfectRecordListIntervalSeconds) > 0) { var seconds = sstsConfig.autoRefreshWashAndDisinfectRecordListIntervalSeconds; - setTimeOut(seconds*1000); + setTimeOut(seconds * 1000); } //SZYK-34:针对设备运行结束后提醒功能的改进