Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r32746 -r32769 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 32746) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 32769) @@ -391,6 +391,7 @@ {name: 'depart'}, {name: 'packer'}, {name: 'tousseName'}, + {name: 'inspector'}, {name: 'reviewer'}, {name: 'supplierName'}, {name: 'doctor'}, @@ -408,6 +409,9 @@ {name: 'orgUnitName'}, {name: 'depart'}, {name: 'packer'}, + {name: 'inspector'}, + {name: 'wrapper'}, + {name: 'sterileUser'}, {name: 'tousseName'}, {name: 'reviewer'}, {name: 'supplierName'}, @@ -447,6 +451,9 @@ {header: '数量', dataIndex: 'amount'}, {header: '配包人', dataIndex: 'packer'}, {header: ''+reviewViewText+'人', dataIndex: 'reviewer',width: 100,hidden:sstsConfig.hideReviewerField}, + {header: '包装人', dataIndex: 'wrapper',width: 100,hidden:!sstsConfig.showWrapperField}, + {header: inspectorName, dataIndex: 'inspector',hidden:!sstsConfig.showInspectorField}, + {header: '灭菌人', dataIndex: 'sterileUser',hidden:!sstsConfig.showSterileField}, {header: '包装类型', dataIndex: 'packageType'}, {header: '装配时间', dataIndex: 'packTimeStr',width: 150}, {header: '灭菌方式', dataIndex: 'sterilingMode',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)},