Index: ssts-web/src/main/webapp/js/extUtils.js =================================================================== diff -u -r21721 -r41197 --- ssts-web/src/main/webapp/js/extUtils.js (.../extUtils.js) (revision 21721) +++ ssts-web/src/main/webapp/js/extUtils.js (.../extUtils.js) (revision 41197) @@ -41,8 +41,13 @@ if(typeof(cmp) == 'undefined'){ continue; } + if(att == 'patientName' || att == 'patientIDCard'){ + var fieldBox = top.Ext.getCmp(att); + if(fieldBox && fieldBox.disabled){ + continue; + } + } obj[att] = cmp.getValue(); - //alert(obj[att]); } return obj; } Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r41118 -r41197 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 41118) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 41197) @@ -26,9 +26,9 @@ var theCurrentFormIsNotClosedWhenSaving = sstsConfig.theCurrentFormIsNotClosedWhenSaving || []; var useRecordAuditMode = sstsConfig.useRecordAuditMode; if (theCurrentFormIsNotClosedWhenSaving.length > 0 && theCurrentFormIsNotClosedWhenSaving.indexOf('useRecord') >= 0) { - if(useRecordAuditMode == 2 || useRecordAuditMode == 3){ + if (useRecordAuditMode == 2 || useRecordAuditMode == 3) { saveIsCloseWin = true; - }else { + } else { saveIsCloseWin = false; } } @@ -133,7 +133,7 @@ doctorAccountDepartAllowBlank = allowBlankObj.doctorAccountDepart; //备注 remarkAllowBlank = allowBlankObj.remark; -}else { +} else { //SZSDSRMYY-124：登记使用记录必须填写手术间 operationRoomAllowBlank = SSTS_UseRecord_OperationRoomAllowBlank } @@ -326,40 +326,40 @@ ]); //GDSFYBJY-17：新增自定义光标焦点跳转 -function customCursorFocusFun(textfieldName){ - if(sstsConfig.enableCustomCursorFocusNavigationFeature && sstsConfig.enableCustomCursorFocusNavigationFeature['useRecord']){ +function customCursorFocusFun(textfieldName) { + if (sstsConfig.enableCustomCursorFocusNavigationFeature && sstsConfig.enableCustomCursorFocusNavigationFeature['useRecord']) { var customCursorFocus = sstsConfig.enableCustomCursorFocusNavigationFeature['useRecord'] || []; - if(textfieldName){ - if(customCursorFocus.indexOf(textfieldName) !== -1){ + if (textfieldName) { + if (customCursorFocus.indexOf(textfieldName) !== -1) { var index = customCursorFocus.indexOf(textfieldName); - if(customCursorFocus[index + 1] == 'scanBarcode'){ + if (customCursorFocus[index + 1] == 'scanBarcode') { top.Ext.getCmp('tempBarcode2').focus(); - }else if(top.Ext.getCmp(customCursorFocus[index + 1])){ + } else if (top.Ext.getCmp(customCursorFocus[index + 1])) { top.Ext.getCmp(customCursorFocus[index + 1]).focus(); } } - }else { - if(top.Ext.getCmp(customCursorFocus[0])){ + } else { + if (top.Ext.getCmp(customCursorFocus[0])) { top.Ext.getCmp(customCursorFocus[0]).focus(); } } - }else { - if(textfieldName == 'hospitalNum' || textfieldName == 'treatmentNum'){ + } else { + if (textfieldName == 'hospitalNum' || textfieldName == 'treatmentNum') { // 如果洗手护士输入框隐藏，则聚焦到巡回护士输入框，否则聚焦到洗手护士输入框 if (sstsConfig.hideWashHandNurseOfUseRecord == true) { top.Ext.getCmp('circuitNurse').focus(); } else { top.Ext.getCmp('washHandNurse').focus(); } - }else if(textfieldName == 'washHandNurse'){ + } else if (textfieldName == 'washHandNurse') { top.Ext.getCmp('circuitNurse').focus(); - }else if(textfieldName == 'circuitNurse'){ + } else if (textfieldName == 'circuitNurse') { top.Ext.getCmp('operationRoom').focus(); top.Ext.getCmp("tempBarcode2").focus(); - }else if(textfieldName == 'operationRoom'){ + } else if (textfieldName == 'operationRoom') { top.Ext.getCmp("hospitalNum").focus(); - }else if(textfieldName == 'circuitNurse'){ + } else if (textfieldName == 'circuitNurse') { top.Ext.getCmp("hospitalNum").focus(); } } @@ -439,17 +439,17 @@ } var settleAccountDeptCodeUseRecord = ''; var settleAccountDeptNameUseRecord = ''; - if(useRecordTiSettlementDepart == '资产归属和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){ - if(goodsInfo.assetsBelongCode && goodsInfo.assetsBelongCode !== ''){ + if (useRecordTiSettlementDepart == '资产归属和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction) { + if (goodsInfo.assetsBelongCode && goodsInfo.assetsBelongCode !== '') { settleAccountDeptNameUseRecord = goodsInfo.assetsBelong; settleAccountDeptCodeUseRecord = goodsInfo.assetsBelongCode; - }else { + } else { if (top.Ext.getCmp('departNameOfpatient')) { settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || ''; settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || ''; } } - }else { + } else { if (top.Ext.getCmp('departNameOfpatient')) { settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || ''; settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || ''; @@ -516,7 +516,7 @@ } //BJDXZLYY-69：质量监测改为Iframe模式 -function openQualityMonitoringWin(responPartName, records){ +function openQualityMonitoringWin(responPartName, records) { var params = { title: '质量监测信息', width: 900, @@ -756,79 +756,81 @@ var dataInfoWin; //GYSDERMYY-24：第三方器械包 -function loadTousseInstanceByBarcode(barcode,tousseName,isThirdPartyTousse){ +function loadTousseInstanceByBarcode(barcode, tousseName, isThirdPartyTousse) { Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/baseData/thirdPartyTousseReceiveRecordController/loadTousseInstanceByBarcode.mhtml', - params: { barcode: barcode, isThirdPartyTousse: isThirdPartyTousse}, + params: { barcode: barcode, isThirdPartyTousse: isThirdPartyTousse }, success: function (response, options) { var result = Ext.decode(response.responseText); - if(result.data){ + if (result.data) { top.Ext.getCmp('tempBarcode2').setValue(""); - if(result.data.length > 0){ - if(result.data.length == 1){ - loadScanGoods(true,result.data[0].barcode); - }else { + if (result.data.length > 0) { + if (result.data.length == 1) { + loadScanGoods(true, result.data[0].barcode); + } else { showMultiDataInfoWin(result.data); } - }else { - if(isThirdPartyTousse == '是'){ - showResult(tousseName + '('+ barcode +')未接收入库，无法使用。'); - }else { - loadScanGoods(true,barcode); + } else { + if (isThirdPartyTousse == '是') { + showResult(tousseName + '(' + barcode + ')未接收入库，无法使用。'); + } else { + loadScanGoods(true, barcode); } } - }else { + } else { showResult(result.message); } } }); } //GYSDERMYY-24：显示多个第三方器械包 -function showMultiDataInfoWin(dataInfoArray){ +function showMultiDataInfoWin(dataInfoArray) { var dataInfoStore = new top.Ext.data.Store({ - data:dataInfoArray, - reader : new top.Ext.data.JsonReader({ - fields : [ - {name: 'barcode'}, - {name: 'thirdPartyBarcode'}, - {name: 'tousseName'} + data: dataInfoArray, + reader: new top.Ext.data.JsonReader({ + fields: [ + { name: 'barcode' }, + { name: 'thirdPartyBarcode' }, + { name: 'tousseName' } ] }) }); var dataInfoGrid = new top.Ext.grid.GridPanel({ - store:dataInfoStore, + store: dataInfoStore, columns: [ - {header: "器械包名称", width: 130, dataIndex: 'tousseName'}, - {header: "条码", width: 80,dataIndex: 'barcode'}, - {header: "第三方条码", width: 80,dataIndex: 'thirdPartyBarcode'}, - {header: "操作", width: 70,dataIndex: 'id',renderer : function(v, p, record){ - var barcode = record.data.barcode; - return "选择"; - }} + { header: "器械包名称", width: 130, dataIndex: 'tousseName' }, + { header: "条码", width: 80, dataIndex: 'barcode' }, + { header: "第三方条码", width: 80, dataIndex: 'thirdPartyBarcode' }, + { + header: "操作", width: 70, dataIndex: 'id', renderer: function (v, p, record) { + var barcode = record.data.barcode; + return "选择"; + } + } ], stripeRows: true, viewConfig: { - forceFit:true + forceFit: true }, - height:200, - width:600 + height: 200, + width: 600 }); dataInfoWin = new top.Ext.Window({ - autoHeight:true, - title : '器械包选择', - width:615, - draggable:true, - modal:true, - closeAction:'close', - items:[dataInfoGrid] - }); - dataInfoWin.show(); + autoHeight: true, + title: '器械包选择', + width: 615, + draggable: true, + modal: true, + closeAction: 'close', + items: [dataInfoGrid] + }); + dataInfoWin.show(); } //GYSDERMYY-24：选择第三方器械包 -function getdataInfo(barcode){ - loadScanGoods(true,barcode); +function getdataInfo(barcode) { + loadScanGoods(true, barcode); dataInfoWin.close(); } @@ -847,7 +849,7 @@ var barcodeArray = barcode.split(","); barcode = barcodeArray[barcodeArray.length - 1]; } - + if (checkBarcodeIsExist(barcode)) { showResult('条码为：' + barcode + '的物品已在当前扫描物品里！'); top.Ext.getCmp('tempBarcode2').setValue(''); @@ -893,17 +895,17 @@ var settleAccountDeptCodeUseRecord = ''; var settleAccountDeptNameUseRecord = ''; - if(useRecordTiSettlementDepart == '资产归属和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction){ - if(goodsInfo.assetsBelongCode && goodsInfo.assetsBelongCode !== ''){ + if (useRecordTiSettlementDepart == '资产归属和病人所在科室' && sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction) { + if (goodsInfo.assetsBelongCode && goodsInfo.assetsBelongCode !== '') { settleAccountDeptNameUseRecord = goodsInfo.assetsBelong; settleAccountDeptCodeUseRecord = goodsInfo.assetsBelongCode; - }else { + } else { if (top.Ext.getCmp('departNameOfpatient')) { settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || ''; settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || ''; } } - }else { + } else { if (top.Ext.getCmp('departNameOfpatient')) { settleAccountDeptNameUseRecord = top.Ext.getCmp('departNameOfpatient').getRawValue() || ''; settleAccountDeptCodeUseRecord = top.Ext.getCmp('departCodeOfpatient').getValue() || ''; @@ -1166,46 +1168,46 @@ } //ZSRY-53:补充额外信息 -function showUrgentLevelInfo(urgentLevelIdForUseRecord,rowIndex){ +function showUrgentLevelInfo(urgentLevelIdForUseRecord, rowIndex) { var urgentLevelRecord = urgentLevelDataMap[urgentLevelIdForUseRecord]; var expectUseTimeDefauleValue = urgentLevelRecord.expectUseTimeDefauleValue; var expectUseTimeOflimitTime = urgentLevelRecord.expectUseTimeOflimitTime; - if(urgentLevelDataMap && urgentLevelRecord){ + if (urgentLevelDataMap && urgentLevelRecord) { var item = useItemsStore.getAt(rowIndex); var urgentAdditionalInfo = {}; - if(item.get('urgentAdditionalInfo')){ + if (item.get('urgentAdditionalInfo')) { urgentAdditionalInfo = item.get('urgentAdditionalInfo'); - }else { + } else { var expectUseTime = ''; - if(urgentLevelRecord.expectUseTimeCheck == '是'){ + if (urgentLevelRecord.expectUseTimeCheck == '是') { var datefieldValue; DWREngine.setAsync(false); ServerTimeTableManager.getServerDateTime('yyyy/MM/dd HH:mm', function (config) { datefieldValue = config; }); DWREngine.setAsync(true); var nowDateStr = new Date(datefieldValue).getTime(); - nowDateStr += expectUseTimeDefauleValue*60*1000; + nowDateStr += expectUseTimeDefauleValue * 60 * 1000; expectUseTime = new Date(nowDateStr).Format('yyyy-MM-dd hh:mm'); } urgentAdditionalInfo = { - urgentLevelId:'', - urgentContact:'', - urgentOperationRoomId:'', - expectUseTime:expectUseTime, - urgentContactInfo:'' + urgentLevelId: '', + urgentContact: '', + urgentOperationRoomId: '', + expectUseTime: expectUseTime, + urgentContactInfo: '' } } operationRoomJsonStore.load(); - var expectUseTimeCheckHidden = (urgentLevelRecord.expectUseTimeCheck == '是')?false:true; - var expectUseTimeNotBlank = (urgentLevelRecord.expectUseTimeNotBlank == '是')?false:true; - var operationRoomCheckHidden = (urgentLevelRecord.operationRoomCheck == '是')?false:true; - var operationRoomNotBlank = (urgentLevelRecord.operationRoomNotBlank == '是')?false:true; - var urgentContactCheckHidden = (urgentLevelRecord.urgentContactCheck == '是')?false:true; - var urgentContactNotBlank = (urgentLevelRecord.urgentContactNotBlank == '是')?false:true; - var urgentContactInfoCheckHidden = (urgentLevelRecord.urgentContactInfoCheck == '是')?false:true; - var urgentContactInfoNotBlank = (urgentLevelRecord.urgentContactInfoNotBlank == '是')?false:true; + var expectUseTimeCheckHidden = (urgentLevelRecord.expectUseTimeCheck == '是') ? false : true; + var expectUseTimeNotBlank = (urgentLevelRecord.expectUseTimeNotBlank == '是') ? false : true; + var operationRoomCheckHidden = (urgentLevelRecord.operationRoomCheck == '是') ? false : true; + var operationRoomNotBlank = (urgentLevelRecord.operationRoomNotBlank == '是') ? false : true; + var urgentContactCheckHidden = (urgentLevelRecord.urgentContactCheck == '是') ? false : true; + var urgentContactNotBlank = (urgentLevelRecord.urgentContactNotBlank == '是') ? false : true; + var urgentContactInfoCheckHidden = (urgentLevelRecord.urgentContactInfoCheck == '是') ? false : true; + var urgentContactInfoNotBlank = (urgentLevelRecord.urgentContactInfoNotBlank == '是') ? false : true; var urgentLevelRecordForm = new top.Ext.FormPanel({ id: 'urgentLevelRecordForm', @@ -1218,22 +1220,22 @@ labelWidth: 120, items: [{ xtype: "fieldset", - title: "【"+urgentLevelRecord.urgentLevel+"】需要补充额外的加急信息，保存后如需修改可在操作列中重新打开", + title: "【" + urgentLevelRecord.urgentLevel + "】需要补充额外的加急信息，保存后如需修改可在操作列中重新打开", layout: 'column', autoHeight: true, - items:[{ - xtype:'hidden', - id:'urgentLevelId', - name:'urgentLevelId' - },{ - xtype:'hidden', - id:'expectUseTimeCheckHidden', - name:'expectUseTimeCheckHidden', - value:expectUseTimeCheckHidden - },{ + items: [{ + xtype: 'hidden', + id: 'urgentLevelId', + name: 'urgentLevelId' + }, { + xtype: 'hidden', + id: 'expectUseTimeCheckHidden', + name: 'expectUseTimeCheckHidden', + value: expectUseTimeCheckHidden + }, { layout: 'form', columnWidth: .5, - hidden:expectUseTimeCheckHidden, + hidden: expectUseTimeCheckHidden, items: [{ xtype: 'datefieldWithMin', fieldLabel: '预计使用时间：日期', @@ -1242,31 +1244,31 @@ altFormats: 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', format: 'Y-m-d', readOnly: true, - allowBlank : expectUseTimeNotBlank, + allowBlank: expectUseTimeNotBlank, anchor: '95%', - showMinutesBox:false, - listeners:{ - select:function(combo, records, index){ - if(expectUseTimeOflimitTime > 0){ - var now = new Date().getTime() + expectUseTimeDefauleValue*60*1000 - expectUseTimeOflimitTime*60*1000; + showMinutesBox: false, + listeners: { + select: function (combo, records, index) { + if (expectUseTimeOflimitTime > 0) { + var now = new Date().getTime() + expectUseTimeDefauleValue * 60 * 1000 - expectUseTimeOflimitTime * 60 * 1000; var expectUseTime2 = top.Ext.getCmp('expectUseTime2').getValue(); - expectUseTime2 = (expectUseTime2 == '')?'00:00':expectUseTime2; + expectUseTime2 = (expectUseTime2 == '') ? '00:00' : expectUseTime2; var day = new Date(combo.getRawValue() + ' ' + expectUseTime2).getTime(); var nowDay = new Date(now).Format('yyyy-MM-dd'); var nowTime = new Date(now).Format('hh:mm'); - if(now > day){ - showResult('预计使用时间不得早于'+ nowTime); + if (now > day) { + showResult('预计使用时间不得早于' + nowTime); top.Ext.getCmp('expectUseTime').setValue(nowDay); top.Ext.getCmp('expectUseTime2').setValue(nowTime); } } } } }] - },{ + }, { layout: 'form', columnWidth: .3, - hidden:expectUseTimeCheckHidden, + hidden: expectUseTimeCheckHidden, labelWidth: 30, items: [{ xtype: 'timefield', @@ -1275,68 +1277,68 @@ fieldLabel: '时间', format: 'H:i', readOnly: true, - allowBlank : false, + allowBlank: false, anchor: '95%', - listeners:{ - select:function(combo, records, index){ - if(expectUseTimeOflimitTime > 0){ - var now = new Date().getTime() + expectUseTimeDefauleValue*60*1000 - expectUseTimeOflimitTime*60*1000; + listeners: { + select: function (combo, records, index) { + if (expectUseTimeOflimitTime > 0) { + var now = new Date().getTime() + expectUseTimeDefauleValue * 60 * 1000 - expectUseTimeOflimitTime * 60 * 1000; var expectUseTime = top.Ext.getCmp('expectUseTime').getRawValue(); var day = new Date(expectUseTime + ' ' + combo.getRawValue()).getTime(); var nowDay = new Date(now).Format('yyyy-MM-dd'); var nowTime = new Date(now).Format('hh:mm'); - if(now > day){ - showResult('预计使用时间不得早于'+ nowTime); + if (now > day) { + showResult('预计使用时间不得早于' + nowTime); top.Ext.getCmp('expectUseTime').setValue(nowDay); top.Ext.getCmp('expectUseTime2').setValue(nowTime); } } } } }] - },{ + }, { layout: 'form', columnWidth: 1, - hidden:operationRoomCheckHidden, + hidden: operationRoomCheckHidden, items: [{ - xtype : 'combo', - id : 'urgentOperationRoomId', - name : 'urgentOperationRoomId', + xtype: 'combo', + id: 'urgentOperationRoomId', + name: 'urgentOperationRoomId', fieldLabel: '加急手术间号', - queryParam : 'spell', - minChars : 0, - valueField : 'id', - displayField : 'operationRoomName', - store : operationRoomJsonStore, - forceSelection : true, - lazyInit : true, - triggerAction : 'all', - typeAhead : false, - allowBlank : operationRoomNotBlank, + queryParam: 'spell', + minChars: 0, + valueField: 'id', + displayField: 'operationRoomName', + store: operationRoomJsonStore, + forceSelection: true, + lazyInit: true, + triggerAction: 'all', + typeAhead: false, + allowBlank: operationRoomNotBlank, anchor: '95%' }] - },{ + }, { layout: 'form', columnWidth: 1, - hidden:urgentContactCheckHidden, + hidden: urgentContactCheckHidden, items: [{ xtype: 'textfield', fieldLabel: '加急联系人', id: 'urgentContact', name: 'urgentContact', - allowBlank : urgentContactNotBlank, + allowBlank: urgentContactNotBlank, anchor: '95%' }] - },{ + }, { layout: 'form', columnWidth: 1, - hidden:urgentContactInfoCheckHidden, + hidden: urgentContactInfoCheckHidden, items: [{ xtype: 'textfield', fieldLabel: '联系方式', id: 'urgentContactInfo', name: 'urgentContactInfo', - allowBlank : urgentContactInfoNotBlank, + allowBlank: urgentContactInfoNotBlank, anchor: '95%' }] }] @@ -1361,7 +1363,7 @@ return false; } var expectUseTimeCheckHidden = top.Ext.getCmp('expectUseTimeCheckHidden').getValue(); - if((expectUseTimeCheckHidden == false || expectUseTimeCheckHidden == 'false') && expectUseTimeOflimitTime == 0){ + if ((expectUseTimeCheckHidden == false || expectUseTimeCheckHidden == 'false') && expectUseTimeOflimitTime == 0) { var datefieldValue; DWREngine.setAsync(false); ServerTimeTableManager.getServerDateTime('yyyy/MM/dd HH:mm', function (config) { @@ -1371,10 +1373,10 @@ var expectUseTime = top.Ext.getCmp('expectUseTime').getRawValue(); var expectUseTime2 = top.Ext.getCmp('expectUseTime2').getRawValue(); expectUseTime = expectUseTime + ' ' + expectUseTime2; - var expectUseTime1 = expectUseTime.replace(/-/g,'/');//兼容IE + var expectUseTime1 = expectUseTime.replace(/-/g, '/');//兼容IE var nowDateStr = new Date(datefieldValue).getTime(); var expectUseTimeStr = new Date(expectUseTime1).getTime(); - if(nowDateStr > expectUseTimeStr){ + if (nowDateStr > expectUseTimeStr) { showResult('预计使用时间不能小于当前时间！'); return false; } @@ -1385,15 +1387,15 @@ var expectUseTime2 = top.Ext.getCmp('expectUseTime2').getRawValue(); expectUseTime = expectUseTime + ' ' + expectUseTime2 var urgentContactInfo = top.Ext.getCmp('urgentContactInfo').getValue(); - useItemsStore.getAt(rowIndex).set('urgentAdditionalInfo',''); + useItemsStore.getAt(rowIndex).set('urgentAdditionalInfo', ''); var urgentAdditionalInfo = { - urgentLevelId:urgentLevelRecord.id || '', - urgentContact:urgentContact || '', - urgentOperationRoomId:urgentOperationRoomId || '', - urgentContactInfo:urgentContactInfo || '', - expectUseTime:expectUseTime || '' + urgentLevelId: urgentLevelRecord.id || '', + urgentContact: urgentContact || '', + urgentOperationRoomId: urgentOperationRoomId || '', + urgentContactInfo: urgentContactInfo || '', + expectUseTime: expectUseTime || '' } - useItemsStore.getAt(rowIndex).set('urgentAdditionalInfo',urgentAdditionalInfo); + useItemsStore.getAt(rowIndex).set('urgentAdditionalInfo', urgentAdditionalInfo); urgentLevelRecordWin.close(); } }, { @@ -1404,10 +1406,10 @@ }] }); - if(urgentAdditionalInfo){ - setTimeout(function(){ + if (urgentAdditionalInfo) { + setTimeout(function () { top.Ext.getCmp('urgentContactInfo').setValue(urgentAdditionalInfo.urgentContactInfo || ''); - if((urgentAdditionalInfo.expectUseTime || '') !== ''){ + if ((urgentAdditionalInfo.expectUseTime || '') !== '') { var expectUseDate = urgentAdditionalInfo.expectUseTime.split(' ')[0]; var expectUseTime = urgentAdditionalInfo.expectUseTime.split(' ')[1]; top.Ext.getCmp('expectUseTime').setValue(expectUseDate); @@ -1416,7 +1418,7 @@ top.Ext.getCmp('urgentContact').setValue(urgentAdditionalInfo.urgentContact || ''); top.Ext.getCmp('urgentOperationRoomId').setValue(urgentAdditionalInfo.urgentOperationRoomId || ''); top.Ext.getCmp('urgentLevelId').setValue(urgentAdditionalInfo.urgentLevelId || ''); - },500) + }, 500) } urgentLevelRecordWin.show(); @@ -1645,7 +1647,7 @@ showResult('请输入' + treatmentNumName + '或者' + hospitalNumName + '或者' + patientNameSet); return result; } - if(!SSTS_UseRecord_OperationRoomAllowBlank){ + if (!SSTS_UseRecord_OperationRoomAllowBlank) { if (top.Ext.getCmp('operationRoom').getValue() == '') { btObj.enable(); top.Ext.getCmp('operationRoom').focus(); @@ -1873,14 +1875,14 @@ callback(btObj, win, id); } else { showResult('保存成功'); - if(saveIsCloseWin){ + if (saveIsCloseWin) { //关闭窗口并刷新列表数据 closeWinAndRefreshGrid(win); originalValues = {}; - }else { + } else { grid.dwrReload(); - setTimeout(function(){ - loadUseRecord(formObj,action.result.id); + setTimeout(function () { + loadUseRecord(formObj, action.result.id); btObj.enable(); }, 1000); } @@ -1903,11 +1905,12 @@ } //GDSRMYY-608：加载表单数据 -function loadUseRecord(formObj,id){ +function loadUseRecord(formObj, id) { formObj.load({ url: WWWROOT + '/disinfectSystem/useRecordAction!loadUseRecord.do', params: { - id: id + id: id, + maskData: true }, method: 'GET', waitMsg: '正在加载数据，请稍候', @@ -1935,7 +1938,7 @@ return false; } }); - }else { + } else { top.Ext.getCmp('departCodeOfpatient').setValue(''); top.Ext.getCmp('departNameOfpatient').setRawValue(''); } @@ -1950,31 +1953,31 @@ 'bedNumber', 'patientIDCard', 'doctorName', 'surgeon', 'operationName', 'specialInfection', 'remark', 'departCodeOfpatient']); setFormItems(useItemsStore); - - if(action.result.data.specialInfectionJson){ + + if (action.result.data.specialInfectionJson) { top.Ext.getCmp('specialInfectionID').setValue(action.result.data.specialInfectionJson.id || ''); top.Ext.getCmp('specialInfection').setValue(action.result.data.specialInfectionJson.name || ''); - if(action.result.data.specialInfectionJson.colorCode){ + if (action.result.data.specialInfectionJson.colorCode) { top.Ext.getCmp('specialInfection').el.dom.style.background = action.result.data.specialInfectionJson.colorCode; } } - + top.Ext.getCmp('patientSerialNumber').focus(action.result.data.patientSerialNumber || ''); - setTimeout(function(){ + setTimeout(function () { // 保存表单上的原始item参数 setOriginalItems(useItemsStore); originalValues = formObj.getForm().getValues(); //NFYY-108:根据不同科室设置默认光标焦点 - if(sstsConfig.departmentModuleDefaultFocusConfiguration && sstsConfig.departmentModuleDefaultFocusConfiguration.length > 0){ + if (sstsConfig.departmentModuleDefaultFocusConfiguration && sstsConfig.departmentModuleDefaultFocusConfiguration.length > 0) { var departmentModuleDefaultFocusConfiguration = sstsConfig.departmentModuleDefaultFocusConfiguration; - for(var i=0;i= 0){ + if (sstsConfig.configureTheOperationInterfaceOfTheThirdPartyInterface && sstsConfig.configureTheOperationInterfaceOfTheThirdPartyInterface.indexOf('uploadTousseInfoOfUseRecord') >= 0) { showUploadButton = true; } var uploadBtn = { @@ -2622,20 +2652,20 @@ Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/useRecordAction!uploadUseRecordTousseInfo.do', - params:{ - useRecordId:id, - hospitalNumber:hospitalNum, - patientName:patientName, - tousseInstanceIds:tousseInstanceIdArr.join(';') + params: { + useRecordId: id, + hospitalNumber: hospitalNum, + patientName: patientName, + tousseInstanceIds: tousseInstanceIdArr.join(';') }, success: function (response, options) { var result = Ext.decode(response.responseText); showResult(result.message); - if(result.success){ + if (result.success) { var tousseInstanceStore = top.Ext.getCmp('tousseInstanceGrid').getStore(); - for(var i=0;i= 0){ + if (tousseInstanceIdArr.indexOf(item.data.id) >= 0) { item.set('uploadInfo', '是') } } @@ -2681,14 +2711,14 @@ } }); useItemsStore.load(); - + if (status == unAudited) {// 未审核 if (!SSTS_UseRecord_Review) { if (useRecordAuditMode == 4) { tbar = [uploadBtn, printBtn, fastRecyclingBtn, saveAndReviewAndConvertBtn, saveBtn, saveAndNewBtn, cancelBtn]; - }else if (useRecordAuditMode == 2) { + } else if (useRecordAuditMode == 2) { tbar = [uploadBtn, printBtn, fastRecyclingBtn, reviewAndConvertBtn, saveBtn, saveAndNewBtn, cancelBtn]; - }else { + } else { tbar = [uploadBtn, printBtn, fastRecyclingBtn, reviewBtn, saveBtn, saveAndNewBtn, cancelBtn]; } } else { @@ -2776,17 +2806,17 @@ listeners: { load: function (thiz, records, options) { specialInfectionStore.removeAll(); - if(options.params.spell !== ''){ + if (options.params.spell !== '') { var name = ''; if (records && records.length > 0) { - for (var i = records.length-1; i >=0; i--) { - if(options.params.spell == records[i].data.name){ + for (var i = records.length - 1; i >= 0; i--) { + if (options.params.spell == records[i].data.name) { name = records[i].data.name; break; } } } - if(name == ''){ + if (name == '') { return; } } @@ -2798,21 +2828,21 @@ { name: 'displayName' }, { name: 'colorCode' } ]); - specialInfectionStore.add(new specialInfectionRecord({ - 'id': '', - 'name': '', - 'barcode': '', - 'colorCode':'', + specialInfectionStore.add(new specialInfectionRecord({ + 'id': '', + 'name': '', + 'barcode': '', + 'colorCode': '', 'displayName': "　" })); - for (var i = records.length-1; i >=0; i--) { + for (var i = records.length - 1; i >= 0; i--) { var recordItem = records[i].data; - specialInfectionStore.add(new specialInfectionRecord({ - 'id': recordItem.id, - 'name': recordItem.name, - 'barcode': recordItem.barcode, - 'colorCode':recordItem.colorCode, - 'displayName': "
"+recordItem.name+"
" + specialInfectionStore.add(new specialInfectionRecord({ + 'id': recordItem.id, + 'name': recordItem.name, + 'barcode': recordItem.barcode, + 'colorCode': recordItem.colorCode, + 'displayName': "
" + recordItem.name + "
" })); } } @@ -2823,22 +2853,22 @@ var expandColoumnsConfigOfUseRecord = sstsConfig.expandColoumnsConfigOfUseRecord || []; var remarkName = '备注'; var showTousseRemark = false; - for(var i=0;i"; return str; } } }, { - header: "植入物使用情况", dataIndex: 'tousseDefinitionName', menuDisabled: true, width: 80, renderer: function (v, p, record) { + header: "植入物使用情况", dataIndex: 'tousseDefinitionName', menuDisabled: true, width: 120, renderer: function (v, p, record) { var tousseType = record.get("tousseType"); var includeImplant = record.get("includeImplant"); var tousseBarcode = record.get("barcode"); @@ -3059,10 +3091,10 @@ var id = record.get('id'); var str = "
"; //ZSRY-53:补充额外信息 - if(sstsConfig.enableUrgentFunction && sstsConfig.recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode && sstsConfig.enableExtendedInformationOfUrgentFunction){ + if (sstsConfig.enableUrgentFunction && sstsConfig.recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode && sstsConfig.enableExtendedInformationOfUrgentFunction) { if (record.data.urgentLevelForUseRecord && record.data.urgentLevelForUseRecord.additionalInfo == '是') { var urgentLevelIdForUseRecord = record.data.urgentLevelForUseRecord.id; - str += ""; + str += ""; } } @@ -3074,18 +3106,18 @@ //如果配置启用使用记录录入丢失报损功能且该包类型为器械包、且是否回收为是、且是否转换申请单为是时,提供丢失和报损按钮 if (sstsConfig.enableUseRecordMaterialErrorDamage && ((record.get("tousseType") == '器械包' && record.get("isRecycling") == '是' && record.get("isConvertApplyGoods") == '是') || record.get("tousseType") == '自定义器械包')) { - var idCardInstanceBarcode = record.get('idCardInstanceBarcode') || ''; - var barcode = record.get('barcode') || ''; - str += ""; - str += ""; + var idCardInstanceBarcode = record.get('idCardInstanceBarcode') || ''; + var barcode = record.get('barcode') || ''; + str += ""; + str += ""; } str += "
"; return str; }, menuDisabled: true, dataIndex: 'button' }, { - header: "回收状态", dataIndex: 'recyclingStatus', width: 50, menuDisabled: true, hidden: sstsConfig.monitorGoodsRecyclingStatusForUseRecord ? false : true + header: "回收状态", dataIndex: 'recyclingStatus', width: 80, menuDisabled: true, hidden: sstsConfig.monitorGoodsRecyclingStatusForUseRecord ? false : true }]); //器械材料 @@ -3105,27 +3137,30 @@ } var toussesPretreatmentBtn = true; - if(sstsConfig.enableToussesPreprocessingFunction){ - if(id && status !== '已申请'){ + if (sstsConfig.enableToussesPreprocessingFunction) { + if (id && status !== '已申请') { toussesPretreatmentBtn = false; - }else if(!id){ + } else if (!id) { toussesPretreatmentBtn = false; } } + var formTitle = '基础数据'; + if(id){ + formTitle ="基础数据"+' '; + } formObj = new top.Ext.FormPanel({ id: 'useRecordForm', frame: true, labelSeparator: '：', bodyStyle: 'padding:5px 5px 0px 5px', labelAlign: 'right', width: formWidth, - // autoHeight : true, autoScroll: true, - labelWidth: 90, - trackResetOnLoad:true, + labelWidth: 100, + trackResetOnLoad: true, items: [{ xtype: "fieldset", - title: "基础数据", + title: formTitle, layout: 'column', autoHeight: true, id: "tops", @@ -3192,19 +3227,19 @@ xtype: 'hidden', name: 'patientSerialNumber', id: 'patientSerialNumber' - },{ - layout : 'form', - columnWidth :.33, + }, { + layout: 'form', + columnWidth: .33, hidden: fromDepartmentUseRecord || !(sstsConfig.enableUseRecordFormExtensionFields && sstsConfig.enableUseRecordFormExtensionFields.contains('病人ID')), - items : [{ - xtype : 'textfield', - fieldLabel : 'ID', - maxLength : '50', - id : 'patientId', - name : 'patientId', - allowBlank : true, - enableKeyEvents : true, - listeners : { + items: [{ + xtype: 'textfield', + fieldLabel: 'ID', + maxLength: '50', + id: 'patientId', + name: 'patientId', + allowBlank: true, + enableKeyEvents: true, + listeners: { render: function (c) { c.getEl().on('keypress', function (e, thiz) { if (e.getKey() == 13) { @@ -3213,10 +3248,10 @@ var jsonStr = "{\"patientNum\":\"" + value + "\",\"numType\":\"patientId\",\"sourcePage\":\"" + sourcePage_useRecord + "\"}"; - if(!isLook){ + if (!isLook) { isLook = true; loadPatientInfoByValAndType(jsonStr); - setTimeout(function(){ + setTimeout(function () { isLook = false; }, 5000); } @@ -3246,7 +3281,7 @@ enableKeyEvents: true, maxLength: 20, maxLengthText: '长度超过限制，不能保存！', - listeners: { + listeners: { render: function (c) { c.getEl().on('keypress', function (e, thiz) { if (e.getKey() == 13) { @@ -3255,10 +3290,10 @@ var jsonStr = "{\"patientNum\":\"" + value + "\",\"numType\":\"" + thiz.id + "\",\"sourcePage\":\"" + sourcePage_useRecord + "\"}"; - if(!isLook){ + if (!isLook) { isLook = true; loadPatientInfoByValAndType(jsonStr); - setTimeout(function(){ + setTimeout(function () { isLook = false; }, 5000); } @@ -3297,10 +3332,10 @@ var jsonStr = "{\"patientNum\":\"" + value + "\",\"numType\":\"" + thiz.id + "\",\"sourcePage\":\"" + sourcePage_useRecord + "\"}"; - if(!isLook){ + if (!isLook) { isLook = true; loadPatientInfoByValAndType(jsonStr); - setTimeout(function(){ + setTimeout(function () { isLook = false; }, 5000); } @@ -3463,6 +3498,7 @@ id: 'patientName', name: 'patientName', anchor: '96%', + disabled: true, allowBlank: patientNameAllowBlank, listeners: { render: function (c) { @@ -3586,9 +3622,9 @@ select: function (combo, record, index) { top.Ext.getCmp('departCodeOfpatient').setValue(record.data.id); }, - blur:function(){ + blur: function () { var departNameOfpatient = top.Ext.getCmp('departNameOfpatient').getRawValue(); - if(departNameOfpatient == ''){ + if (departNameOfpatient == '') { top.Ext.getCmp('departCodeOfpatient').setValue(''); } } @@ -3651,6 +3687,7 @@ allowDecimals: false, allowNegative: false, allowBlank: patientIDCardAllowBlank, + disabled:true, anchor: '96%', listeners: { render: function (c) { @@ -3844,7 +3881,7 @@ }, { layout: 'form', columnWidth: 0.33, - height: 26, + height: 27, items: [{ xtype: 'textfield', fieldLabel: '录入人', @@ -3918,10 +3955,10 @@ columnWidth: .33, hidden: fromDepartmentUseRecord, items: [{ - xtype:'hidden', - id:'specialInfectionID', - name:'specialInfectionID' - },{ + xtype: 'hidden', + id: 'specialInfectionID', + name: 'specialInfectionID' + }, { xtype: 'combo', fieldLabel: specialInfectionName, queryParam: 'spell', @@ -3946,8 +3983,8 @@ var value = top.Ext.getCmp('specialInfection').getRawValue(); Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/baseData/specialInfectionAction!loadScanedSpecialInfection.do', - params:{ - barcode:value + params: { + barcode: value }, success: function (response, options) { var result = Ext.decode(response.responseText); @@ -3977,16 +4014,16 @@ 'blur': function (combo) { var value = top.Ext.getCmp('specialInfection').getRawValue(); var records; - for(var i=0;i= 0){ + if (barcode.indexOf('@@') >= 0) { barcode = value.split('@@')[0]; isThirdPartyTousse = '是'; tousseName = value.split('@@')[1]; } - loadTousseInstanceByBarcode(barcode,tousseName,isThirdPartyTousse); + loadTousseInstanceByBarcode(barcode, tousseName, isThirdPartyTousse); return - }else { + } else { loadScanGoods(true); } } else { @@ -4252,18 +4288,18 @@ } }); } else { - if(sstsConfig.enbaleThirdPartyTousseManagementFunction && barcode !== ''){ + if (sstsConfig.enbaleThirdPartyTousseManagementFunction && barcode !== '') { var isThirdPartyTousse = '否'; var tousseName = ''; var barcode = value; - if(barcode.indexOf('@@') >= 0){ + if (barcode.indexOf('@@') >= 0) { barcode = value.split('@@')[0]; isThirdPartyTousse = '是'; tousseName = value.split('@@')[1]; } - loadTousseInstanceByBarcode(barcode,tousseName,isThirdPartyTousse); + loadTousseInstanceByBarcode(barcode, tousseName, isThirdPartyTousse); return - }else { + } else { loadScanGoods(true); } } @@ -4294,7 +4330,7 @@ hidden: toussesPretreatmentBtn, handler: function () { var records = top.Ext.getCmp('tousseInstanceGrid').getSelectionModel().getSelections(); - if(records.length == 0){ + if (records.length == 0) { showResult('请选择一条记录！'); return } @@ -4354,10 +4390,10 @@ text: "确认", handler: function () { var preprocessingTime = top.Ext.getCmp('preprocessingTime').getRawValue(); - for(var i=0;i 0){ + if (sstsConfig.departmentModuleDefaultFocusConfiguration && sstsConfig.departmentModuleDefaultFocusConfiguration.length > 0) { var departmentModuleDefaultFocusConfiguration = sstsConfig.departmentModuleDefaultFocusConfiguration; - for(var i=0;i + <%@ include file="/common/includeExtJsAndCss.jsp"%> <%@ include file="/common/include_Ext42_Js.jsp"%> <%@ include file="/disinfectsystem/print/print.jsp"%> Index: ssts-web/src/main/webapp/systemmanage/userFormExt.js =================================================================== diff -u -r39771 -r41197 --- ssts-web/src/main/webapp/systemmanage/userFormExt.js (.../userFormExt.js) (revision 39771) +++ ssts-web/src/main/webapp/systemmanage/userFormExt.js (.../userFormExt.js) (revision 41197) @@ -86,6 +86,38 @@ function setIsRepeatLogninId(isRepeat){ isRepeatLogninId = isRepeat; } + +//ZSYY-442:显示敏感字段 +function openEye(id){ + document.getElementById('openEye').style.display = 'inline-block'; + document.getElementById('closeEye').style.display = 'none'; + Ext.getCmp('idCard').enable(); + Ext.getCmp('smsMumber').enable(); + Ext.getCmp('email').enable(); + Ext.Ajax.request({ + url: WWWROOT + '/systemmanage/user/userAction!loadEncryptUserInfo.do?id='+id, + success: function (response, options) { + var result = Ext.decode(response.responseText); + if (result.success) { + var encryptEmail = result.encryptEmail || ''; + var encryptPatientIDCard = result.encryptPatientIDCard || ''; + var encryptSmsMunber = result.encryptSmsMunber || ''; + if(encryptEmail !== ''){ + Ext.getCmp('email').setValue(dencryptText(encryptEmail)); + } + if(encryptPatientIDCard !== ''){ + Ext.getCmp('idCard').setValue(dencryptText(encryptPatientIDCard)); + } + if(encryptSmsMunber !== ''){ + Ext.getCmp('smsMumber').setValue(dencryptText(encryptSmsMunber)); + } + } else { + showResult(result.message); + } + } + }) +} + Ext.onReady(function(){ Ext.QuickTips.init(); var id = getURLParameter('id',''); @@ -98,11 +130,15 @@ msg = getModifyPwdMsg(); } var orgUnitId = getURLParameter('orgUnitId','0'); + var formTitle = '用户管理'; + if(id){ + formTitle ="基础数据"+' '; + } var formObj = new Ext.FormPanel({ labelAlign: 'left', frame:true, labelSeparator:'：', - title: '用户管理', + title: formTitle, bodyStyle:'padding:5px 5px 0px 25px', width: 600, labelWidth:100, @@ -220,6 +256,7 @@ name: 'idCard', id: 'idCard', width: 150, + disabled:true, blankText:'' }] },{ @@ -234,6 +271,7 @@ name: 'smsMumber', id: 'smsMumber', width: 130, + disabled:true, blankText:'' }] }] @@ -249,6 +287,7 @@ name: 'email', id: 'email', width: 150, + disabled:true, blankText:'' }] },{ @@ -475,7 +514,7 @@ } Ext.getCmp('supplierNameBox').hide() formObj.form.load({ - url:WWWROOT+'/systemmanage/user/loadForm.do', + url:WWWROOT+'/systemmanage/user/loadForm.do?maskData=true', method:'GET', waitMsg:'正在加载数据，请稍候', success:function(form,action){ Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp =================================================================== diff -u -r41116 -r41197 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 41116) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 41197) @@ -86,6 +86,7 @@ + @@ -318,6 +319,7 @@ +