Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r31793 -r32746 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 31793) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 32746) @@ -376,13 +376,14 @@ dataIndex : 'department', width : 150 },{ - header : '配包员', + header : '配包人', dataIndex : 'packer', width : 70, sortable : true },{ header : ''+reviewViewText+'人', dataIndex : 'reviewer', + hidden : sstsConfig.hideReviewerField, width : 70, sortable : true },{ Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js =================================================================== diff -u -r32600 -r32746 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js (.../modifyTousseInstances.js) (revision 32600) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js (.../modifyTousseInstances.js) (revision 32746) @@ -1,5 +1,4 @@ var hiddentPacker2 = false; -var hiddentReviewer2 = false; var reviewViewText; if(sstsConfig.nameSchemeOfReviewModule == 2){ @@ -127,7 +126,7 @@ name:'packerCode2' },{ xtype : 'combo', - fieldLabel : '装配人', + fieldLabel : '配包人', id : 'packer2', name : 'packer2', queryParam : 'spell', @@ -179,7 +178,7 @@ },{ columnWidth : .5, layout : 'form', - hidden: hiddentReviewer2, + hidden : sstsConfig.hideReviewerField, items : [{ xtype:'hidden', id:'reviewerCode2', Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js =================================================================== diff -u -r32443 -r32746 --- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js (.../historyPackingView.js) (revision 32443) +++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js (.../historyPackingView.js) (revision 32746) @@ -142,7 +142,7 @@ {header: '拆包名称', dataIndex: 'splitTousseName',width: 200}, {header : "数量",width : 80,dataIndex : 'amount'}, {id:'operationRemark',header : "配包人",width : 100,dataIndex : 'packer'}, - {header: '审核人', dataIndex: 'reviewer',width: 100}, + {header: '审核人', dataIndex: 'reviewer',width: 100,hidden : sstsConfig.hideReviewerField}, {header : "装配时间",width : 150,dataIndex : 'packTime',renderer:myDateFormatBySecond}, {header: '灭菌方式', dataIndex: 'sterilingMode',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)}, {header: '已生成代理灭菌单', dataIndex: 'isTran',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)}, Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r32610 -r32746 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 32610) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 32746) @@ -446,7 +446,7 @@ {header: '拆包名称', dataIndex: 'splitTousseName',width: 200}, {header: '数量', dataIndex: 'amount'}, {header: '配包人', dataIndex: 'packer'}, - {header: ''+reviewViewText+'人', dataIndex: 'reviewer',width: 100}, + {header: ''+reviewViewText+'人', dataIndex: 'reviewer',width: 100,hidden:sstsConfig.hideReviewerField}, {header: '包装类型', dataIndex: 'packageType'}, {header: '装配时间', dataIndex: 'packTimeStr',width: 150}, {header: '灭菌方式', dataIndex: 'sterilingMode',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)}, Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r27689 -r32746 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 27689) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 32746) @@ -973,12 +973,12 @@ columnWidth : .33, layout : 'form', cls:'edit-5char-labelwidth', + hidden : sstsConfig.hideReviewerField, items : [{ xtype : 'textfield', fieldLabel : "审核人条码", name : "reviewerBarcode", id : "reviewerBarcode", - hidden : sstsConfig.hideReviewerField, allowBlank : true, listeners : { specialkey : function(thiz, e){ @@ -999,12 +999,12 @@ columnWidth : .33, layout : 'form', cls:'edit-5char-labelwidth', + hidden : sstsConfig.hideReviewerField, items : [{ xtype : 'textfield', fieldLabel : "审核人", name : "reviewer", id : "reviewer", - hidden : sstsConfig.hideReviewerField, allowBlank : sstsConfig.hideReviewerField, anchor : '100%', value : jobType_review_name,