Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js =================================================================== diff -u -r26946 -r26948 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js (.../invoiceSignViewVersion2.js) (revision 26946) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js (.../invoiceSignViewVersion2.js) (revision 26948) @@ -50,8 +50,8 @@ return modifyRecord(v,p,record); } }, - {header : "签收时间",width : 120,dataIndex : 'createDate',renderer : myDateFormatByMinute}, - {header : "备注",width : 200,dataIndex : 'remark',id:"remark",menuDisabled : true,sortable: false} + {header : "签收时间",width : 115,dataIndex : 'createDate',renderer : myDateFormatByMinute}, + {header : "备注",width : 230,dataIndex : 'remark',id:"remark",menuDisabled : true,sortable: false} ]; var filters = new Ext.grid.GridFilters({ filters : [ @@ -97,8 +97,8 @@ var invoiceSignDetailStoreCm = new Ext.grid.ColumnModel([ - {header : "物品名称",dataIndex : 'tousseName',width : 180}, - {header : "器械包条码",dataIndex :'barcode',width : 100}, + {header : "物品名称",dataIndex : 'tousseName',width : 190}, + {header : "器械包条码",dataIndex :'barcode',width : 80}, {header : "数量",dataIndex : 'amount',width : 50, menuDisabled: true,id:"amount"} ]); @@ -171,20 +171,20 @@ region: 'west', xtype : 'panel', layout: 'fit', - width: "35%", + width: "42%", autoScroll:true, items:grid },{ region:'center', xtype : 'panel', layout: 'fit', - width: "35%", + width: "33%", items:centerGrid },{ region:'east', xtype : 'panel', layout: 'fit', - width: "30%", + width: "25%", items:rightGrid }], tbar : [{ Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js =================================================================== diff -u -r26940 -r26948 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js (.../invoiceSignFormVersion2.js) (revision 26940) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js (.../invoiceSignFormVersion2.js) (revision 26948) @@ -205,23 +205,23 @@ }else{ showResult(result.msg , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); top.Ext.getCmp('scanText').setValue(""); - top.Ext.getCmp('scanText').focus(); + top.Ext.getCmp('scanText').focus(); - //如果待签收列表里面的已签收数量为0,并且后台返回的待签收数量为0,那就删掉 - if(result.arr[0].waitSignAmount == 0){ - for (var i = 0; i < waitInvoiceSignGoodsStore.getCount(); i++) { - var record = waitInvoiceSignGoodsStore.getAt(i); - var tousseName = record.get('tousseName'); - if(tousseName == result.arr[0].tousseName && record.get('signAmount') == 0){ - waitInvoiceSignGoodsStore.remove(record); - showResult(result.arr[0].tousseName + "包的待签收数量为0,将从待签收列表删除" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); - break; + if(result.arr.length > 0){ + //如果待签收列表里面的已签收数量为0,并且后台返回的待签收数量为0,那就删掉 + if(result.arr[0].waitSignAmount == 0){ + for (var i = 0; i < waitInvoiceSignGoodsStore.getCount(); i++) { + var record = waitInvoiceSignGoodsStore.getAt(i); + var tousseName = record.get('tousseName'); + if(tousseName == result.arr[0].tousseName && record.get('signAmount') == 0){ + waitInvoiceSignGoodsStore.remove(record); + showResult(result.arr[0].tousseName + "包的待签收数量为0,将从待签收列表删除" , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); + break; + } } } - } - //异常物品列表,给提示 - if(result.arr.length > 0){ + //异常物品列表,给提示 var barcodeVal = result.barcode; //判断扫描的条码是否在异常物品列表中是否已存在,存在就不再添加到异常物品列表中 var flag = false;