Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r35020 -r35071 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 35020) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 35071) @@ -21,6 +21,7 @@ var idCardInstanceID = ''; var currentIDCardInfo = null; var idCardTaskNode = null; +var pageSize = 20; var MATERIAL_NAME_IDCARD = "器械包标识牌"; var packingBtnText = "装配并打印标签"; @@ -562,23 +563,23 @@ DWREngine.setAsync(true); var columns = [ - { header: '科室', dataIndex: 'depart', width: 200, sortable: false }, - { header: '供应商', dataIndex: 'supplierName', width: 150, sortable: false }, - { header: '器械包', dataIndex: 'tousseName', width: 200, renderer: filterUnderScoreName, sortable: false }, - { header: '拆包名称', dataIndex: 'splitTousseName', width: 200, sortable: false }, - { header: '数量', dataIndex: 'amount', sortable: false }, - { header: '配包人', dataIndex: 'packer', sortable: false }, - { header: '' + reviewViewText + '人', dataIndex: 'reviewer', width: 100, hidden: sstsConfig.hideReviewerField, sortable: false }, - { header: '包装人', dataIndex: 'wrapper', width: 100, hidden: !sstsConfig.showWrapperField, sortable: false }, - { header: inspectorName, dataIndex: 'inspector', hidden: !sstsConfig.showInspectorField, sortable: false }, - { header: '灭菌人', dataIndex: 'sterileUser', hidden: !sstsConfig.showSterileField, sortable: false }, - { header: '包装类型', dataIndex: 'packageType', sortable: false }, + { header: '科室', dataIndex: 'depart', width: 200, sortable: true }, + { header: '供应商', dataIndex: 'supplierName', width: 150, sortable: true }, + { header: '器械包', dataIndex: 'tousseName', width: 200, renderer: filterUnderScoreName, sortable: true }, + { header: '拆包名称', dataIndex: 'splitTousseName', width: 200, sortable: true }, + { header: '数量', dataIndex: 'amount', sortable: true }, + { header: '配包人', dataIndex: 'packer', sortable: true }, + { header: '' + reviewViewText + '人', dataIndex: 'reviewer', width: 100, hidden: sstsConfig.hideReviewerField, sortable: true }, + { header: '包装人', dataIndex: 'wrapper', width: 100, hidden: !sstsConfig.showWrapperField, sortable: true }, + { header: inspectorName, dataIndex: 'inspector', hidden: !sstsConfig.showInspectorField, sortable: true }, + { header: '灭菌人', dataIndex: 'sterileUser', hidden: !sstsConfig.showSterileField, sortable: true }, + { header: '包装类型', dataIndex: 'packageType', sortable: true }, { header: '装配时间', dataIndex: 'packTimeStr', width: 150 }, { header: '灭菌方式', dataIndex: 'sterilingMode', width: 120, hidden: !(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople), sortable: false }, { header: '已生成代理灭菌单', dataIndex: 'isTran', width: 120, hidden: !(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople), sortable: false }, { header: '材料汇总', dataIndex: 'foreignMaterialsAmount', width: 200, sortable: false }, - { header: '医生', dataIndex: 'doctor', width: 100, sortable: false }, - { header: '患者姓名', dataIndex: 'patient', width: 100, sortable: false } + { header: '医生', dataIndex: 'doctor', width: 100, sortable: true }, + { header: '患者姓名', dataIndex: 'patient', width: 100, sortable: true } ] var packingRecordStore = Ext4.create('Ext4.data.Store', { @@ -682,7 +683,7 @@ } // 从树种查找标识牌的装配任务 - function findIDCardPackingTask(store, idCard,type) { + function findIDCardPackingTask(store, idCard, type) { var existTask = false; var taskList = idCard.packingTaskInfo; var rootNode = store.getRootNode(); @@ -694,10 +695,10 @@ for (var i = 0; i < taskList.length; ++i) { if ((taskList[i].taskId == taskID || taskList[i].id == taskID)) { existTask = true; - if(type == 'scan'){ - node2.set('checked',true); - if(node.childNodes.length == 1){ - node.set('checked',true); + if (type == 'scan') { + node2.set('checked', true); + if (node.childNodes.length == 1) { + node.set('checked', true); } } idCardTaskNode = node2; @@ -761,7 +762,7 @@ barcode = result.idCard.barcode; var tousseName = result.idCard.tousseDefinition.name; var taskList = result.idCard.packingTaskInfo; - var existTask = findIDCardPackingTask(basketStore, result.idCard,type); + var existTask = findIDCardPackingTask(basketStore, result.idCard, type); // 在待装配任务里面选择标识牌的包可以装配 if (!existTask) { existTask = findIDCardPackingTask(waitPackingTaskStore, result.idCard); @@ -3792,18 +3793,18 @@ Ext4.each(selNodes, function (pNode) { var tousseType = pNode.get('tousseType'); var tousseName = pNode.get('tousseName'); - if(sstsConfig.packingView_confirmIndicatorCard && sstsConfig.packingView_confirmIndicatorCard.indexOf(tousseType) >= 0){ - if(arr.indexOf(tousseName) == -1){ + if (sstsConfig.packingView_confirmIndicatorCard && sstsConfig.packingView_confirmIndicatorCard.indexOf(tousseType) >= 0) { + if (arr.indexOf(tousseName) == -1) { arr.push(tousseName); } } }); - if(arr.length == 0){ + if (arr.length == 0) { return false; - }else if(arr.length > 20){ - var newArr = arr.slice(0,20); + } else if (arr.length > 20) { + var newArr = arr.slice(0, 20); return (newArr.join('、')) + '.....'; - }else { + } else { return arr.join('、'); } } @@ -3973,7 +3974,7 @@ if (confirmIndicatorCardWin) { return; } - confirmIndicatorCardWin = top.Ext4.MessageBox.confirm("请确认", "请确认【"+tousseName+"】内已放置指示卡!", + confirmIndicatorCardWin = top.Ext4.MessageBox.confirm("请确认", "请确认【" + tousseName + "】内已放置指示卡!", function (button) { confirmIndicatorCardWin = null; if ("yes" == button) { @@ -4023,30 +4024,30 @@ return; } - if(sstsConfig.allowSelectMultipleIDCardsForBatchPacking && sstsConfig.autoSetIDCardBarcodeForPacking){ + if (sstsConfig.allowSelectMultipleIDCardsForBatchPacking && sstsConfig.autoSetIDCardBarcodeForPacking) { var basketTreeGrid = Ext4.getCmp('basketTreeGrid'); var basketTreeGridCheckedNodes = basketTreeGrid.getView().getChecked(); var idCardTaskNodeArr = []; - if(basketTreeGridCheckedNodes.length > 0){ - for(var i=0;i 0) { + for (var i = 0; i < basketTreeGridCheckedNodes.length; i++) { + if (basketTreeGridCheckedNodes[i].childNodes.length == 0 && basketTreeGridCheckedNodes[i].data.idCardBarcode !== '') { idCardTaskNodeArr.push(basketTreeGridCheckedNodes[i]); } } } var validate = true; - if(idCardTaskNodeArr.length > 0){ - for(var i=0;i 0) { + for (var i = 0; i < idCardTaskNodeArr.length; i++) { if (!(validateSupplement(idCardTaskNodeArr[i]))) { validate = false; } } - if(!validate){ + if (!validate) { onPackingTousseBtnClickComplete(); return; } } - }else { + } else { // 首先处理标识牌的打印 var scanScanIDCardBarcode = Ext4.getCmp('scanIdCardBarcode'); if (scanScanIDCardBarcode.isVisible(true)) { @@ -4077,9 +4078,9 @@ var ai = pNode; var tousseName = ai.get('tousseName') if (!map[tousseName]) { - if(ai.get('idCardBarcode') !== ''){ + if (ai.get('idCardBarcode') !== '') { dest.push(ai); - }else { + } else { dest.push(ai.parentNode); } map[tousseName] = ai; @@ -4114,7 +4115,7 @@ var haveIDCard = pNode.get('haveIDCard'); var idCardBarcode = pNode.get('idCardBarcode'); //跳过有标识牌的器械包 - if(!(sstsConfig.allowSelectMultipleIDCardsForBatchPacking && sstsConfig.autoSetIDCardBarcodeForPacking)){ + if (!(sstsConfig.allowSelectMultipleIDCardsForBatchPacking && sstsConfig.autoSetIDCardBarcodeForPacking)) { if (haveIDCard) { showResult("【" + pTousseName + "】启用了标识牌，需扫描标识牌装配。或者禁用该器械包的标识牌后装配！", null, sstsConfig.messagePauseTimeOnPackingPage); onPackingTousseBtnClickComplete(); @@ -5485,7 +5486,7 @@ lastSelectedTousseName = tousseName; // 显示丢失报损按钮 showOrHideErrorAndDamageBtn(); - if(!(sstsConfig.allowSelectMultipleIDCardsForBatchPacking && sstsConfig.autoSetIDCardBarcodeForPacking)){ + if (!(sstsConfig.allowSelectMultipleIDCardsForBatchPacking && sstsConfig.autoSetIDCardBarcodeForPacking)) { var idCardBarcodeTemp = record.get("idCardBarcode"); if (record.childNodes.length > 0) { idCardBarcodeTemp = record.childNodes[0].get("idCardBarcode"); @@ -6214,6 +6215,30 @@ listStore.loadPage(1); + var pageSizeStore = new Ext4.data.Store({ + fields: [{ name: 'value' }], + data: [{ value: 20 }, { value: 40 }, { value: 60 }, { value: 80 }, { value: 100 }] + }); + + var combo = Ext4.create('Ext4.form.ComboBox', { + name: 'pagesize', + store: pageSizeStore, + valueField: 'value', + displayField: 'value', + editable: false, + emptyText: pageSize, + width: 50 + }); + + combo.on("select", function (comboBox, item) { + var pagingBar = Ext4.getCmp('pagingbar'); + var pageSize = parseInt(comboBox.getValue()) + pagingBar.pageSize = pageSize; + listStore.limit = pageSize; + listStore.pageSize = pageSize; + listStore.loadPage(1); + }) + listGrid = new Ext4.grid.GridPanel({ title: '', columns: columns, @@ -6225,7 +6250,9 @@ dockedItems: [{ xtype: 'pagingtoolbar', store: listStore, // same store GridPanel is using + id: 'pagingbar', dock: 'bottom', + items: ['-', combo], displayInfo: true }], viewConfig: {