Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r33472 -r33614 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 33472) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 33614) @@ -5,8 +5,6 @@ //使用物品明细 var tousseInstanceGridWidth = 900; var iskeypress = false; -//使用记录的手术间是否允许为空 -var useRecordOperationRoomAllowBlank = true; //器械包丢失报损记录,格式如:[{id:1,errorRemark:"丢失原因说明",damageRemark:"报损原因说明",errorData:[{materialId:"材料id1",errorAmount:1},{materialId:"材料id2",errorAmount:0},...{materialId:"材料id3",errorAmount:1}}],damageData:[{materialId:"材料id1",errorAmount:1},{materialId:"材料id2",errorAmount:0},...{materialId:"材料id3",errorAmount:1}}]}, {id:2,errorRemark:"丢失原因说明",damageRemark:"报损原因说明",errorData:[{materialId:"材料id1",errorAmount:1},{materialId:"材料id2",errorAmount:0},...{materialId:"材料id3",errorAmount:1}}],damageData:[{materialId:"材料id1",errorAmount:1},{materialId:"材料id2",errorAmount:0},...{materialId:"材料id3",errorAmount:1}}]}] var tousseInstanceMaterialErrorDamageArray = []; @@ -73,7 +71,7 @@ if (sstsConfig.notAllowBlankFieldsOnUseRecordPage && typeof sstsConfig.notAllowBlankFieldsOnUseRecordPage == 'object') { var allowBlankObj = returnFieldAllowBlankObj('notAllowBlankFieldsOnUseRecordPage'); //住院号 - hospitalNumAllowBlank = allowBlankObj.hospitalNum; + hospitalNumAllowBlank = allowBlankObj.hospitalNumber; //诊疗号 treatmentNumAllowBlank = allowBlankObj.treatmentNum; //洗手护士 @@ -107,7 +105,7 @@ //麻醉方式 anesthesiaModeAllowBlank = allowBlankObj.anesthesiaMode; //手术名称 - operationNameAllowBlank = allowBlankObj.operationName; + operationNameAllowBlank = allowBlankObj.operation; //手术单号 operationScheduleIdAllowBlank = allowBlankObj.operationScheduleId; //手术时间 @@ -120,11 +118,6 @@ doctorAccountDepartAllowBlank = allowBlankObj.doctorAccountDepart; //备注 remarkAllowBlank = allowBlankObj.remark; -} else { - hospitalNumAllowBlank = fromDepartmentUseRecord || getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank', true); - washHandNurseAllowBlank = fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank', false)); - circuitNurseAllowBlank = fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank', false)); - operationRoomAllowBlank = fromDepartmentUseRecord || (sstsConfig.allowAllBlankExceptThreeSpecialFields ? true : useRecordOperationRoomAllowBlank) } //ZJYY-80:使用记录字段别名设置 @@ -684,13 +677,6 @@ var currentTime = Ext.util.Format.date(new Date(), 'Y-m-d'); - // 未签收的器械包不能登记使用记录 //江门市中心医院JMSZXYY-88，废弃notSignedItemsCanRegistUseRecord这个配置项 - /* if(goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord == false){ - showResult('该器械包未签收，不能被使用！'); - return; - } */ - - //if ((goodsInfo.status == hadShipped && sstsConfig.notSignedItemsCanRegistUseRecord != false)|| goodsInfo.status == hadSigned) { if ((goodsInfo.status == hadShipped && goodsInfo.registUseRecordAfterSigned == '否') || goodsInfo.status == hadSigned) { if (validTime && !compareDate(currentTime, validTime)) { showResult('该器械包已过期！'); @@ -754,7 +740,6 @@ } } } else { - //if (sstsConfig.notSignedItemsCanRegistUseRecord == false){ if (goodsInfo.registUseRecordAfterSigned == '是') { showResult('器械包状态为【' + goodsInfo.status + '】，只能登记已签收并且未被使用的器械包!'); } @@ -1110,18 +1095,53 @@ //如果不为科室使用记录时 if (!fromDepartmentUseRecord) { if (sstsConfig.notAllowBlankFieldsOnUseRecordPage && typeof sstsConfig.notAllowBlankFieldsOnUseRecordPage == 'object') { - if (!hospitalNumAllowBlank && top.Ext.getCmp('hospitalNum').getValue() == '') { - btObj.enable(); - top.Ext.getCmp('hospitalNum').focus(); - showResult(hospitalNumName + '不能为空'); - return result; + if (sstsConfig.noInputTreatmentNumOrHospitalNum) { + if (!hospitalNumAllowBlank && top.Ext.getCmp('hospitalNum').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('hospitalNum').focus(); + showResult(hospitalNumName + '不能为空'); + return result; + } + if (!treatmentNumAllowBlank && top.Ext.getCmp('treatmentNum').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('treatmentNum').focus(); + showResult(treatmentNumName + '不能为空'); + return result; + } + if (!patientNameAllowBlank && top.Ext.getCmp('patientName').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('patientName').focus(); + showResult(patientNameSet + '不能为空'); + return result; + } + } else { + if (!hospitalNumAllowBlank || !treatmentNumAllowBlank || !patientNameAllowBlank) { + if (!hospitalNumAllowBlank && top.Ext.getCmp('hospitalNum').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('hospitalNum').focus(); + showResult(hospitalNumName + '不能为空'); + return result; + } + if (!treatmentNumAllowBlank && top.Ext.getCmp('treatmentNum').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('treatmentNum').focus(); + showResult(treatmentNumName + '不能为空'); + return result; + } + if (!patientNameAllowBlank && top.Ext.getCmp('patientName').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('patientName').focus(); + showResult(patientNameSet + '不能为空'); + return result; + } + } else { + if (top.Ext.getCmp('treatmentNum').getValue() == '' && top.Ext.getCmp('hospitalNum').getValue() == '' && top.Ext.getCmp('patientName').getValue() == '') { + btObj.enable(); + showResult('请输入' + treatmentNumName + '或者' + hospitalNumName + '或者' + patientNameSet); + return result; + } + } } - if (!treatmentNumAllowBlank && top.Ext.getCmp('treatmentNum').getValue() == '') { - btObj.enable(); - top.Ext.getCmp('treatmentNum').focus(); - showResult(treatmentNumName + '不能为空'); - return result; - } if (!washHandNurseAllowBlank && top.Ext.getCmp('washHandNurse').getValue() == '') { btObj.enable(); top.Ext.getCmp('washHandNurse').focus(); @@ -1140,12 +1160,6 @@ showResult(operationRoomName + '不能为空'); return result; } - if (!patientNameAllowBlank && top.Ext.getCmp('patientName').getValue() == '') { - btObj.enable(); - top.Ext.getCmp('patientName').focus(); - showResult(patientNameSet + '不能为空'); - return result; - } if (!patientAgeAllowBlank && top.Ext.getCmp('patientAge').getValue() == '') { btObj.enable(); top.Ext.getCmp('patientAge').focus(); @@ -1255,32 +1269,8 @@ return result; } } else { - if (getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank', true) == false && top.Ext.getCmp('hospitalNum').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields) { + if (!sstsConfig.noInputTreatmentNumOrHospitalNum && top.Ext.getCmp('treatmentNum').getValue() == '' && top.Ext.getCmp('hospitalNum').getValue() == '' && top.Ext.getCmp('patientName').getValue() == '') { btObj.enable(); - top.Ext.getCmp('hospitalNum').focus(); - showResult(hospitalNumName + '不能为空'); - return result; - } - if (getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank', false) == false && top.Ext.getCmp('washHandNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields) { - btObj.enable(); - top.Ext.getCmp('washHandNurse').focus(); - showResult(washHandNurseName + '不能为空'); - return result; - } - if (getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank', false) == false && top.Ext.getCmp('circuitNurse').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields) { - btObj.enable(); - top.Ext.getCmp('circuitNurse').focus(); - showResult(circuitNurseName + '不能为空'); - return result; - } - if (useRecordOperationRoomAllowBlank == false && top.Ext.getCmp('operationRoom').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields) { - btObj.enable(); - top.Ext.getCmp('operationRoom').focus(); - showResult(operationRoomName + '不能为空'); - return result; - } - if (!sstsConfig.noInputTreatmentNumOrHospitalNum && top.Ext.getCmp('treatmentNum').getValue() == '' && top.Ext.getCmp('hospitalNum').getValue() == '' && top.Ext.getCmp('patientName').getValue() == '' && !sstsConfig.allowAllBlankExceptThreeSpecialFields) { - btObj.enable(); showResult('请输入' + treatmentNumName + '或者' + hospitalNumName + '或者' + patientNameSet); return result; } @@ -1813,7 +1803,6 @@ */ function addAndEditUseRecordAfterUrgentLevelDataLoaded(id, status, recyclingStatus) { currentUseRecordId = id; - useRecordOperationRoomAllowBlank = getBoolValueFromJs('sstsConfig.useRecordOperationRoomAllowBlank', true); useItemsStore.removeAll(); useAmount = 0; var tbar; Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js =================================================================== diff -u -r33519 -r33614 --- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 33519) +++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 33614) @@ -264,10 +264,15 @@ Ext4.onReady(function(){ Ext4.QuickTips.init(); - + var operationRoomAllowBlank = true; + var hospitalNumAllowBlank = true; //巡回护士项的标签 var circuitNurseLabelName = sstsConfig.circuitNurseLabelName ? sstsConfig.circuitNurseLabelName : '巡回护士'; - useRecordOperationRoomAllowBlank = getBoolValueFromJs('sstsConfig.useRecordOperationRoomAllowBlank',true); + if (sstsConfig.notAllowBlankFieldsOnUseRecordPage && typeof sstsConfig.notAllowBlankFieldsOnUseRecordPage == 'object') { + var allowBlankObj = returnFieldAllowBlankObj('notAllowBlankFieldsOnUseRecordPage'); + operationRoomAllowBlank = allowBlankObj.operationRoom; + hospitalNumAllowBlank = allowBlankObj.hospitalNumber; + } var yesNoStore = new Ext4.data.Store( { fields : [{name:'value'},{name:'text'}], @@ -445,7 +450,7 @@ fieldLabel : '住院号', id : 'hospitalNum', name : 'hospitalNum', - allowBlank : getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank',true), + allowBlank : hospitalNumAllowBlank, enableKeyEvents : true, maxLength:20, maxLengthText :'长度超过限制，不能保存！', @@ -530,7 +535,7 @@ triggerAction : 'all', hideTrigger : false, typeAhead : false, - allowBlank : true,//getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank',false), + allowBlank : true, anchor : '96%', listeners : { render : function(c){ @@ -590,7 +595,7 @@ triggerAction : 'all', hideTrigger : false, typeAhead : false, - allowBlank : true,//getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank',false), + allowBlank : true, anchor : '96%', listeners : { render : function(c){ @@ -659,7 +664,7 @@ name : 'operationRoom', maxLength:10, maxLengthText :'长度超过限制，不能保存！', - allowBlank : useRecordOperationRoomAllowBlank, + allowBlank : operationRoomAllowBlank, anchor : '96%', listeners:{ render : function(c) { Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js =================================================================== diff -u -r33375 -r33614 --- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 33375) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 33614) @@ -112,7 +112,11 @@ } function editOperationReservation(id,committedStatus) { - var useRecordOperationRoomAllowBlank = getBoolValueFromJs('sstsConfig.useRecordOperationRoomAllowBlank',true); + var operationRoomAllowBlank = true; + if (sstsConfig.notAllowBlankFieldsOnUseRecordPage && typeof sstsConfig.notAllowBlankFieldsOnUseRecordPage == 'object') { + var allowBlankObj = returnFieldAllowBlankObj('notAllowBlankFieldsOnUseRecordPage'); + operationRoomAllowBlank = allowBlankObj.operationRoom; + } var handleDepartStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/systemmanage/getCssdsByApplyDepartAndType.do', @@ -410,7 +414,7 @@ minChars : 0, maxLength:10, maxLengthText :'长度超过限制，不能保存！', - allowBlank : useRecordOperationRoomAllowBlank, + allowBlank : operationRoomAllowBlank, anchor : '100%', valueField : 'operationRoomName', displayField : 'operationRoomName', @@ -428,15 +432,6 @@ saveOrgUnitCode = record.data.orgUnitCoding; } } - - /* xtype : 'textfield', - fieldLabel : '手术间', - id : 'operatingRoom', - name : 'operatingRoom', - maxLength:10, - maxLengthText :'长度超过限制，不能保存！', - allowBlank : useRecordOperationRoomAllowBlank, - anchor : '100%' */ }] },{ columnWidth : .33, Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r33558 -r33614 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 33558) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 33614) @@ -3235,7 +3235,7 @@ if (newArray && typeof newArray == 'object') { if (newArray.length > 0) { for (var i = 0; i < newArray.length; i++) { - var fieldName = newArray[i].fieldName; + var fieldName = newArray[i]; if (obj[fieldName]) { obj[fieldName] = false; } Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js =================================================================== diff -u -r33447 -r33614 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js (.../interfereUseRecordForm.js) (revision 33447) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js (.../interfereUseRecordForm.js) (revision 33614) @@ -2,8 +2,6 @@ var currentUseRecordId; //录入使用记录的表单面板 var formObj; -//使用记录的手术间是否允许为空 -var useRecordOperationRoomAllowBlank = true; //巡回护士项的标签 var circuitNurseLabelName = sstsConfig.circuitNurseLabelName ? sstsConfig.circuitNurseLabelName : '巡回护士'; @@ -17,6 +15,34 @@ singleSelect: false }); +//住院号 +var hospitalNumAllowBlank = true; +//诊疗号 +var treatmentNumAllowBlank = true; +//姓名 +var patientNameAllowBlank = true; +//洗手护士 +var washHandNurseAllowBlank = true; +//巡回护士 +var circuitNurseAllowBlank = true; +//手术间 +var operationRoomAllowBlank = true; +if (sstsConfig.notAllowBlankFieldsOnUseRecordPage && typeof sstsConfig.notAllowBlankFieldsOnUseRecordPage == 'object') { + var allowBlankObj = returnFieldAllowBlankObj('notAllowBlankFieldsOnUseRecordPage'); + //住院号 + hospitalNumAllowBlank = allowBlankObj.hospitalNumber; + //诊疗号 + treatmentNumAllowBlank = allowBlankObj.treatmentNum; + //姓名 + patientNameAllowBlank = allowBlankObj.patientName; + //洗手护士 + washHandNurseAllowBlank = allowBlankObj.washHandNurse; + //巡回护士 + circuitNurseAllowBlank = allowBlankObj.circuitNurse; + //手术间 + operationRoomAllowBlank = allowBlankObj.operationRoom; +} + var rd = new Ext.data.JsonReader({ fields: [ {name: 'id'}, @@ -394,40 +420,85 @@ } function checkForSave(btObj) { - //改成各元素单独验证的方式 - /*if (!formObj.getForm().isValid()) { - showResult('请正确填写表单各值'); - return false; - }*/ - if(getBoolValueFromJs('sstsConfig.useRecordHospitalNumAllowBlank',true) == false && top.Ext.getCmp('hospitalNum').getValue() == ''){ - btObj.enable(); - top.Ext.getCmp('hospitalNum').focus(); - showResult('住院号不能为空'); - return false; - } - if(getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank',false) == false && top.Ext.getCmp('washHandNurse').getValue() == ''){ - btObj.enable(); - top.Ext.getCmp('washHandNurse').focus(); - showResult('洗手护士不能为空'); - return false; - } - if(getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank',false) == false && top.Ext.getCmp('circuitNurse').getValue() == ''){ - btObj.enable(); - top.Ext.getCmp('circuitNurse').focus(); - showResult(circuitNurseLabelName + '不能为空'); - return false; - } - if(useRecordOperationRoomAllowBlank == false && top.Ext.getCmp('operationRoom').getValue() == ''){ - btObj.enable(); - top.Ext.getCmp('operationRoom').focus(); - showResult('手术间不能为空'); - return false; - } - if(!sstsConfig.noInputTreatmentNumOrHospitalNum && top.Ext.getCmp('treatmentNum').getValue() == '' && top.Ext.getCmp('hospitalNum').getValue() == '' && top.Ext.getCmp('patientName').getValue() == ''){ - btObj.enable(); - showResult('请输入诊疗号或者住院号或者病人姓名'); - return false; - } + if (sstsConfig.notAllowBlankFieldsOnUseRecordPage && typeof sstsConfig.notAllowBlankFieldsOnUseRecordPage == 'object') { + if (sstsConfig.noInputTreatmentNumOrHospitalNum) { + if (!hospitalNumAllowBlank && top.Ext.getCmp('hospitalNum').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('hospitalNum').focus(); + showResult(hospitalNumName + '不能为空'); + return result; + } + if (!treatmentNumAllowBlank && top.Ext.getCmp('treatmentNum').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('treatmentNum').focus(); + showResult(treatmentNumName + '不能为空'); + return result; + } + if (!patientNameAllowBlank && top.Ext.getCmp('patientName').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('patientName').focus(); + showResult(patientNameSet + '不能为空'); + return result; + } + } else { + if (!hospitalNumAllowBlank || !treatmentNumAllowBlank || !patientNameAllowBlank) { + if (!hospitalNumAllowBlank && top.Ext.getCmp('hospitalNum').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('hospitalNum').focus(); + showResult(hospitalNumName + '不能为空'); + return result; + } + if (!treatmentNumAllowBlank && top.Ext.getCmp('treatmentNum').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('treatmentNum').focus(); + showResult(treatmentNumName + '不能为空'); + return result; + } + if (!patientNameAllowBlank && top.Ext.getCmp('patientName').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('patientName').focus(); + showResult(patientNameSet + '不能为空'); + return result; + } + } else { + if (top.Ext.getCmp('treatmentNum').getValue() == '' && top.Ext.getCmp('hospitalNum').getValue() == '' && top.Ext.getCmp('patientName').getValue() == '') { + btObj.enable(); + showResult('请输入' + treatmentNumName + '或者' + hospitalNumName + '或者' + patientNameSet); + return result; + } + } + } + if (!washHandNurseAllowBlank && top.Ext.getCmp('washHandNurse').getValue() == '') { + btObj.enable(); + top.Ext.getCmp('washHandNurse').focus(); + showResult(washHandNurseName + '不能为空'); + return result; + } + if(!washHandNurseAllowBlank && top.Ext.getCmp('washHandNurse').getValue() == ''){ + btObj.enable(); + top.Ext.getCmp('washHandNurse').focus(); + showResult('洗手护士不能为空'); + return false; + } + if(!circuitNurseAllowBlank && top.Ext.getCmp('circuitNurse').getValue() == ''){ + btObj.enable(); + top.Ext.getCmp('circuitNurse').focus(); + showResult(circuitNurseLabelName + '不能为空'); + return false; + } + if(!operationRoomAllowBlank && top.Ext.getCmp('operationRoom').getValue() == ''){ + btObj.enable(); + top.Ext.getCmp('operationRoom').focus(); + showResult('手术间不能为空'); + return false; + } + }else { + if (!sstsConfig.noInputTreatmentNumOrHospitalNum && top.Ext.getCmp('treatmentNum').getValue() == '' && top.Ext.getCmp('hospitalNum').getValue() == '' && top.Ext.getCmp('patientName').getValue() == '') { + btObj.enable(); + showResult('请输入诊疗号或者住院号或者病人姓名'); + return result; + } + } // 获取扫描的物品所有条码 var barcodes = getTousseGridData(); if (barcodes != "") { @@ -609,7 +680,6 @@ */ function addAndEditUseRecord(id, status) { currentUseRecordId = id; - useRecordOperationRoomAllowBlank = getBoolValueFromJs('sstsConfig.useRecordOperationRoomAllowBlank', true); useItemsStore.removeAll(); useAmount = 0; var tbar; @@ -962,7 +1032,7 @@ triggerAction: 'all', hideTrigger: true, typeAhead: false, - allowBlank: getBoolValueFromJs('sstsConfig.useRecordWashHandNurseAllowBlank', false), + allowBlank: washHandNurseAllowBlank, anchor: '96%', listeners: { render: function (c) { @@ -1022,7 +1092,7 @@ triggerAction: 'all', hideTrigger: true, typeAhead: false, - allowBlank: getBoolValueFromJs('sstsConfig.useRecordCircuitNurseAllowBlank', false), + allowBlank: circuitNurseAllowBlank, anchor: '96%', listeners: { render: function (c) { @@ -1090,7 +1160,7 @@ name: 'operationRoom', maxLength: 10, maxLengthText: '长度超过限制，不能保存！', - allowBlank: useRecordOperationRoomAllowBlank, + allowBlank: operationRoomAllowBlank, anchor: '96%', listeners: { render: function (c) { Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js =================================================================== diff -u -r31651 -r33614 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js (.../instrumentRoomGoodsManagement.js) (revision 31651) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js (.../instrumentRoomGoodsManagement.js) (revision 33614) @@ -35,7 +35,6 @@ function editOperationReservation(id,committedStatus) { - var useRecordOperationRoomAllowBlank = getBoolValueFromJs('sstsConfig.useRecordOperationRoomAllowBlank',true); var handleDepartStore = new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/systemmanage/getCssdsByApplyDepartAndType.do',