Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/deliveryPlanApplication.js
===================================================================
diff -u -r24628 -r24744
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/deliveryPlanApplication.js	(.../deliveryPlanApplication.js)	(revision 24628)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/deliveryPlanApplication.js	(.../deliveryPlanApplication.js)	(revision 24744)
@@ -1,6 +1,141 @@
-$(function(){
+
 		var time="2018-08-05  12:30";
-		$("#invoice-middle").collapse();
+		//点击科室名后向弹出模态框的部分输入框赋值
+		function deliverySave(indepartCode,indepart){
+			departCode = indepartCode;
+			depart = indepart;
+			$("#deliveryDepartCodeHide").val(departCode);
+			$("#depart").val(indepart);
+			$("#sender").val("admin");
+			$("#personInCharge").val("admin");
+			var newArr = new Array();
+			$.ajax({
+				url:"/disinfectSystem/baseData/wareHouseController/getWareHouseData.mhtml",
+				type:"post",
+				contentType:"application/json",
+				data:[],
+				success:function(res){
+					var dataArr = res.data;
+					for(var i=0;i<dataArr.length;i++){
+						var newOb = [{ id: i , text: dataArr[i].name,sourceWarehouseId:dataArr[i].id}];
+						newArr.push(newOb[0]);
+					}
+					$("#sourceWarehouseName").select2({
+						language: "zh-CN",
+						placeholder: '全部',
+						allowClear: true,
+						minimumResultsForSearch: -1,
+						data: newArr,
+						width:267
+					});
+				},
+				error:function(res){
+		
+				}
+			}); 
+			var myDate = new Date();
+			myDate.toLocaleTimeString()
+			var today =  myDate.getFullYear()+"-"+myDate.getMonth()+"-"+myDate.getDate()+" "+myDate.toLocaleTimeString();
+			$('#deliveryTime').datetimepicker('setStartDate', today);
+		
+		}
+		//inputPrint Method
+		// 发货单left
+		function invoiceTable(invoiceData){
+			var invoiceHeaderColumns = [ 
+				{
+					title : '条码',
+					field : 'barcode',
+					align : 'center',
+					sortable: true
+				}, 
+				{
+					title : '物品名称',
+					field : 'name',
+					align : 'center'
+				},
+				{
+					title : '批次/灭菌日期',
+					field : 'batchNumber',
+					align : 'center'
+				},
+				{
+					title : '单价',
+					field : 'price',
+					align : 'center'
+				},
+				{
+					title : '数量',
+					field : 'storage',
+					align : 'center'
+				} ,
+				{
+					title : '删除',
+					field : 'deletehref',
+					align : 'center',
+					formatter: function(value,row,index){
+						return "<a  id='aid"+row.barcode+"' onclick='addInvoiceDelete(\"aid"+row.barcode+"\" )'><span class='glyphicon glyphicon-trash'></span></a>";
+					},
+				} 
+			];
+			$('#invoice').bootstrapTable("destroy");
+			$('#invoice').bootstrapTable({
+				striped: true,                     
+				cache: false,                      
+				pagination: false,                 
+				sortable: true,                    
+				sortOrder: "asc",                  
+				sidePagination: "client",          
+				pageNumber:1,                      
+				pageSize: 15,                      
+				pageList: [10, 25, 50, 100],       
+				search: false,                     
+				strictSearch: true,
+				showColumns: false,                
+				showRefresh: false,                
+				minimumCountColumns: 2,            
+				clickToSelect: true,               
+				height: 245,                				
+				uniqueId: "id",                    
+				cardView: false,                   
+				detailView: false,                 
+				removeByUniqueId:1,
+				columns: invoiceHeaderColumns,
+				data: invoiceData
+			});
+		}
+		
+		function addInvoiceDelete(getBarcode){
+
+			var aidHide = JSON.parse($('#deliveryCode').val());
+			var aidGet = getBarcode.replace("aid","");
+			aidGet = parseInt(aidGet);
+			var fu = [];
+			for(var i=0; i<aidHide.length; i++){
+				if(aidHide[i].barcode==aidGet){
+				}
+				else{
+					fu.push(aidHide[i]);
+				}
+			}
+			$('#deliveryCode').val(JSON.stringify(fu));
+			invoiceTable(JSON.parse($('#deliveryCode').val()));
+		}
+		//主表的搜索
+		//取出所有选项并刷新表格
+		function valRefreshMainTable(){
+			var data = {
+				departCode: null,
+				applyDate: null,
+				tousseType: null,
+				disposableGoodsType: null,
+				sterilingMethods: null,
+				appFormType: null
+			}
+		}
+		//inputPrint Method end
+$(function(){
+	
 		var parentHead = window.parent.$(".head-index");
 		var navbar =  window.parent.$(".content-index");
 		var mainNavHeight = $(".mainNav").height();
@@ -9,7 +144,6 @@
 				mleft = mleft - mainNavHeight; 
 		var mright = $(window).height() - parentHead.height() - navbar.height() ;
 				mright = mright - mainNavHeight - $(".mainView-right-title").height();
-				console.log("lee:"+mleft+";rigg:"+mright);
 		// 主表
 		var deliverGoodsPlanTableData =new Array();
 		var deliverGoodsPlanHeaderColumns = [ 
@@ -43,7 +177,6 @@
 				align : 'center'
 			}
 		];
- 
 		var MLTInitTable = function(url){
 			$('#mainView-left-table').bootstrapTable("destroy");
 			$('#mainView-left-table').bootstrapTable({
@@ -76,7 +209,6 @@
 				columns: deliverGoodsPlanHeaderColumns,
 			});
 		}
-		MLTInitTable("/disinfectSystem/invoicePlan/invoicePlanController/getDepartInvoiePlansByDepartCodes.mhtml");
 		// 主表 end 
 		//申请物品明细
 		var applyInforTableData =new Array();
@@ -131,7 +263,10 @@
 			data: applyInforTableData
 		});
 		//申请物品明细 end	
-
+		MLTInitTable("/disinfectSystem/invoicePlan/invoicePlanController/getDepartInvoiePlansByDepartCodes.mhtml");
+		
+	
+		
 		// 发货单明细
 		var invoiceInfoTableData =new Array();
 		var invoiceInfoHeaderColumns = [ 
@@ -277,6 +412,7 @@
 		});
 		// 发货单物品明细 end 	 	 
 		//高度自适应
+		
 		$(window).resize(function () {
 				$("#mainView-left-table").bootstrapTable('resetView', {
 				height: $(window).height() - parentHead.height() - navbar.height() - mainNavHeight
@@ -286,8 +422,7 @@
 				$("#mainView-right-table").bootstrapTable('resetView', {
 				height: $(window).height() - parentHead.height() - navbar.height()- mainNavHeight - $(".mainView-right-title").height()
 				}); 
-		}); 	
-		$(".mainView-left-table .fixed-table-toolbar").append($(".mainView-left-title"));			
+		});
 		//父页面的头部收缩监听
 		parentHeadIf.click(function(){
 			$("#mainView-left-table").bootstrapTable('resetView', {
@@ -297,6 +432,203 @@
 			height: $(window).height() - parentHead.height() - navbar.height()- mainNavHeight - $(".mainView-right-title").height()
 			});
 		});
-		console.log("deman  left:"+$(window).height() - parentHead.height() - navbar.height() - mainNavHeight);
+		$(".mainView-left-table .fixed-table-toolbar").append($(".mainView-left-title"));	
+		$("#invoice-middle").collapse();
+		
+		//inputPrint
+		//时间插件
+		var myDate = new Date();
+		var departCode;
+		var depart;
+		myDate.toLocaleTimeString()
+		var today =  myDate.getFullYear()+"-"+myDate.getMonth()+"-"+myDate.getDate()+" "+myDate.toLocaleTimeString();
+		$('#deliveryTime').datetimepicker('setStartDate', today); 
+		$("#startTime").datetimepicker('setStartDate', today);
+		$("#finishTime").datetimepicker('setStartDate', today);
+		//发货单left的调用
+		invoiceTable([]);
+		//发货物品扫描
+		$('#deliveryGoods').bind('keyup', function(event) {
+			if(event.keyCode == "13"){
+				//扫码输入框的值
+				var ruid = $('#deliveryGoods').val(); 
+				$('#deliveryGoods').val("");
+				//判断是否重复条码
+				if(!$('#deliveryCode').val())
+				{
+					var hival = [];
+				}
+				else{
+					var hival = JSON.parse($('#deliveryCode').val());
+				}
+				var tf = 0;
+				for(var i=0 ;i<hival.length;i++)
+				{
+					if(ruid == hival[i].barcode)
+					{
+						window.alert('请勿重复操作已有条码！'); 
+						tf = 11;
+						return 0;
+					}
+				}
+				if(tf == 11)
+				{
+					return 0;
+				}
+				
+				var codeData = {"barcode":ruid,"orgUnitCoding":04,"sourceWarehouseId":2,"sourceWarehouseId":13749};
+				$.ajax({ 
+					url:"/disinfectSystem/invoice/invoiceController/loadGoodsByBarcode.mhtml",
+					type:"post",
+					dataType:"json",
+					data: codeData,
+					contentType:"application/x-www-form-urlencoded",
+					success: function(data){
+						if(data.success===true){
+							if(data.rows[0].barcode==null){
+								window.alert(data.errMsg);
+								return 0;
+							}
+							else{
+								data.rows[0].sendAmount = 1;
+								var endDate = data.rows[0].endDate;
+								endDate = (endDate).replace(/-/g,"/");
+								endDate = new Date(endDate);
+								
+								newEndDate = endDate.getFullYear()+"-"+endDate.getMonth()+"-"+endDate.getDay();
+								endDate = newEndDate+" "+endDate.getHours()+":"+endDate.getMinutes();
+								
+								data.rows[0].endDate = endDate;
+								var invGoods2 = data.rows;
+							}
+							//旧代码的参考与判断 例如 比较库存与发货量的关系
+							var goods = data.rows[0];
+							var count = 1;// 此次的发货数量
+							var storageAmount = 0;// 库存数量
+							try{
+								storageAmount = Number(goods.storage);	
+							}catch (e) {
+								storageAmount = 0;
+							}
+							var goodsName = goods.name;
+							// 申请数量
+							var waitDeliveryCount = goods.count;// 申请数量
+							var sendAmount = goods.scanAmount;// 已扫描数量
+							var notSendAmount = Number(waitDeliveryCount) - Number(sendAmount);// 待发货数量
+							if(goods.tousseFixedBarcode == true){
+								if(notSendAmount <= 0){
+									return;
+								}
+								if(sendAmount >= storageAmount){
+									return;
+								}
+							}
+							if(goods.tousseFixedBarcode == true || (goods.diposable == '是')){
+								if(notSendAmount < storageAmount){// 待发货数量小于库存
+									count = notSendAmount;
+								}else{
+									count = storageAmount;
+								}
+							}
+							// 固定条码每次增加的数量不能超过包定义的扫描数量
+							if(goods.tousseFixedBarcode!=false){
+								var remnantStorage = storageAmount - sendAmount;
+								count = Math.min(count,goods.scanAmount);// 单次增加数量不能超过每次扫描数量
+								count = Math.min(count,remnantStorage);// 增加数量不能超过剩余库存
+								if(count == 0){
+									return;
+								}
+							}
+							//旧代码的参考与判断 end
+							if($('#deliveryCode').val()=='')
+							{
+								$('#invoice').bootstrapTable('append',invGoods2);		
+								$('#deliveryCode').val(JSON.stringify(invGoods2));
+							}
+							else
+							{
+								var bArrif = 0;
+								var bArr = JSON.parse($('#deliveryCode').val())
+								bArr.push(invGoods2[0]);
+								$('#deliveryCode').val(JSON.stringify(bArr));
+								var bar = JSON.parse( $("#deliveryCode").val() );
+								invoiceTable(bar);
+							}
+						} 
+						else{
+							window.alert("没有该篮筐");
+						}
+					},
+				})
+			}
+		})
+			
+		// 解决谷歌下输入框不能输入的问题
+		$.fn.modal.Constructor.prototype.enforceFocus = function () {};
+		// 发货保存
+		$("#deliveryRefer").click(function(){
+				//条码不能为空
+				if($("#deliveryCode").val()==null||$("#deliveryCode").val()==""||$("#deliveryCode").val()==[]){
+					window.alert('条码不能为空');
+					return 0;
+				}
+				var swn = $("#sourceWarehouseName").select2('data');
+				var sA = (JSON.parse($("#deliveryCode").val())).length; 
+				var addData = {  
+					applyDate : null,
+					depart :$("#depart").val(),
+					sender :$("#sender").val(),
+					sourceWarehouseName :$("#sourceWarehouseName").val(),
+					orgUnitCoding : $("#deliveryDepartCodeHide").val(),
+					sendOutGoodsStoreData : $("#deliveryCode").val(),
+					sourceWarehouseId : swn[0].sourceWarehouseId,
+					sourceWarehouseName: swn[0].text
+				};
+				if($("#depart").val()==""||$("#sender").val()==""||$("#sourceWarehouseName").val()=="")
+				{
+					window.alert('不能为空');
+				}
+				else
+				{
+					$.ajax({
+						url: "/disinfectSystem/invoice/invoiceController/saveInvoiceByDepartOrInvoicePlanId.mhtml",
+						type: "post",
+						dataType: "json",
+						data: addData ,
+						contentType:"application/x-www-form-urlencoded",
+						success:function(result){ 
+							if(result.success == false)
+							{
+								window.alert(result.message);
+							}
+							if(result.success==true)
+							{
+								window.alert(result.message);
+								$("#deliveryCode").val("");
+								$("#sourceWarehouseName").select2("val", ""); 
+								invoiceTable([]);
+								$("#myModal").modal('hide');
+							}
+						},
+						error:function(result){ 
+						},
+					});
+				}
+		})
+		
+		$(".select2").css("width","100%");
+		//inputPrint end
+		//发货单物品关闭后的对模态框内数据以及隐藏域的清零
+		
+		$('#myModal').on('hidden.bs.modal', function (){
+			//关闭后清理模态框以及隐藏域里面的数据
+			$("#sender").val("");
+			$("#deliveryTime").val("");
+			$("#deliveryGoods").val("");
+			$("#deliveryCode").val("");
+			invoiceTable([]);
+		})
+	
  }); 
  
+	
\ No newline at end of file