Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r37361 -r37364 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 37361) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 37364) @@ -600,6 +600,7 @@ Ext4.getCmp('sterilingType').enable(); Ext4.getCmp('packageType').enable(); Ext4.getCmp('remark').enable(); + Ext4.getCmp('useOldRemark').setValue(true); } else { Ext4.getCmp('sterilingType').disable(); Ext4.getCmp('packageType').disable(); @@ -2966,6 +2967,10 @@ triggerAction: 'all', typeAhead: false, allowBlank: true + },{ + xtype:'hidden', + id:'useOldRemark', + name:'useOldRemark' }, { columnWidth: .5, xtype: 'textfield', @@ -5494,6 +5499,14 @@ } par.lastTime = lastTime; } + if(sstsConfig.enablePackingMultipleGoodsWithRemarks){ + var useOldRemark = Ext4.getCmp('useOldRemark').getValue(); + if(useOldRemark == false || useOldRemark == 'false'){ + par.useOldRemark = false; + }else { + par.useOldRemark = true; + } + } Ext4.Ajax.request({ async: false, dataType: "json", @@ -6552,11 +6565,14 @@ if(sstsConfig.enablePackingMultipleGoodsWithRemarks){ if(count == 1){ Ext4.getCmp('remark').enable(); + Ext4.getCmp('useOldRemark').setValue(true); }else { if(remarkLength > 0){ Ext4.getCmp('remark').disable(); + Ext4.getCmp('useOldRemark').setValue(false); }else { Ext4.getCmp('remark').enable(); + Ext4.getCmp('useOldRemark').setValue(true); } } } @@ -6569,11 +6585,14 @@ if(sstsConfig.enablePackingMultipleGoodsWithRemarks){ if(count == 1){ Ext4.getCmp('remark').disable(); + Ext4.getCmp('useOldRemark').setValue(true); }else { if(remarkLength > 0){ Ext4.getCmp('remark').disable(); + Ext4.getCmp('useOldRemark').setValue(false); }else { Ext4.getCmp('remark').enable(); + Ext4.getCmp('useOldRemark').setValue(true); } } } @@ -6582,6 +6601,7 @@ Ext4.getCmp('sterilingType').enable(); Ext4.getCmp('packageType').enable(); Ext4.getCmp('remark').enable(); + Ext4.getCmp('useOldRemark').setValue(true); } }