Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r36082 -r36100 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36082) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36100) @@ -394,12 +394,10 @@ } if (n.get('errors') == "") { Ext4.getCmp('remark').setValue(''); - Ext4.getCmp('oldRemark').setValue(''); Ext4.getCmp('errorMaterialsTip').setValue(''); Ext4.getCmp('errorRemark').setValue(''); } else { Ext4.getCmp('remark').setValue(''); - Ext4.getCmp('oldRemark').setValue(''); Ext4.getCmp('damageMaterialsTip').setValue(''); Ext4.getCmp('damageRemark').setValue(''); } @@ -873,7 +871,6 @@ Ext4.getCmp('packageType').setValue(packageType); Ext4.getCmp('sterilingType').setValue(sterilingType); Ext4.getCmp('remark').setValue(remark); - Ext4.getCmp('oldRemark').setValue(remark); Ext4.getCmp('errorDamageRemarkInfo').setValue(errorDamageRemark); Ext4.getCmp('errorDamageRemarkId').setValue(errorDamageRemarkId); //根据灭菌程序设置灭菌方式的值 @@ -2497,10 +2494,6 @@ id: 'errorDamageRemarkInfo', name: 'errorDamageRemarkInfo' }, { - xtype: 'hidden', - id: 'oldRemark', - name: 'oldRemark' - }, { columnWidth: .99, xtype: 'textfield', fieldLabel: '丢失材料', @@ -3417,7 +3410,6 @@ remarks += remarkOfApplyGoodsInfo; } Ext4.getCmp('remark').setValue(remarks); - Ext4.getCmp('oldRemark').setValue(remarks); } } @@ -4308,6 +4300,7 @@ basketBarcode = cNode.get("basketBarcode"); var taskId = cNode.get("taskId"); var amount = cNode.get("amount"); + var errorDamageRemarkInfo = cNode.raw.errorDamageRemarkInfo; packageType = cNode.get("packageType"); sterilingType = cNode.get("sterilingMethod"); if (dest.length == 1) { @@ -4380,7 +4373,8 @@ taskIdToAmountMapInfo.push({ taskId: taskId, amount: amount, - errorDamageAmount: errorDamageAmount + errorDamageAmount: errorDamageAmount, + oldRemark:errorDamageRemarkInfo }) parentAmout += parseInt(amount); @@ -4726,7 +4720,6 @@ } } var remark = Ext4.getCmp('remark').getValue(); - var oldRemark = Ext4.getCmp('oldRemark').getValue(); var errorDamageRemarkId = Ext4.getCmp('errorDamageRemarkId').getValue() || ''; var errorDamageRemarkInfo = Ext4.getCmp('errorDamageRemarkInfo').getValue() || ''; var params = { @@ -4757,7 +4750,6 @@ urgentAmount: urgentAmount, tousseWeight: tousseWeight, remark: remark, - oldRemark:oldRemark, errorDamageRemarkInfo: errorDamageRemarkInfo, taskIdToAmountMapInfo: taskIdToAmountMapInfo, noUserFormSterilizationInfo: noUserFormSterilizationInfo,