Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
===================================================================
diff -u -r18491 -r18561
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js (.../borrowingTousseView.js) (revision 18491)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js (.../borrowingTousseView.js) (revision 18561)
@@ -266,7 +266,7 @@
{header : "科室",width : 100,dataIndex : 'depart'},
{header : "供应室确认状态",width : 100,dataIndex : 'borrowConfirmStatus',hidden : !sstsConfig.isNeedApplyRoomConfirm},
{header : "发货单状态",dataIndex : 'invoiceStatus',hidden : true},
- {header : "操作",width : 220,renderer : function(v, p, record) {
+ {header : "操作",width : 350,renderer : function(v, p, record) {
var invoiceStatus = record.data.invoiceStatus;
var deliverStatus = record.data.deliverStatus;
var returnStatus = record.data.returnStatus;
@@ -297,7 +297,7 @@
+ id + ")\" >";
}
if (!SSTS_borrow_returnAll && deliverStatus === statusArr[2] && (returnStatusArr[0] == returnStatus || returnStatusArr[1] == returnStatus)){
- returnButton = "";
+ returnButton += "";
}
return inoviceButton + returnButton;