Index: ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js
===================================================================
diff -u -r28758 -r28761
--- ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js	(.../supplyRoomsUnfinishedWork.js)	(revision 28758)
+++ ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js	(.../supplyRoomsUnfinishedWork.js)	(revision 28761)
@@ -578,28 +578,28 @@
 	    //	    待清洗篮筐信息
 	    var pendingBasketColumns = new Ext.grid.ColumnModel([
 			{header : "篮筐条码",width : 200,dataIndex : 'containerBarcode'},
-			{header : "名称",width : 120,dataIndex : 'containerName'},
+			{header : "名称",width : 200,dataIndex : 'containerName'},
 			{header : "待清洗物品数量",width : 120,dataIndex : 'unWashAmount'},
 			{header : "回收时间",width : 130,dataIndex : 'recyclingTime',renderer : renderRecyclingTime}
 	    ]);
 	    //	    装配记录信息
 	    var packingSm = new Ext.grid.CheckboxSelectionModel();
 	    var packingColumns = new Ext.grid.ColumnModel([
 	        packingSm,
-			{header : "物品名称",width : 250,dataIndex : 'tousseDefinition.name'},
-			{header : "篮筐名称",width : 120,dataIndex : 'recyclingBasketName'},
+			{header : "物品名称",width : 200,dataIndex : 'tousseDefinition.name'},
+			{header : "篮筐名称",width : 150,dataIndex : 'recyclingBasketName'},
 			{header : "篮筐条码",width : 120,dataIndex : 'basketBarcode'},
 			{header : "任务组",width : 95,dataIndex : 'tousseDefinition.taskGroup'},
-			{header : "数量",width : 80,dataIndex : 'amount'},
+			{header : "数量",width : 60,dataIndex : 'amount'},
 			{header : "待装配数量",width : 80,dataIndex : 'unPackAmount'},
-			{header : "开始时间",width : 150,dataIndex : 'startTime', renderer : myDateFormatByMinute},
+			{header : "开始时间",width : 120,dataIndex : 'startTime', renderer : myDateFormatByMinute},
 			{header : "状态",width : 60,dataIndex : 'status'}
 	    ]);
 	    //审核信息
 	    var reviewSm = new Ext.grid.CheckboxSelectionModel();
 	    var reviewColumns = new Ext.grid.ColumnModel([
 	         reviewSm,
-			 {header : "物品名称",width : 130,dataIndex : 'tousseName',sortable:false},
+			 {header : "物品名称",width : 160,dataIndex : 'tousseName',sortable:false},
 			 {header : "任务组",width : 95,dataIndex : 'tousseDefinition.taskGroup',sortable:false},
 		     {header : "条码",width : 65,dataIndex : 'barcode',sortable:false},
 		     {header : "装配人",width : 50,dataIndex : 'operator',sortable:false},
@@ -627,13 +627,13 @@
 	    var invoicePlanColumns = new Ext.grid.ColumnModel([
 			invoicePlanSm,
 			{header : "invoicePlanId",dataIndex : 'invoicePlanId',hidden : true},
-			{header : "器械包名称",width : 200,dataIndex : 'tousseName'}, 
-			{header : "数量",width : 80,dataIndex : 'applicationAmount'},
-			{header : "申请科室",width : 150,dataIndex : 'depart'},
+			{header : "器械包名称",width : 180,dataIndex : 'tousseName'}, 
+			{header : "数量",width : 50,dataIndex : 'applicationAmount'},
+			{header : "申请科室",width : 145,dataIndex : 'depart'},
+			{header : "申请时间",width : 130,dataIndex : 'applicationTime',sortable:true},
+			{header : "申请单编号",width : 80,dataIndex : 'serialNumberOfInovicePlan'},
 			{header : "申请单类型",width : 120,dataIndex : 'invoicePlanType'},
-			{header : "申请单编号",width : 120,dataIndex : 'serialNumberOfInovicePlan'},
-			{header : "发货状态",width : 120,dataIndex : 'deliverStatus'},
-			{header : "申请时间",width : 130,dataIndex : 'applicationTime',sortable:true}
+			{header : "发货状态",width : 80,dataIndex : 'deliverStatus'}
 	    ]);
 	    
 	    applicationStore = new Ext.data.Store({
Index: ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js
===================================================================
diff -u -r28759 -r28761
--- ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js	(.../terminateInvoicePlan.js)	(revision 28759)
+++ ssts-web/src/main/webapp/disinfectsystem/common/terminateInvoicePlan.js	(.../terminateInvoicePlan.js)	(revision 28761)
@@ -72,8 +72,9 @@
                 if(returnValue == ''){
                     return;
                 }
-
-                 Ext.Ajax.request({
+                var mask = new Ext.LoadMask(Ext.getBody(), { msg: '正在终止选中的申请单，请稍候...'});
+                mask.show();
+                Ext.Ajax.request({
                     url: WWWROOT + url,
                     params: { recyclingAppId : id ,endCause:returnValue},
                     success: function(response, options){
@@ -87,6 +88,9 @@
                                 showResult(result.errMsg);
                             }
                         }
+                        if(loadMask){
+                            loadMask.hide();
+                        }
                         if(refreshCallback){
                             refreshCallback();
                         }else{
@@ -95,6 +99,9 @@
                     },
                     failure: function(response, options) {
                         showResult("终止失败，请联系管理员!");
+                        if(loadMask){
+                            loadMask.hide();
+                        }
                     }
                 });
             }
@@ -149,6 +156,8 @@
                         endCause:returnValue
                     }
                 }
+                var mask = new Ext.LoadMask(Ext.getBody(), { msg: '正在终止选中的物品，请稍候...'});
+                mask.show();
                 Ext.Ajax.request({
                     url: WWWROOT + url,
                     params: params,
@@ -163,6 +172,9 @@
                                 showResult(result.msg);
                             }
                         }
+                        if(loadMask){
+                            loadMask.hide();
+                        }
                         if(refreshCallback){
                             refreshCallback();
                         }else{
@@ -171,6 +183,9 @@
                     },
                     failure: function(response, options) {
                         showResult("终止失败，请联系管理员!");
+                        if(loadMask){
+                            loadMask.hide();
+                        }
                     }
                 });
             }