Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r25994 -r26343
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 25994)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 26343)
@@ -832,8 +832,14 @@
function addReturnTousseByInvoicePlan(invoicePlanId){
document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnTousseByInvoicePlan.jsp?invoicePlanId='+invoicePlanId;
}
+//simon-add:查看收费单即打印预览
+function viewBorrowCharge(id){
+ if(id==null){
+ id=0;
+ }
+ printBorrowChargeById(id,1);
+}
-
/**
* 添加物品到申请列表中.
* @param tousseDefinitionID 物品id(器械包或者一次性物品)
@@ -3036,6 +3042,7 @@
var returnGoodsButton = "";
var viewReturnGoodsButton = "";
var invoicePlanType = record.data.type;
+ var lookupCharge = "";
// 未提交或者待发货的单,不显示签收以及查看发货单按钮
if (record.data.committedStatus == '' || deliverStatus == '待发货'){
return "";
@@ -3063,8 +3070,10 @@
viewReturnGoodsButton = "";
}
}
+ if (returnStatusArr[2] == record.data.returnStatus || returnStatusArr[1] == record.data.returnStatus){
+ lookupCharge = "";
+ }
-
var departCoding = $Id('departCoding').value; //用户的当前科室科室编码
var handleDepartCoding = record.data.handleDepartCoding; //处理科室的科室编码
@@ -3073,7 +3082,7 @@
&& (returnStatusArr[0] == record.data.returnStatus || returnStatusArr[1] == record.data.returnStatus)){
returnButton = "";
}
- return inoviceButton+returnButton+returnGoodsButton+viewReturnGoodsButton;
+ return inoviceButton+returnButton+returnGoodsButton+viewReturnGoodsButton+lookupCharge;
}
},
{header : "干预申请数量",width : 120 * fontSizeScale,hidden : !sstsConfig.enableInterfereApplyAmount,renderer: function(v,p,record){
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r26261 -r26343
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 26261)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 26343)
@@ -526,7 +526,11 @@
-
+
+
+
+
+