Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r26469 -r26496 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 26469) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 26496) @@ -118,7 +118,7 @@ var tousseItemObject = result[i]; addItems(tousseItemObject.tousseDefinitionID,tousseItemObject.name,tousseItemObject.amount,tousseItemObject.diposable, tousseItemObject.isApplyEntireTousse,tousseItemObject.originalPrice,tousseItemObject.price,null, - null,tousseItemObject.tousseType,tousseItemObject.materials,tousseItemObject.unit,null,null,null,null,{},tousseItemObject.expressInvoice) + null,tousseItemObject.tousseType,tousseItemObject.materials,tousseItemObject.unit,null,null,null,null,null,null,{},tousseItemObject.expressInvoice) } //设置是否二次发货、申请单id等隐藏域赋值 top.Ext4.getCmp('gatherInvoicePlanIds').setValue(ids); @@ -1343,8 +1343,10 @@ tr += "序号"; tr += "名称"; tr += "数量"; - tr += "加急数量"; - tr += "加急级别"; + if(sstsConfig.enableUrgentFunction){ + tr += "加急数量"; + tr += "加急级别"; + } tr += "规格"; tr += "单位"; tr += ""; @@ -1355,12 +1357,14 @@ tr += "" + ( i + 1 ) + ""; tr += "" + array[i].name + ""; tr += "" + array[i].count + ""; - tr += ""; - tr += isUndefinedOrNullOrEmpty(array[i].urgentAmount) ? 0 : array[i].urgentAmount; - tr += ""; - tr += ""; - tr += isUndefinedOrNullOrEmpty(array[i].urgentLevel) ? "无" : array[i].urgentLevel; - tr += ""; + if(sstsConfig.enableUrgentFunction){ + tr += ""; + tr += isUndefinedOrNullOrEmpty(array[i].urgentAmount) ? 0 : array[i].urgentAmount; + tr += ""; + tr += ""; + tr += isUndefinedOrNullOrEmpty(array[i].urgentLevel) ? "无" : array[i].urgentLevel; + tr += ""; + } tr += "" + array[i].spec + ""; tr += "" + array[i].unit + ""; tr += ""; Index: ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js =================================================================== diff -u -r24150 -r26496 --- ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js (.../goodsBindHandler.js) (revision 24150) +++ ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js (.../goodsBindHandler.js) (revision 26496) @@ -45,7 +45,7 @@ top.Ext4.Msg.alert("提示消息", "申请数量大于最大可申请数量"); } addItems(id, name, count, isDisposableGoods, isApplyEntireTousse, originalPrice, price, externalCode, storageAmount, - tousseType, materials, unit, packageSpec, minApplyAmount, maxApplyAmount, urgentAmount, para, expressInvoice); + tousseType, materials, unit, packageSpec, minApplyAmount, maxApplyAmount, urgentAmount,"","", para, expressInvoice); }); return true; }