Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r20894 -r21258 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 20894) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 21258) @@ -435,6 +435,7 @@ {name : 'urgentAmount',mapping : 'urgentAmount'}, {name : 'materials',mapping : 'materials'}, {name : 'minApplyAmount',mapping : 'minApplyAmount'}, + {name : 'expressInvoice',mapping : 'expressInvoice'}, //是否快速发货 {name : 'maxApplyAmount',mapping : 'maxApplyAmount'} ]; /** @@ -602,6 +603,7 @@ {name : 'recyclingAmount'}, {name : 'groupNum'}, {name : 'isApplyEntireTousse'}, //是否整包申请 + {name : 'expressInvoice'}, //是否快速发货 {name : 'externalCode'}, //外部编码 {name : 'packageSpec'}, //包装规格 {name : 'price'}, //单价 @@ -810,9 +812,10 @@ * @param maxApplyAmount 最大申请数量(只用于一次性物品) * @param urgentAmount 加急数量 * @param para 追加的参数,是一个对象,里面可以有多种属性,方便以后扩展用(目前只有{behavior:操作类型(添加或者提交或者绑定物品),transferScale:中包装单位装换单位系数,middlePackageUnit:申领单位(原来叫中包装单位)}) + * @param expressInvoice 是否快速发货 */ function addItems(tousseDefinitionID,name,count,diposable,isApplyEntireTousse,price,externalCode, - storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para){ + storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para,expressInvoice){ //1、处理从模板里面找到的(因为前面过滤已经添加的物品,所以剩下的只是模板的物品了) var foundNode = null; var needToCheckNode = {tousseDefinitionID : tousseDefinitionID,name : name,tousseType : tousseType}; @@ -862,6 +865,7 @@ diposable : diposable, tousseType : tousseType, isApplyEntireTousse : isApplyEntireTousse, + expressInvoice : expressInvoice, externalCode : externalCode, storage : storageAmount, unit : unit, @@ -887,6 +891,7 @@ diposable : diposable, tousseType : tousseType, price : price, + expressInvoice : expressInvoice, externalCode : externalCode, storage : storageAmount, //如果存在中包装的单位这里的单位就显示中包装,minUnit缓存原来的最小单位,如果不存在则直接用回原来的单位 @@ -1016,6 +1021,7 @@ var unit = top.Ext4.getCmp('unit').getValue(); var packageSpec = top.Ext4.getCmp('packageSpec').getValue(); var isApplyEntireTousse = top.Ext4.getCmp('isApplyEntireTousse').getValue(); + var expressInvoice = top.Ext4.getCmp('expressInvoice').getValue(); //是否快速发货 var isDiposableGoods = top.Ext4.getCmp('isDiposableGoods').getValue(); @@ -1068,20 +1074,20 @@ if (btn != 'yes') { return false; }else{ - addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para); + addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para,expressInvoice); afterAddItem(true); } }); }else if(!isUndefinedOrNullOrEmpty(maxApplyAmount) && count > maxApplyAmount){ top.Ext4.Msg.alert("提示消息","申请数量大于最大可申请数量"); - addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para); + addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para,expressInvoice); afterAddItem(true); }else{ - addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para); + addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para,expressInvoice); afterAddItem(true); } }else{ - addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para); + addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para,expressInvoice); afterAddItem(false); } } @@ -1218,6 +1224,7 @@ obj.diposable = node.get("diposable"); obj.id = node.get("id"); obj.isApplyEntireTousse = node.get("isApplyEntireTousse"); + obj.expressInvoice = node.get("expressInvoice"); //是否快速发货 obj.leaf = node.get("leaf"); obj.expanded = node.get("expanded"); obj.expandable = node.get("expandable");