Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js =================================================================== diff -u -r27068 -r27484 --- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js (.../comboToussePackingView.js) (revision 27068) +++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js (.../comboToussePackingView.js) (revision 27484) @@ -850,7 +850,7 @@ },{ xtype : 'textfield', columnWidth : .33, - labelWidth : 70, + labelWidth : 72, fieldLabel : "配包人条码", name : "packerBarcode", id : "packerBarcode3", @@ -881,7 +881,7 @@ },{ xtype : 'textfield', columnWidth : .33, - labelWidth : 70, + labelWidth : 72, hidden: sstsConfig.hideReviewerField, fieldLabel : "审核人条码", name : "reviewerBarcode", Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r27183 -r27484 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 27183) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 27484) @@ -652,7 +652,7 @@ },{ xtype : 'textfield', columnWidth : .33, - labelWidth : 70, + labelWidth : 72, fieldLabel : "配包人条码", name : "packerBarcode", id : "packerBarcode2", @@ -683,7 +683,7 @@ },{ xtype : 'textfield', columnWidth : .33, - labelWidth : 70, + labelWidth : 72, hidden: sstsConfig.hideReviewerField, fieldLabel : "审核人条码", name : "reviewerBarcode", @@ -962,14 +962,14 @@ splitForeignTousse_packingTousseBtnClick0(this); } },{ - text : '拍照', + text : '拍摄', hidden : !sstsConfig.showCameraPhoto, handler : function() { openCameraWindow(); } }] }); - + var foreignTousseWin = new top.Ext4.window.Window( { id : 'foreignTousseWin', title : '['+showName + ']拆分', @@ -1005,36 +1005,36 @@ }, { xtype :'button', text : '>>', - minWidth:48, + width:38, handler : function(){ toSplitedGrid(false); } }, { xtype :'button', text : '<<', - minWidth:48, + width:38, handler : function(){ toWaitSplitGrid(false); } }, { xtype :'button', text : '>>>>', - minWidth:48, + width:38, handler : function(){ toSplitedGrid(true); } }, { xtype :'button', text : '<<<<', - minWidth:48, + width:38, handler : function(){ toWaitSplitGrid(true); } },{ xtype :'button', text:'拆分', border:false, - minWidth:48, + width:38, handler : function(){ toSplitTousseGrid(showName); } Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js =================================================================== diff -u -r21572 -r27484 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js (.../interfereForeignTousseApplicationForm.js) (revision 21572) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js (.../interfereForeignTousseApplicationForm.js) (revision 27484) @@ -388,7 +388,7 @@ },{ columnWidth : .33, layout : 'form', - labelWidth : 70, + labelWidth : 72, items : [{ xtype : 'textfield', fieldLabel : "配包人条码", @@ -422,7 +422,7 @@ },{ columnWidth : .33, layout : 'form', - labelWidth : 70, + labelWidth : 72, items : [{ xtype : 'textfield', fieldLabel : "审核人条码", @@ -887,28 +887,28 @@ }, { xtype :'button', text : '>>', - minWidth:48, + width:38, handler : toRightGrid }, { xtype :'button', text : '<<', - minWidth:48, + width:38, handler : toLeftGrid }, { xtype :'button', text : '>>>>', - minWidth:48, + width:38, handler : allToRightGrid }, { xtype :'button', text : '<<<<', - minWidth:48, + width:38, handler : allToLeftGrid },{ xtype :'button', text:'拆分', border:false, - minWidth:48, + width:38, frame : false, handler : createChildPackage Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r27286 -r27484 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 27286) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 27484) @@ -904,17 +904,17 @@ header: '操作', width : 120, align:'center', - sortable: true, + sortable: true, renderer: function(v,p,record,rowIndex, columnIndex, store){ - var str = ''; + var str = '
'; if(record.get('leaf')){ var taskid = record.get('taskId'); var tousseName = record.get('tousseName'); var tousseID = record.get('tousseID'); var status = record.get('status'); if(!SSTS_PackingTask_Delete){ if(taskid != undefined && taskid != null){ - str += ""; + str += ""; } } if(status == '待装配'){ @@ -948,6 +948,7 @@ } } } + str += '
'; return str; } },{