Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r32499 -r32502 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 32499) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 32502) @@ -1236,17 +1236,18 @@ type : '普通装配' },success : function(response, options) { var result = Ext4.decode(response.responseText); + var data = result.data[taskGroup]; if(result.success){ - var jobType_pack_name = result.data.operator || ''; - var jobType_pack_code = result.data.operatorCode || ''; - var jobType_review_name = result.data.reviewer || ''; - var jobType_review_code = result.data.reviewerCode || ''; - var jobType_sterile_name = result.data.sterilizationUser || ''; - var jobType_sterile_code = result.data.sterilizationUserCode || ''; - var jobType_inspector_name = result.data.inspector || ''; - var jobType_inspector_code = result.data.inspectorCode || ''; - var jobType_wrapper_name = result.data.wrapper || ''; - var jobType_wrapperCode_code = result.data.wrapperCode || ''; + var jobType_pack_name = data.operator || ''; + var jobType_pack_code = data.operatorCode || ''; + var jobType_review_name = data.reviewer || ''; + var jobType_review_code = data.reviewerCode || ''; + var jobType_sterile_name = data.sterilizationUser || ''; + var jobType_sterile_code = data.sterilizationUserCode || ''; + var jobType_inspector_name = data.inspector || ''; + var jobType_inspector_code = data.inspectorCode || ''; + var jobType_wrapper_name = data.wrapper || ''; + var jobType_wrapperCode_code = data.wrapperCode || ''; //配包人 if(isShowDefaultPackerOfSplitForeignTousse){ Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js =================================================================== diff -u -r32499 -r32502 --- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js (.../comboToussePackingView.js) (revision 32499) +++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js (.../comboToussePackingView.js) (revision 32502) @@ -989,7 +989,7 @@ },{ xtype : 'textfield', columnWidth : .33, - labelWidth : 72, + labelWidth : 80, fieldLabel : "配包人条码", name : "packerBarcode", id : "packerBarcode3", @@ -1007,7 +1007,7 @@ xtype : 'textfield', fieldLabel : '配包人', columnWidth : .33, - labelWidth : 70, + labelWidth : 80, maxLength : '16', id : 'operator3', name : 'operator', @@ -1019,7 +1019,7 @@ },{ xtype : 'textfield', columnWidth : .33, - labelWidth : 72, + labelWidth : 80, hidden: sstsConfig.hideReviewerField, fieldLabel : "审核人条码", name : "reviewerBarcode", @@ -1039,7 +1039,7 @@ },{ xtype : 'textfield', columnWidth : .33, - labelWidth : 70, + labelWidth : 80, hidden: sstsConfig.hideReviewerField, margin :'5 0 0 0', fieldLabel : "审核人", @@ -1051,7 +1051,7 @@ },{ xtype : 'textfield', columnWidth : .33, - labelWidth : 70, + labelWidth : 80, hidden : !sstsConfig.showSterileField, fieldLabel : "灭菌人条码", name : "sterileBarcode", @@ -1070,7 +1070,7 @@ },{ xtype : 'textfield', columnWidth : .33, - labelWidth : 70, + labelWidth : 80, hidden : !sstsConfig.showSterileField, fieldLabel : "灭菌人", name : "sterileUser", @@ -1083,7 +1083,7 @@ }, { xtype : "combo", columnWidth : .33, - labelWidth : 70, + labelWidth : 80, fieldLabel : "灭菌程序", valueField : "typeName", displayField : "typeNameAndPurpose", @@ -1100,7 +1100,7 @@ },{ xtype : 'combo', columnWidth : .33, - labelWidth : 70, + labelWidth : 80, hidden : !sstsConfig.showSterilizer, fieldLabel : '灭菌炉', id : 'sterilizer3', @@ -1126,7 +1126,7 @@ },{ xtype : 'numberfield', columnWidth : .33, - labelWidth : 70, + labelWidth : 80, hidden : !sstsConfig.showSterilizer, fieldLabel : '炉次', allowDecimals : false, @@ -1144,7 +1144,7 @@ xtype : 'datefield', fieldLabel : '灭菌日期', componentCls:'formItemMgn', - labelWidth:70, + labelWidth:80, labelAlign:'right', id : 'sterileDate3', margin :'5 0 0 0', @@ -1161,7 +1161,7 @@ },{ xtype : "combo", columnWidth : .33, - labelWidth : 70, + labelWidth : 80, fieldLabel : "科室分组", valueField : 'name', displayField : 'name', @@ -1185,7 +1185,7 @@ },{ xtype : 'combo', columnWidth : .33, - labelWidth : 70, + labelWidth : 80, // hidden : !sstsConfig.showSterilizer, fieldLabel : '科室', id : 'comboToussePacking_orgUnit',