MES-WEB-LayUI.git

			@@ -35,9 +35,11 @@
			<li lay-id="2" style="padding:1px;">åæ®ä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">ç©ææ¸å</li>
			<li lay-id="4" style="padding:1px;">æç»æ¸å</li>
			<li lay-id="5" style="padding:1px;">æ¥å¿</li>
			<li lay-id="5" style="padding:1px;">æºåæ¾è´§</li>
			<li lay-id="6" style="padding:1px;">æ¥å¿</li>
			</ul>
			<div class="layui-tab-content">
			<!--æºåä¿¡æ¯-->
			<div class="layui-tab-item layui-show">
			<div class="layui-form-item">
			<div class="layui-row">
			@@ -63,6 +65,7 @@
			</div>
			</div>
			</div>
			<!--åæ®ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			@@ -88,7 +91,7 @@
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
			</div>
			</div>
			</div>
			@@ -174,17 +177,18 @@
			</div>
			</div>
			</div>
			<!--ç©ææ¸å-->
			<div class="layui-tab-item">
			<!--<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs4">
			<label class="layui-form-label" style="width:40px;padding-left:0px;">æ¡ç </label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>-->
			<div class="layui-row">
			<div class="layui-col-xs4">
			<label class="layui-form-label" style="width:40px;padding-left:0px;">æ¡ç </label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>-->
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			@@ -197,9 +201,15 @@
			</div>
			<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
			</div>
			<!--æç»æ¸å-->
			<div class="layui-tab-item">
			<table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
			</div>
			<!--æºåæ¾è´§-->
			<div class="layui-tab-item">
			<table class="layui-hide" id="zh-table" lay-filter="zh-table"></table>
			</div>
			<!--æ¥å¿-->
			<div class="layui-tab-item">
			<table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
			</div>
			@@ -248,6 +258,29 @@
			, form = layui.form
			, element = layui.element;

			//æºåæ¾è´§åè¡¨
			var ZHOption = {
			elem: '#zh-table'
			//, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, cols: [[
			{ field: 'å¨åºç¶æ', title: 'å¨åºç¶æ',width:180 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			, { field: 'æ¹æ¬¡', title: 'æ¹æ¬¡' }
			, { field: 'æ°é', title: 'æ°é' }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			]]
			, text: {
			none: 'ææ ç¸å³æ°æ®ï¼è¯·åæ«ææºåå·ï¼'
			}
			};
			//åå§å è½½è¡¨æ ¼
			ZHOption.data = [];
			table.render(ZHOption);


			//è¡¨å¤´åå§åèµå¼ï¼æ ¹æ®ç»å½ç¨æ·è·å é»è®¤ä»åºãé¨é¨ãéªæ¶ãä¿ç®¡ãéè¶ç¨æ·ï¼ new
			$("#HWHID").val(sessionStorage["HWHID"]);
			@@ -267,9 +300,14 @@
			$("#HMakerID").hide();
			$("#HBillerID").val(sessionStorage["HBillerID"]);
			$("#HBillerID").hide();
			var HSourceFlag = sessionStorage["SourceFlag"];


			//é»è®¤å¸¦å¥çä»åºï¼å¦æå¯ç¨ä»ä½åä»ä½ææï¼å¦ææ²¡æå¯ç¨åä»ä½ç°åº¦ new
			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "../../user/login.html"; });
			}


			//è·ååæ°
			@@ -289,7 +327,7 @@



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

			function RoadSup()//æ ¹æ®æºåç±»ååæºåå· å è½½å®¢æ·
			function RoadSup()//æ ¹æ®æºåç±»ååæºåå· å è½½å®¢æ·-----ä¸ä¼èµ°
			{
			//var sInterID = $("#HInterID").val()
			var HSourceBillNo = $('#HSourceBillNo').val()
			@@ -334,8 +372,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);
			}
			@@ -348,11 +386,11 @@
			}
			}

			function RoadBillSub(linterid)//å è½½è¡¨ä½
			function RoadBillSub(linterid)//å è½½è¡¨ä½-----ä¸ä¼èµ°
			{
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL1() + '/SellOut/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			, where: { HBillID: linterid, HBillType: '1205', sWhere: '' }
			@@ -370,7 +408,7 @@
			, { field: 'HAuxPropID', title: 'è¾å©å±æ§', width: 100 }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100 }
			]]
			, height: 500
			//, height: 500
			})
			}

			@@ -400,7 +438,7 @@
			}
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new-----ä¸ä¼èµ°
			RoadBillMain(linterid);
			RoadBillSub(linterid);
			}
			@@ -436,6 +474,7 @@
			}
			})
			});

			form.on('submit(HSupID-BT)', function () {//éæ©å®¢æ·
			layer.open({
			type: 2
			@@ -499,7 +538,7 @@
			});

			form.on('submit(Cancel)', function () {
			sessionStorage["SourceFlag"] = false;
			//sessionStorage["SourceFlag"] = false;
			parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			})
			@@ -549,7 +588,7 @@
			if (data.count == 1) { // è¯´æéªè¯æåäº
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL1() + '/SellOut/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			@@ -567,7 +606,7 @@
			, { field: 'HAuxPropID', title: 'è¾å©å±æ§', width: 100 }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100 }
			]]
			, height: 500
			//, height: 500
			})
			}
			else {
			@@ -588,7 +627,6 @@
			var sSourceType = $("#HBillType").val();
			if (AllowLoadData(sSubStr) != false)//éç©ºéªè¯
			{
			layer.load(3);
			var flage = true;
			for (var i = 0; i < sSubStr.length; i++) {
			if (sSubStr[i].HQty == 0) {
			@@ -599,42 +637,52 @@
			layer.confirm('å®éæ«æå·æ°å°äºæ¾è´§åæ°éï¼æ¯å¦ç»§ç»æäº¤ï¼', {
			btn: ['ç»§ç»', 'åæ¶'], skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º"
			}, function () {
			$.ajax(
			{
			type: "POST",
			// url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
			async: true,
			data: { "oMain": sMainStr },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.confirm("çæéå®åºåºå" + data.Message + $("#HBillNo").val(), {
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			//window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			parent.location.href = "../../../views/index.html"
			}//å³é
			}, function () { window.location.reload(); });//æ°å¢
			}
			else {
			layer.msg(data.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: "æ¸©é¦¨æç¤º" });
			}
			});
			Saver(sMainStr);
			}, function () {
			layer.closeAll("loading");
			});
			} else {
			Saver(sMainStr);
			}

			return false;
			}
			});
			//æäº¤æ¹æ³è°ç¨çajax
			function Saver(sMainStr) {
			layer.load(1);
			$.ajax(
			{
			type: "POST",
			// url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
			async: true,
			data: { "oMain": sMainStr },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.confirm(data.Message + $("#HBillNo").val(), {
			icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			//window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			parent.location.href = "../../../views/index.html";
			}//å³é
			}, function () {
			//sessionStorage["SourceFlag"] = false;
			window.location.reload();
			});//æ°å¢
			}
			else {
			layer.msg(data.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: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//çå¬æäº¤
			form.verify({
			numberOrEmpty: function (value, item) {
			@@ -656,7 +704,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

			@@ -674,7 +722,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 == 'ä»åºæ¡ç ') {
			@@ -701,10 +749,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");
			@@ -720,16 +768,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");
			@@ -753,7 +801,7 @@
			table.render({
			elem: '#wl-table'
			// , url: 'http://61.130.49.162:9090/WMSAPI///OtherInStockBill/DisBillEntryList_Webs_Json'
			, url: GetWEBURL1() + '/SellOut/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			, cols: [[
			@@ -770,7 +818,7 @@
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			//, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			@@ -782,6 +830,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: "æ¸©é¦¨æç¤º" });
			}
			});
			}
			@@ -792,7 +843,7 @@
			if (event.keyCode == 13) {
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			$.ajax({
			url: GetWEBURL() + "/Web/GetSpName_Json",
			url: GetWEBURL() + "/LookingFor/getSpName_Json",
			type: "GET",
			data: { "HBarCode": HBarCode },
			success: function (result) {
			@@ -854,7 +905,7 @@
			// table.render({
			// elem: '#wl-table'
			// //, url: 'http://61.130.49.162:9090/WMSAPI///SellOut/DisBillEntryList_Webs_Json'
			// , url: GetWEBURL1() + '/SellOut/DisBillEntryList_Webs_Json'
			// , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			// , toolbar: '#toolbarDemo'
			// , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			// , cellMinWidth: 90
			@@ -894,8 +945,10 @@
			var sBillNo = $("#HBillNo").val()
			var HSourceBillType = $("#HBillType").val()
			if (event.keyCode == 13) {
			var index = layer.load(0);
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			if (HSourceBillNo == "" \|\| sInterID <= 0) {
			layer.close(index);
			layer.msg("æºåå·ä¸ºç©ºï¼æèåç ä¸åå¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			@@ -909,13 +962,11 @@
			$("#HSupName").val(result.data[0].HSupName);
			//$("#HDeptID").val(result.data[0].HDeptID);
			//$("#HDeptName").val(result.data[0].HDeptName);
			sessionStorage["SourceFlag"] = true;
			element.tabChange('tab-SellOutBill', '2');
			layer.load(3);

			HSourceFlag = true;
			element.tabChange('tab-SellOutBill', '3');
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL1() + '/SellOut/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			, cols: [[
			@@ -932,16 +983,18 @@
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			//, height: 500
			, done: function () {
			layer.closeAll("loading");
			layer.close(index);
			}
			});
			layer.close(index);
			}
			else {
			layer.close(index);
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			layer.close(index);
			}
			});
			}
			@@ -960,6 +1013,36 @@
			, done: function () {
			}
			});

			//æ«æºåæ¥è´§
			$('#HSourceBillNo').on('keydown', function (event) {
			var HSourceBillNo = $('#HSourceBillNo').val();
			if (event.keyCode == 13) {
			var index = layer.load(0);
			$.ajax({
			url: GetWEBURL() + "/LookingFor/GetSellOutFindSP",
			type: "GET",
			data: { "HbillNo": HSourceBillNo },
			success: function (result) {
			if (result.count == 1) {
			ZHOption.data = result.data;
			table.render(ZHOption);
			layer.close(index);
			element.tabChange('tab-SellOutBill', '5');
			}
			else {
			layer.close(index);
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			}, error: function () {
			layer.close(index);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			});

			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});
			function GetHWHValue(obj) //è¿åä»åº
			{