Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r33435 -r33814 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 33435) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 33814) @@ -848,7 +848,7 @@ },{ dataIndex : 'showCameraPhoto',hidden : true },{ - header:"物品", dataIndex:'name', xtype:'treecolumn',flex:1, sortable:false, renderer:showTousseInfoDiv + header:"物品", dataIndex:'name', xtype:'treecolumn',width: (top.screen.width > 1280 ? 210 : 150), sortable:false, renderer:showTousseInfoDiv },{ //因为一次性物品不会出现在左边的grid，但是别删掉，隐藏就好（有用处） header:"包装规格", dataIndex:'packageSpec', width:65 * fontSizeScale, hidden:(true), menuDisabled:true },{ @@ -1024,6 +1024,12 @@ header:"单价",dataIndex:'price',width:48 * fontSizeScale,sortable:false,hidden:sstsConfig.hideToussePriceColumn,align:'right',renderer:formartNumber },{ header:"小计",dataIndex:'totalPrice',id:'rowTotalPrice',hidden:sstsConfig.hideToussePriceColumn,width:48 * fontSizeScale,align:'right',sortable:false,renderer:formartNumber + },{ + header:"物品申领备注",dataIndex:'remarkOfApplyGoods',hidden:!sstsConfig.enableApplyGoodsRemarkFunction,width:260 * fontSizeScale,align:'left',sortable:false, + editor:{ + xtype:'textfield', + maxLength:20 + } }]; //是否需要隐藏右边grid的包装规格 @@ -1243,6 +1249,12 @@ header : "小计",dataIndex : 'totalPrice',id:'rowTotalPrice2',width : 56 * fontSizeScale,hidden : hiddenTotalPrice2,align:'right',sortable: false,renderer:formartNumber },{ header : "库存",dataIndex : 'storage',width : 56 * fontSizeScale,align:'right',hidden: hiddenStorage2,sortable: false + },{ + header:"物品申领备注",dataIndex:'remarkOfApplyGoods',hidden:!sstsConfig.enableApplyGoodsRemarkFunction,width:260 * fontSizeScale,align:'left',sortable:false, + editor:{ + xtype:'textfield', + maxLength:20 + } }]; var currentRecord; top.Ext4.define('applicationTreeGrid', { @@ -1909,13 +1921,14 @@ hidden: formType !== '一次性物品申请单' || !sstsConfig.showDisposableGoodTotalAmount, value: '' }); - + + var goodsTreeGridsWidth = (formType == comboApplicationForm || tousseApplicationFormGridSplit) ? (configWinWidth/2 + 10) : (configWinWidth - 30); + goodsTreeGrids.push({ xtype : 'tree-grid', id : 'diposableTreeGrid', columns : tousseColumnArr2, -// width : ((formType == comboApplicationForm || tousseApplicationFormGridSplit) ? (!sstsConfig.hideDisposablePriceColumn && !tousseApplicationFormGridSplit ? configWinWidth/2 + 60 : configWinWidth/2 + 10) : (configWinWidth - 30)), - width : (formType == comboApplicationForm || tousseApplicationFormGridSplit) ? (configWinWidth/2 + 10) : (configWinWidth - 30), + width : goodsTreeGridsWidth, flex : 1, height : configWinHeight - 230, store : rightTemplateStore Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/remark.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r33792 -r33814 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 33792) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 33814) @@ -444,9 +444,14 @@ // 高亮层不锁定 function lockout(e) { e.stopPropagation(); } // 通用的弹出层 -function alertDiv(alertWord, hideCloseButton, showOtherButton) { +function alertDiv(alertWord, titleWord, hideCloseButton, showOtherButton) { lock = true; document.getElementById("showWord").innerHTML = alertWord; + if (titleWord && titleWord !== '') { + document.getElementById("showTitleWord").innerHTML = titleWord; + } else { + document.getElementById("showTitleWord").innerHTML = '提示信息'; + } if (typeof (hideCloseButton) != 'undefined' && hideCloseButton) { $('#idBoxClose').hide(); } else { @@ -2625,6 +2630,11 @@ }); } +//ZJYY-95:显示物品申领备注 +function alertApplyGoodsRemark(remark) { + alertDiv(remark, '物品申领备注信息'); +} + // 丢失报损界面获取相应的数量 function getTousseItemRecyclingError(row) { return $('#recyclingError' + row).val(); @@ -3878,6 +3888,7 @@ var packed = toussItem.packed || false; var tousseRemark = isUndefinedOrNullOrEmpty(toussItem.tousseRemark) ? '' : toussItem.tousseRemark; var urgentLevel = toussItem.urgentLevel ? toussItem.urgentLevel : ""; + var remarkOfApplyGoods = toussItem.remarkOfApplyGoods || ''; var errorDamageQmKey = toussItem.errorDamageQmKey ? toussItem.errorDamageQmKey : ""; //器械包实例或者标识牌实例条码 var barcode = toussItem.barcode ? toussItem.barcode : ""; @@ -3982,6 +3993,9 @@ if (sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule) { urgentAmountElement += '
'; } + if (sstsConfig.enableApplyGoodsRemarkFunction && remarkOfApplyGoods !== '') { + urgentAmountElement += '
'; + } urgentAmountElement += '
' + msg + '
'; } else { var bgMsg = "background-image:url(unUrgentBg.png);"; @@ -3997,6 +4011,9 @@ if (sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule) { urgentAmountElement += '
'; } + if (sstsConfig.enableApplyGoodsRemarkFunction && remarkOfApplyGoods !== '') { + urgentAmountElement += '
'; + } urgentAmountElement += '
' + msg + '
'; } @@ -4920,7 +4937,7 @@ if (jsonStr == '') { return; } var jSONe = JSON.parse(jsonStr); //console.log(jSONe); return - alertDiv("保存中,请稍候......", true); + alertDiv("保存中,请稍候......", '', true); if (IntheBoxState == true) { jSONe.tally = true; } else { @@ -5012,7 +5029,7 @@ } else { setTimeout("closeDiv()", 1200); } - alertDiv(result.message, true); + alertDiv(result.message, '', true); var voluntarilyUrgentItems = result.voluntarilyUrgentItems; var voluntarilyUrgentItemsString = ''; @@ -5164,7 +5181,7 @@ } var jsonStr = getJsonParams(confirmation, isConfirm, basketSize); if (jsonStr == '') { return; } - alertDiv("保存中,请稍候......", true); + alertDiv("保存中,请稍候......", '', true); var jSONe = JSON.parse(jsonStr) if (IntheBoxState == true) { jSONe.tally = true; @@ -6477,7 +6494,6 @@ var timeStr = new Date().getTime(); errorDamageQmKey = item.tousseDefinitionId + "_" + timeStr; } - var circuitNurse = item.circuitNurse || ''; var operationRoom = item.operationRoom || ''; var toussItem = { @@ -6501,6 +6517,7 @@ spelling: item.spelling, circuitNurse: circuitNurse, operationRoom: operationRoom, + remarkOfApplyGoods: item.remarkOfApplyGoods, packed: item.packed }; addToussItem(toussItem, false); @@ -6756,7 +6773,6 @@ } }) } - // 根据回收记录id加载回收记录的数据 function loadRecyclingRecordById(id) { DWREngine.setAsync(false); Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js =================================================================== diff -u -r33792 -r33814 --- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js (.../config.js) (revision 33792) +++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js (.../config.js) (revision 33814) @@ -228,6 +228,8 @@ displayOfOperatingRoomAndPatientInformationOnThePrepareRecycleScreenInPDA:true, //外来器械包普通入筐时显示大小属性 displayTheSizeAttributeOfTheForeignTousseWhenNormalInfoBasket:true, + //启用物品申领备注功能 + enableApplyGoodsRemarkFunction:true, //启用待回收列表的表格列自定义 enableTableColumnCustomizationForTheWaitRecycleList :["科室","手术间","患者","住院号","物品清单","包数","申请人","最后修改时间"], //启用历史回收记录列表的表格列自定义 Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r33787 -r33814 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 33787) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 33814) @@ -766,13 +766,15 @@ if (delNode != null) { var amount = delNode.get("amount"); var pNode = delNode.parentNode; - var t_amount = pNode.get("amount"); - var t_unPackingAmount = pNode.get("unPackingAmount"); - if (t_amount == amount) { - pNode.remove(); - } else { - pNode.set("amount", t_amount - amount); - pNode.set('unPackingAmount', t_unPackingAmount ? (t_unPackingAmount - amount) : (t_amount - amount)); + if (pNode) { + var t_amount = pNode.get("amount"); + var t_unPackingAmount = pNode.get("unPackingAmount"); + if (t_amount == amount) { + pNode.remove(); + } else { + pNode.set("amount", t_amount - amount); + pNode.set('unPackingAmount', t_unPackingAmount ? (t_unPackingAmount - amount) : (t_amount - amount)); + } } } } @@ -883,6 +885,8 @@ { name: 'maxAmount' }, { name: 'urgentLevelObj' }, { name: 'colorCode' }, + { name: 'remarkOfApplyGoods' }, + { name: 'haveRemarkOfApplyGoods' }, { name: 'classifiedItemAmountInfo' }, { name: 'patient' }, { name: 'needInspectMaterials' }, @@ -917,6 +921,12 @@ if (record.get('replenishMaterils')) { showName = '' + showName + ''; } + if (sstsConfig.enableApplyGoodsRemarkFunction && record.get('remarkOfApplyGoods') && record.get('remarkOfApplyGoods') !== '') { + showName = '' + showName; + } + if (sstsConfig.enableApplyGoodsRemarkFunction && !record.get('leaf') && record.get('haveRemarkOfApplyGoods')) { + showName = '' + showName; + } //根据器械包大小物品名称显示不同颜色 if (record.get('leaf') && sstsConfig.tousseSizeColor) { if (record.get("packageSize") == "超大包") { @@ -3100,29 +3110,41 @@ if (record) { var errorDamageRemarkInfo = ''; var errorDamageRemarkId = ''; + var remarkOfApplyGoodsInfo = ''; if (record.childNodes.length > 0) { var children = record.childNodes; for (var i = 0; i < children.length; i++) { + var remarkOfApplyGoods = children[i].data.remarkOfApplyGoods || ''; if (children[i].raw.errorDamageRemarkInfo !== '' && (children[i].data.damages.length > 0 || children[i].data.errors.length > 0)) { errorDamageRemarkInfo = children[i].raw.errorDamageRemarkInfo; errorDamageRemarkId = children[i].raw.errorDamageRemarkId; } + if (sstsConfig.enableApplyGoodsRemarkFunction && remarkOfApplyGoods !== '') { + remarkOfApplyGoodsInfo = remarkOfApplyGoods; + } } } else { if (record.raw.errorDamageRemarkInfo !== '' && (record.data.damages.length > 0 || record.data.errors.length > 0)) { errorDamageRemarkInfo = record.raw.errorDamageRemarkInfo; errorDamageRemarkId = record.raw.errorDamageRemarkId; } + if (sstsConfig.enableApplyGoodsRemarkFunction && record.data.remarkOfApplyGoods !== '') { + remarkOfApplyGoodsInfo = record.data.remarkOfApplyGoods; + } } - if (errorDamageRemarkInfo == '') { - Ext4.getCmp('remark').setValue(''); - Ext4.getCmp('errorDamageRemarkId').setValue(''); - Ext4.getCmp('errorDamageRemarkInfo').setValue(''); - } else { - Ext4.getCmp('remark').setValue(errorDamageRemarkInfo); + var remarks = ''; + if (errorDamageRemarkInfo !== '') { + remarks += errorDamageRemarkInfo; Ext4.getCmp('errorDamageRemarkId').setValue(errorDamageRemarkId); Ext4.getCmp('errorDamageRemarkInfo').setValue(errorDamageRemarkInfo); + } else { + Ext4.getCmp('errorDamageRemarkId').setValue(''); + Ext4.getCmp('errorDamageRemarkInfo').setValue(''); } + if (remarkOfApplyGoodsInfo !== '') { + remarks += remarkOfApplyGoodsInfo; + } + Ext4.getCmp('remark').setValue(remarks); } } @@ -5821,7 +5843,7 @@ }, { xtype: 'hiddenfield', id: 'waitPackingPageSize', - value: sstsConfig.pageSizeOfPackingTaskFolders?parseInt(sstsConfig.pageSizeOfPackingTaskFolders):1000 + value: sstsConfig.pageSizeOfPackingTaskFolders ? parseInt(sstsConfig.pageSizeOfPackingTaskFolders) : 1000 }] }); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r33238 -r33814 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 33238) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 33814) @@ -338,7 +338,7 @@ 关闭