~jhz/KaiShanLAYUI-invalid.git

			@@ -267,6 +267,7 @@
			$("#HMakerID").hide();
			$("#HBillerID").val(sessionStorage["HBillerID"]);
			$("#HBillerID").hide();
			var HSourceFlag = sessionStorage["SourceFlag"];

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			if (sessionStorage.login != "login") {
			@@ -293,7 +294,7 @@



			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			function RoadBillMain(linterid)//å è½½è¡¨å¤´-----ä¸ä¼èµ°
			{
			$.ajax({
			url: GetWEBURL() + "/Web/GetPonderationBill",
			@@ -316,7 +317,7 @@
			})
			}

			function RoadSup()//æ ¹æ®æºåç±»ååæºåå· å è½½å®¢æ·
			function RoadSup()//æ ¹æ®æºåç±»ååæºåå· å è½½å®¢æ·-----ä¸ä¼èµ°
			{
			//var sInterID = $("#HInterID").val()
			var HSourceBillNo = $('#HSourceBillNo').val()
			@@ -338,8 +339,8 @@
			$("#HSupID").val(result.data[0].HSupID);
			$("#HSupName").val(result.data[0].HSupName);
			$("#HDeptID").val(result.data[0].HDeptID);
			$("#HDeptName").val(result.data[0].HDeptName);
			sessionStorage["SourceFlag"] = true;
			//$("#HDeptName").val(result.data[0].HDeptName);
			//sessionStorage["SourceFlag"] = true;
			element.tabChange('tab-SellOutBill', '2');
			layer.load(3);
			}
			@@ -352,7 +353,7 @@
			}
			}

			function RoadBillSub(linterid)//å è½½è¡¨ä½
			function RoadBillSub(linterid)//å è½½è¡¨ä½-----ä¸ä¼èµ°
			{
			table.render({
			elem: '#wl-table'
			@@ -404,7 +405,7 @@
			}
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new-----ä¸ä¼èµ°
			RoadBillMain(linterid);
			RoadBillSub(linterid);
			}
			@@ -504,7 +505,7 @@
			});

			form.on('submit(Cancel)', function () {
			sessionStorage["SourceFlag"] = false;
			//sessionStorage["SourceFlag"] = false;
			parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			})
			@@ -631,9 +632,12 @@
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			//window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			parent.location.href = "../../../views/index.html"
			parent.location.href = "../../../views/index.html";
			}//å³é
			}, function () { window.location.reload(); });//æ°å¢
			}, function () {
			//sessionStorage["SourceFlag"] = false;
			window.location.reload();
			});//æ°å¢
			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			@@ -641,7 +645,7 @@
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}
			@@ -667,7 +671,7 @@
			var sHWHID = $("#HWHID").val();//ä»åºID
			var sHSPID = $("#HStockPlaceID").val();//ä»ä½ID
			var sQty = $("#HQty").val()//æ°é
			var SourceFlag = sessionStorage["SourceFlag"];
			//var SourceFlag = sessionStorage["SourceFlag"];
			var sSourceBillNo = $("#HSourceBillNo").val();//æºåå·
			var sHBillType = $("#HBillType").val() //æºåç±»å-åè´§éç¥åï¼1402ï¼éå®è®¢å1401

			@@ -685,7 +689,7 @@
			$.ajax({
			url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": SourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
			data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
			success: function (result) {
			if (result.count == 1) {
			if (result.data.HBarType == 'ä»åºæ¡ç ') {
			@@ -712,10 +716,10 @@
			else if (result.data.HBarType == 'æºåæ¡ç ') {
			$("#HSupName").val(result.data.HSupName);
			$("#HSupID").val(result.data.HSupID);
			$("#HDeptName").val(result.data.HDeptName);
			//$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.HSourceBillType == "1402") {
			$("#HBillType").val("1402");
			@@ -731,16 +735,16 @@
			element.tabChange('tab-Kf_SellOutBill', '3');
			}
			else {
			if (sessionStorage["SourceFlag"] == "true") {
			if (HSourceFlag == "true") {
			element.tabChange('tab-Kf_SellOutBill', '3');
			}
			else {
			$("#HSupName").val(result.data.HSupName);
			$("#HSupID").val(result.data.HSupID);
			$("#HDeptName").val(result.data.HDeptName);
			//$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.HSourceBillType == "1402") {
			$("#HBillType").val("1402");
			@@ -793,6 +797,9 @@
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}
			@@ -920,7 +927,7 @@
			$("#HSupName").val(result.data[0].HSupName);
			//$("#HDeptID").val(result.data[0].HDeptID);
			//$("#HDeptName").val(result.data[0].HDeptName);
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			element.tabChange('tab-SellOutBill', '2');
			layer.load(3);