Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js =================================================================== diff -u -r33275 -r33277 --- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js (.../printConfig.js) (revision 33275) +++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js (.../printConfig.js) (revision 33277) @@ -260,7 +260,7 @@ // 标题 {label : "珠江医院物品出库单", dataIndex : '', fontSize : 15, position : ["5","35%","99%",5]}, {label : "科室:", dataIndex : 'depart', fontSize : 11, position : ["30","2%","90%",5]}, - {label : "记账日期:", dataIndex : 'sendTime', fontSize : 11, position : ["30","25%","90%",5]}, + {label : "记账日期:", dataIndex : 'sendTime', fontSize : 11, position : ["30","23%","90%",5]}, {label : "出库单号:", dataIndex : 'serialNumber2', fontSize : 11, position : ["30","50%","90%",5]}, {label : "申请单号:", dataIndex : 'invoiceSerialNumbers', fontSize : 11, position : ["30","68%","90%",5]}, {label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["50","2%","90%",5]}, Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r33275 -r33277 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 33275) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 33277) @@ -615,7 +615,7 @@ } }) }, - {header : "申请单号",dataIndex : 'invoicePlanSerialNumber',width : 50,menuDisabled : true}, + {header : "申请单号",dataIndex : 'invoicePlanSerialNumber',width : 50,menuDisabled : true,sortable:false}, {header : "发货类型",dataIndex : 'type',width : 40,menuDisabled : true} ]); @@ -2670,7 +2670,7 @@ {header : "已打印",width : 50,dataIndex : 'isPrint',renderer : renderPrintColor,hidden:isPrintHidden}, {header : "发货单号集合码",width : 140,renderer : renderSerialNumbers,hidden:invoiceSerialNumberSetBarcodeHidden}, {header : "申请科室",width : 120,dataIndex : 'depart',hidden:departHidden}, - {header : "申请单号",width : 120,dataIndex : 'invoicePlanSerialNumber',hidden:departHidden,renderer : function(v, p, record){ + {header : "申请单号",width : 120,dataIndex : 'invoicePlanSerialNumber',hidden:departHidden,sortable:false,renderer : function(v, p, record){ return record.json.invoicePlan.serialNumber; }}, {header : "发货时间",width : 120,dataIndex : 'sendTime',renderer : myDateFormatByMinute,hidden:sendTimeHidden},