Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r34466 -r34503
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34466)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34503)
@@ -202,16 +202,16 @@
 			pNode.set('checked', checked);
 			if (checked) {
 				count++
-				if(sstsConfig.showTousseNoteOnClickTousse){
+				if (sstsConfig.showTousseNoteOnClickTousse) {
 					var tousseName = pNode.get('tousseName');
 					var note = pNode.get('note');
 					var tousseID = pNode.get('tousseID');
 					if (!Ext.isEmpty(note) && newChecked) {
 						noteData.push({
-							tousseID:tousseID,
-							tousseName:tousseName,
-							note:note,
-							status:0
+							tousseID: tousseID,
+							tousseName: tousseName,
+							note: note,
+							status: 0
 						})
 					}
 				}
@@ -231,12 +231,12 @@
 			Ext4.getCmp('sterilingType').disable();
 			Ext4.getCmp('packageType').disable();
 		}
-		if(noteData.length > 0){
+		if (noteData.length > 0) {
 			showAllNoteWindow(noteData);
 		}
 	}
-	
 
+
 	Ext4.getCmp('basketTreeGrid').getView().refresh();
 }
 
@@ -255,95 +255,97 @@
 	Ext4.getCmp('waitPackingTreeGrid').getView().refresh();
 }
 
-function checkNoteWin(tousseID){
-	removeAndInsertItem(tousseID,1);
+function checkNoteWin(tousseID) {
+	removeAndInsertItem(tousseID, 1);
 }
 
-function skipNote(tousseID){
-	removeAndInsertItem(tousseID,2);
+function skipNote(tousseID) {
+	removeAndInsertItem(tousseID, 2);
 }
 
-function removeAndInsertItem(tousseID,status){
+function removeAndInsertItem(tousseID, status) {
 	var record;
 	var recordFields = Ext.data.Record.create([
-		{name : 'tousseID',mapping : 'tousseID'},
-		{name : 'tousseName',mapping : 'tousseName'},
-		{name : 'note',mapping : 'note'},
-		{name : 'status',mapping : 'status'}
+		{ name: 'tousseID', mapping: 'tousseID' },
+		{ name: 'tousseName', mapping: 'tousseName' },
+		{ name: 'note', mapping: 'note' },
+		{ name: 'status', mapping: 'status' }
 	]);
 	var sum = 0;
-	for(var i = 0;i<noteGrid.getStore().getCount();i++){
+	for (var i = 0; i < noteGrid.getStore().getCount(); i++) {
 		var rows = noteGrid.getStore().getAt(i);
-		if(rows.data.tousseID == tousseID){
+		if (rows.data.tousseID == tousseID) {
 			var rows = noteGrid.getStore().getAt(i);
 			record = new recordFields({
-				tousseID:tousseID,
-				tousseName:rows.data.tousseName,
-				note:rows.data.note,
-				status:status
+				tousseID: tousseID,
+				tousseName: rows.data.tousseName,
+				note: rows.data.note,
+				status: status
 			});
 			noteGrid.getStore().remove(rows)
 			noteGrid.getStore().insert(i, record);
-			if(status == 1){
-				previewWangEditor('【'+rows.data.tousseName+'】',tousseID);
+			if (status == 1) {
+				previewWangEditor('【' + rows.data.tousseName + '】', tousseID);
 			}
 			break;
 		}
 	}
-	for(var i = 0;i<noteGrid.getStore().getCount();i++){
+	for (var i = 0; i < noteGrid.getStore().getCount(); i++) {
 		var rows = noteGrid.getStore().getAt(i);
-		if(rows.data.status == 0){
-			sum ++ ;
+		if (rows.data.status == 0) {
+			sum++;
 		}
 	}
-	if(sum == 0){
+	if (sum == 0) {
 		top.Ext.getCmp('noteWindow').close();
 	}
 }
 
-function renderButton(v,p,record){
-	return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().checkNoteWin('"+record.data.tousseID+"');\">查看</a> | <a href=\"#\" target=\"_self\" style='color:red !important' onclick=\"getCurrentTab().skipNote('"+record.data.tousseID+"');\">跳过</a>";
+function renderButton(v, p, record) {
+	return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().checkNoteWin('" + record.data.tousseID + "');\">查看</a> | <a href=\"#\" target=\"_self\" style='color:red !important' onclick=\"getCurrentTab().skipNote('" + record.data.tousseID + "');\">跳过</a>";
 }
 
-function showAllNoteWindow(data){
+function showAllNoteWindow(data) {
 	noteGrid = new top.Ext.grid.GridPanel({
 		store: new top.Ext.data.Store({
-			reader : new top.Ext.data.JsonReader({
-				fields : [
-					{name : 'tousseID',mapping : 'tousseID'},
-					{name : 'tousseName',mapping : 'tousseName'},
-					{name : 'note',mapping : 'note'},
-					{name : 'status',mapping : 'status'}
+			reader: new top.Ext.data.JsonReader({
+				fields: [
+					{ name: 'tousseID', mapping: 'tousseID' },
+					{ name: 'tousseName', mapping: 'tousseName' },
+					{ name: 'note', mapping: 'note' },
+					{ name: 'status', mapping: 'status' }
 				]
 			})
 		}),
 		columns: [
-			{header: "名称", width: 300, dataIndex: 'tousseName',renderer:function(v,p,record){
-				if(record.get('status') == 1){
-					return v + '<span style="color:#367f21 !important">(已查看)</span>';
-				}else if(record.get('status') == 2){
-					return v + '<span style="color:#367f21 !important">(已跳过)</span>';
-				}else {
-					return v;
+			{
+				header: "名称", width: 300, dataIndex: 'tousseName', renderer: function (v, p, record) {
+					if (record.get('status') == 1) {
+						return v + '<span style="color:#367f21 !important">(已查看)</span>';
+					} else if (record.get('status') == 2) {
+						return v + '<span style="color:#367f21 !important">(已跳过)</span>';
+					} else {
+						return v;
+					}
 				}
-			}},
-			{header: "操作", width: 100,renderer:renderButton}
+			},
+			{ header: "操作", width: 100, renderer: renderButton }
 		],
 		stripeRows: true,
-		viewConfig: {forceFit: true},
-		height : 250
+		viewConfig: { forceFit: true },
+		height: 250
 	});
 	noteGrid.getStore().loadData(data);
 	var noteWindow = new top.Ext.Window({
-		autoHeight:true,
-		id:'noteWindow',
-		title : '配包注意事项',
-		width : 400,
-		draggable:true,
-		modal:true,
-		closeAction:'close',
-		closable:false,
-		items:[noteGrid]
+		autoHeight: true,
+		id: 'noteWindow',
+		title: '配包注意事项',
+		width: 400,
+		draggable: true,
+		modal: true,
+		closeAction: 'close',
+		closable: false,
+		items: [noteGrid]
 	});
 	noteWindow.show();
 }
@@ -639,7 +641,7 @@
 	//定时器，查询后导出
 	function timeOut(myMask) {
 		var time = setTimeout(function () {
-			if(document.getElementById('thisIframe')){
+			if (document.getElementById('thisIframe')) {
 				var html = document.getElementById('thisIframe').contentWindow.document.body.innerHTML;
 				if (html.indexOf('table') > -1) {
 					clearTimeout(time);
@@ -648,7 +650,7 @@
 				} else {
 					timeOut(myMask);
 				}
-			}else {
+			} else {
 				timeOut(myMask);
 			}
 		}, 1000);
@@ -782,11 +784,11 @@
 		var taskList = result.idCard.packingTaskInfo;
 		var errorDamageRemark = result.idCard.errorDamageRemark || '';
 		var remark = errorDamageRemark;
-		if(taskList && taskList.length > 0){
+		if (taskList && taskList.length > 0) {
 			var remarkOfApplyGoods = taskList[0].remarkOfApplyGoods || '';
-			if(remark == ''){
+			if (remark == '') {
 				remark = remarkOfApplyGoods;
-			}else {
+			} else {
 				remark += '。' + remarkOfApplyGoods;
 			}
 		}
@@ -832,10 +834,10 @@
 			} else {
 				Ext4.getCmp('packageType').enable();
 			}
-			if(idCardTaskNode.data.note && idCardTaskNode.data.note !== ''){
-				showNoteWindow(idCardTaskNode,true);
-			}else {
-				showNoteWindow(idCardTaskNode.parentNode,true);
+			if (idCardTaskNode.data.note && idCardTaskNode.data.note !== '') {
+				showNoteWindow(idCardTaskNode, true);
+			} else {
+				showNoteWindow(idCardTaskNode.parentNode, true);
 			}
 		}
 		// 取消选中所有的装配任务，只选中该标识牌的
@@ -1597,27 +1599,27 @@
 						var myMask = new Ext4.LoadMask({ msg: "加载中，请稍候...", target: Ext4.getCmp('packingViewTab0') });
 						myMask.show();
 						Ext4.Ajax.request({
-							url : WWWROOT + '/disinfectSystem/packingAction!getPackageNote.do',
-							params : {
-								td_id : td_id
+							url: WWWROOT + '/disinfectSystem/packingAction!getPackageNote.do',
+							params: {
+								td_id: td_id
 							},
-							success : function(result){
+							success: function (result) {
 								var ret = Ext4.decode(result.responseText);
-								if(ret.success){
-									if(ret.note && ret.note !== ''){
-										setTimeout(function(){
-											previewWangEditor('【'+ret.packageName+'】',td_id);
+								if (ret.success) {
+									if (ret.note && ret.note !== '') {
+										setTimeout(function () {
+											previewWangEditor('【' + ret.packageName + '】', td_id);
 											myMask.hide();
 										}, 1000);
-									}else {
-										showResult('【'+ret.packageName+'】配包注意事项为空')
+									} else {
+										showResult('【' + ret.packageName + '】配包注意事项为空')
 										myMask.hide();
 									}
-								}else {
+								} else {
 									myMask.hide();
 								}
 							},
-							failure : function(){
+							failure: function () {
 								myMask.hide();
 							}
 						});
@@ -1978,10 +1980,10 @@
 				xtype: 'hidden',
 				id: 'packedPhotographed',
 				name: 'packedPhotographed'
-			},{
-				xtype:'hidden',
-				id:'note'
 			}, {
+				xtype: 'hidden',
+				id: 'note'
+			}, {
 				columnWidth: .5,
 				hidden: sstsConfig.disableIdCard,
 				xtype: 'textfield',
@@ -2579,8 +2581,8 @@
 				{
 					xtype: 'button',
 					margin: '0 0 0 10',
-					id:'connectRFID',
-					hidden:!(sstsConfig.enableRFIDTousseIdCard && !isIE()),
+					id: 'connectRFID',
+					hidden: !(sstsConfig.enableRFIDTousseIdCard && !isIE()),
 					text: '<span style="font-weight: bold;">' + '连接RFID设备' + '</span>',
 					handler: function () {
 						connectRFIDFun(0);
@@ -3373,21 +3375,21 @@
 			hideScanIDCardBarcode(); // 只要左边有选中的项，那么隐藏标识牌输入框
 		}
 	}
-	function showNoteWindow(node,idCard) {
+	function showNoteWindow(node, idCard) {
 		if (!sstsConfig.showTousseNoteOnClickTousse) {
 			return;
 		}
 		var tousseName = node.get('tousseName');
 		var note = node.get('note');
 		var checked = node.get('checked');
-		if(idCard){
+		if (idCard) {
 			checked = true;
 		}
 		if (!Ext.isEmpty(note) && checked) {
 			var tousseID = node.get('tousseID');
-			Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项，是否查看?",function (btn) {
+			Ext4.MessageBox.confirm("配包注意事项", tousseName + " 含有配包注意事项，是否查看?", function (btn) {
 				if (btn == 'yes') {
-					previewWangEditor('【'+tousseName+'】', tousseID);
+					previewWangEditor('【' + tousseName + '】', tousseID);
 				}
 			});
 		}
@@ -3556,8 +3558,8 @@
 				Ext4.getCmp('reviewer').setValue('');
 			}
 
-			if (getPackingMaterialsForCheck.has(tousseID+'+标识牌')) {
-				getPackingMaterialsForCheck.remove(tousseID+'+标识牌');
+			if (getPackingMaterialsForCheck.has(tousseID + '+标识牌')) {
+				getPackingMaterialsForCheck.remove(tousseID + '+标识牌');
 				materialStore.reload();
 			}
 		}
@@ -3661,7 +3663,7 @@
 			useViewingPackageType = false;
 			//		alert('useViewingPackageType')
 		}
-		
+
 		var basketBarcode = taskNode.data.basketBarcode;
 		var taskId = taskNode.data.taskId;
 
@@ -5236,7 +5238,7 @@
 							errorDamageRemarkId: '',
 							errorDamageRemarkInfo: '',
 							needInspectMaterials: needInspectMaterials,
-							haveRemarkOfApplyGoods:taskVO.haveRemarkOfApplyGoods,
+							haveRemarkOfApplyGoods: taskVO.haveRemarkOfApplyGoods,
 							tousseID: td_id,
 							maxAmount: 0
 						}
@@ -5732,7 +5734,7 @@
 			inputValue: '0',
 			checked: false,
 			listeners: {
-				change: function (obj,newValue) { 
+				change: function (obj, newValue) {
 					checkedAllNode(newValue);
 					resetScanIDCardBarcodeVisibility();
 				}
@@ -6647,25 +6649,25 @@
 	//空闲时刷新（每空闲5分钟刷新一次）
 	inactivityTime();
 
-	if(sstsConfig.enableRFIDTousseIdCard && !isIE()){
+	if (sstsConfig.enableRFIDTousseIdCard && !isIE()) {
 		//连接RFID设备
-		function connectRFIDFun(show){
+		function connectRFIDFun(show) {
 			if ('serial' in navigator) {
 				var params = {};
-				if(show !== 0){
+				if (show !== 0) {
 					params = {
 						usbVendorId: 6790,
 						usbProductId: 29987
 					}
-				}else {
+				} else {
 					params = {
-						getAllPort:true
+						getAllPort: true
 					}
 				}
-				openPort(params,function(value,isData,errorStatus){
-					if(isData){
+				openPort(params, function (value, isData, errorStatus) {
+					if (isData) {
 						loadIdCardByBarcode(value, true, true);
-					}else {
+					} else {
 						showResult(value);
 					}
 				});
@@ -6727,7 +6729,6 @@
 
 	return basketBarcodeArr;
 }
-
 //动态修改列宽
 function setGridColumnsWidth(root, grid, treeId) {
 	var tousseNameMaxLenArray = [];
@@ -6800,8 +6801,10 @@
 			if (basketNameMaxLenArray.length > 0) {
 				var basketNameMaxLenght = Math.max.apply(null, basketNameMaxLenArray);
 				if (basketNameMaxLenght !== 0) {
-					if (basketNameMaxLenght < 216) {
+					if (basketNameMaxLenght < 216 && basketNameMaxLenght >= 75) {
 						gridColumns[i].setWidth(basketNameMaxLenght + 30);
+					} else if (basketNameMaxLenght < 75 && basketNameMaxLenght > 0) {
+						gridColumns[i].setWidth(105);
 					} else {
 						gridColumns[i].setWidth(210);
 					}