Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r33597 -r33635 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 33597) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 33635) @@ -2180,7 +2180,7 @@ height: sendOutGoodsHeight - 40, columns: [{ header: '单号/物品名称', - width: 250, + width: 220, dataIndex: 'serialNumber', renderer: function (v, p, record) { if (record.leaf == true || record.leaf == 'true') { @@ -2191,15 +2191,22 @@ } }, { header: '物品状态', - width: 70, - dataIndex: 'status' + width: 130, + dataIndex: 'status', + renderer: function (v, p, record) { + if (record.leaf == true || record.leaf == 'true') { + return record.status; + } else { + return record.invoicePlanType; + } + } }, { header: '条码', - width: 110, + width: 90, dataIndex: 'barcode' }, { header: '数量', - width: 60, + width: 50, dataIndex: 'count' }, { header: '申请时间',