Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r30785 -r30798 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 30785) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 30798) @@ -427,7 +427,8 @@ {name: 'tousseName'}, {name: 'reviewer'}, {name: 'supplierName'}, - {name: 'doctor'}, + {name: 'doctor'}, + {name: 'packageType'}, {name: 'foreignMaterialsAmount'}, {name: 'splitTousseName'}, {name: 'amount'} @@ -442,7 +443,8 @@ {name: 'tousseName'}, {name: 'reviewer'}, {name: 'supplierName'}, - {name: 'doctor'}, + {name: 'doctor'}, + {name: 'packageType'}, {name: 'foreignMaterialsAmount'}, {name: 'splitTousseName'}, {name: 'amount'} @@ -462,6 +464,7 @@ {header: '数量', dataIndex: 'amount'}, {header: '配包人', dataIndex: 'packer'}, {header: ''+reviewViewText+'人', dataIndex: 'reviewer',width: 100}, + {header: '包装类型', dataIndex: 'packageType'}, {header: '装配时间', dataIndex: 'packTimeStr',width: 150}, {header: '材料汇总', dataIndex: 'foreignMaterialsAmount',width: 200}, {header: '医生', dataIndex: 'doctor',width: 100}