MES-WEB-LayUI.git

			@@ -2,7 +2,7 @@
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
			<title>å½è¿å</title>
			<title>ä¸æ¶å½è¿å</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			@@ -50,34 +50,6 @@
			<div class="layui-tab-content">
			<!--è¡¨å¤´ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»åº</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HWHName" id="HWHName" autocomplete="off" class="layui-input">
			<input type="hidden" name="HWHID" id="HWHID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT">...</button>
			</div>
			</div>
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»ä½</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HSPName" id="HSPName" autocomplete="off" class="layui-input">
			<input type="hidden" name="HSPID" id="HSPID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
			</div>
			</div>
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			@@ -143,6 +115,34 @@
			</div>
			<!--å®ç©ä¸æ¶-->
			<div class="layui-tab-item layui-show">
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»åº</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HWHName" id="HWHName" autocomplete="off" class="layui-input" readonly>
			<input type="hidden" name="HWHID" id="HWHID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs1">
			<button type="button" id="HWHID-BT" lay-submit="" class="layui-btn" lay-filter="HWHID-BT" style="display:none;">...</button>
			</div>
			</div>
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»ä½</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HSPName" id="HSPName" autocomplete="off" class="layui-input">
			<input type="hidden" name="HSPID" id="HSPID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs1">
			<button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;margin-bottom: 1%;">å®ç©æ¡ç </label>
			@@ -191,7 +191,7 @@
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "user/login.html"; });
			}, function () { window.location.href = "../../user/login.html"; });
			}

			//åå§åºæ¬ä¿¡æ¯èµå¼
			@@ -205,6 +205,13 @@
			$("#HSource").val(sessionStorage["HSource"]);
			$("#HMakerID").val(sessionStorage["Czybm"]);
			$("#HMaker").val(sessionStorage["HUserName"]);

			//å¤æç¨æ·æ¯å¦ç»å®çç»åçäº§èµæº
			if ($("#HGroupID").val() == 0 \|\| $("#HSourceID").val() == 0) {
			layer.confirm("è¯¥ç¨æ·æªç»å®çç»æçäº§èµæºï¼ä¸åè®¸æ¾è´§ï¼", {
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['ç¡®è®¤éåº']
			}, function () { window.location.href = "../../index.html"; });
			}

			//è·åæå¤§åæ®å· new
			$("#HInterID").val("");
			@@ -229,15 +236,15 @@
			, cellMinWidth: 90
			, cols: [[
			{ type: 'numbers', title: 'åºå·' }
			, { field: 'HIsStatus', title: 'æ¯å¦æ«ç ' }
			, { field: 'HSourceInterID', title: 'æºåID', hide: true }
			, { field: 'HSourceBillNo', title: 'æºåå·', width: 110 }
			, { field: 'HMTONo', title: 'æ¹å·', width: 180 }
			, { field: 'HStatus', title: 'å¨åºç¶æ', width: 165 }
			, { field: 'HWhID', title: 'ä»åºID', hide: true }
			, { field: 'HWhName', title: 'ä»åº' }
			, { field: 'HIsStatus', title: 'æ¯å¦æ«ç ', hide: true }
			, { field: 'HMTONo', title: 'æ¹å·' }
			, { field: 'HSPID', title: 'ä»ä½ID', hide: true }
			, { field: 'HSPName', title: 'ä»ä½' }
			, { field: 'HStatus', title: 'å¨åºç¶æ' }
			, { field: 'HWhID', title: 'ä»åºID', hide: true }
			, { field: 'HWhName', title: 'ä»åº', width: 130 }
			, { field: 'HSourceInterID', title: 'æºåID', hide: true }
			, { field: 'HSourceBillNo', title: 'æºåå·', width: 110 }
			, { field: 'HGroupID', title: 'çç»ID', hide: true }
			, { field: 'HGroup', title: 'çç»' }
			, { field: 'HSourceID', title: 'çäº§èµæºID', hide: true }
			@@ -249,11 +256,11 @@
			, { field: 'HMaterModel', title: 'è§æ ¼åå·' }
			, { field: 'å³æ¶åºå', title: 'å³æ¶åºå' }
			, { field: 'HBarCode', title: 'æ¡ç ç¼å·', hide: true }
			, { field: 'HInterID', title: 'åæ®ID' }
			, { field: 'HBillNo', title: 'åæ®å·' }
			, { field: 'HMakerID', title: 'å¶åäººID' }
			, { field: 'HMaker', title: 'å¶åäºº' }
			, { field: 'HBillType', title: 'HBillType' }
			, { field: 'HInterID', title: 'åæ®ID', hide: true }
			, { field: 'HBillNo', title: 'åæ®å·', hide: true }
			, { field: 'HMakerID', title: 'å¶åäººID', hide: true }
			, { field: 'HMaker', title: 'å¶åäºº', hide: true }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			]]
			, text: {
			none: 'ææ ç¸å³æ°æ®ï¼è¯·åæ«ææºåå·ï¼' //é»è®¤ï¼æ æ°æ®ãæ³¨ï¼è¯¥å±æ§ä¸º layui 2.2.5 å¼å§æ°å¢
			@@ -269,15 +276,15 @@
			, cellMinWidth: 90
			, cols: [[
			{ type: 'numbers', title: 'åºå·' }
			//, { field: 'HIsStatus', title: 'æ¯å¦æ«ç ' }
			, { field: 'HIsStatus', title: 'æ¯å¦æ«ç ' }
			, { field: 'HMTONo', title: 'æ¹å·' }
			, { field: 'HSPID', title: 'ä»ä½ID', hide: true }
			, { field: 'HSPName', title: 'ä»ä½', hide: true }
			, { field: 'HStatus', title: 'å¨åºç¶æ' }
			, { field: 'HWhID', title: 'ä»åºID', hide: true }
			, { field: 'HWhName', title: 'ä»åº', width: 130, hide: true }
			, { field: 'HSourceInterID', title: 'æºåID', hide: true }
			, { field: 'HSourceBillNo', title: 'æºåå·', width: 110 }
			, { field: 'HMTONo', title: 'æ¹å·', width: 180 }
			, { field: 'HStatus', title: 'å¨åºç¶æ', width: 165 }
			, { field: 'HWhID', title: 'ä»åºID', hide: true }
			, { field: 'HWhName', title: 'ä»åº' }
			, { field: 'HSPID', title: 'ä»ä½ID', hide: true }
			, { field: 'HSPName', title: 'ä»ä½' }
			, { field: 'HGroupID', title: 'çç»ID', hide: true }
			, { field: 'HGroup', title: 'çç»' }
			, { field: 'HSourceID', title: 'çäº§èµæºID', hide: true }
			@@ -308,8 +315,8 @@
			option2.data = [];
			table.render(option2);

			//è¿å¥é¡µé¢é»è®¤åæ å¨æºåå·ä¸
			$("#HBarCode").focus();
			//è¿å¥é¡µé¢é»è®¤åæ å¨ä»ä½ä¸
			$("#HSPName").focus();

			//æ«æºåï¼åè£åæ¡ç ï¼--å¼ç¨
			$('#HBarCode_Pack').on('keydown', function (event) {
			@@ -367,6 +374,7 @@
			$("#HSourceBillNo").attr("readonly", "readonly");//æºåå·åªè¯»
			$("#HSourceBillNo").css("background-color", "#efefef4d");
			element.tabChange('tab-LookingForBill', '2'); //è·³è½¬é¡µç¾
			$("#HSPName").focus();
			}
			else {
			layer.close(index);
			@@ -427,46 +435,82 @@

			//æ«å®ç©æ¡ç
			$('#HBarCode').on('keydown', function (event) {
			var HBarCode = $('#HBarCode').val()
			var HBarCode = $('#HBarCode').val();
			if (event.keyCode == 13) {
			var index = layer.load();
			$.ajax({
			url: GetWEBURL() + "/LookingFor/getBarCodeDetails",
			type: "GET",
			data: { "HBarCode": HBarCode },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			option2.data = data;
			table.render(option2);
			var sSubStr = table.cache['bzd-table2'];
			sSubStr[0].HSourceID = $("#HSourceID").val();
			sSubStr[0].HSource = $("#HSource").val();
			sSubStr[0].HGroupID = $("#HGroupID").val();
			sSubStr[0].HGroup = $("#HGroup").val();
			sSubStr[0].HInterID = $("#HInterID").val();
			sSubStr[0].HBillNo = $("#HBillNo").val();
			sSubStr[0].HMakerID = $("#HMakerID").val();
			sSubStr[0].HMaker = $("#HMaker").val();
			option2.data = table.cache["bzd-table2"];
			table.render(option2);
			if ($("#HSPID").val() == 0) {
			layer.msg("è¯·åæ«æä»ä½ç !", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			else
			{
			var index = layer.load();
			$.ajax({
			url: GetWEBURL() + "/LookingFor/getBarCodeDetails",
			type: "GET",
			data: { "HBarCode": HBarCode },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var sSubStr = result.data;
			var tableStr = table.cache['bzd-table2'];
			for (var i = 0; i < tableStr.length; i++) {
			if (tableStr[i].HBarCode == sSubStr[0].HBarCode) {
			layer.close(index);
			$('#HBarCode').val("");
			layer.msg("è¯¥å®ç©å·²æ«ç ï¼è¯·å¿éå¤æ«ç ", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			}
			var last = tableStr.length;
			//if (tableStr.length >0 && tableStr[i-1].HBarCode == sSubStr[0].HBarCode) {
			// layer.close(index);
			// $('#HBarCode').val("");
			// layer.msg("è¯¥å®ç©å·²æ«ç ï¼è¯·å¿éå¤æ«ç ", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			//}
			//else if (sSubStr[i].HStatus == null \|\| sSubStr[i].HStatus == "" \|\| sSubStr[i].HStatus == "å¨åº")
			//{
			// layer.close(index);
			// layer.msg("è¯¥å®ç©å¨" + sSubStr[i].HWhName + "-" + sSubStr[i].HSPName+"ï¼ä¸åè®¸æ«ç ", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			//}
			//else {
			//var data = result.data;
			option2.data.push(sSubStr[0]);
			table.render(option2);
			sSubStr = table.cache['bzd-table2'];
			sSubStr[last].HIsStatus = "æ¯";
			sSubStr[last].HSourceID = $("#HSourceID").val();
			sSubStr[last].HSource = $("#HSource").val();
			sSubStr[last].HGroupID = $("#HGroupID").val();
			sSubStr[last].HGroup = $("#HGroup").val();
			sSubStr[last].HInterID = $("#HInterID").val();
			sSubStr[last].HBillNo = $("#HBillNo").val();
			sSubStr[last].HMakerID = $("#HMakerID").val();
			sSubStr[last].HMaker = $("#HMaker").val();
			sSubStr[last].HSPName = $("#HSPName").val();
			sSubStr[last].HSPID = $("#HSPID").val();
			sSubStr[last].HWHID = $("#HWHID").val();
			sSubStr[last].HWhName = $("#HWHName").val();
			option2.data = table.cache["bzd-table2"];
			table.render(option2);
			layer.close(index);
			$('#HBarCode').val("");
			layer.msg("æ«ç æåï¼", { icon: 1, time: 1000 });
			//}
			//}

			}
			else {
			option2.data = [];
			table.render(option2);
			layer.close(index);
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.close(index);
			$('#HBarCode').val("");
			layer.close(index);
			layer.msg("æ«ç æåï¼", { icon: 1, time: 1000 });
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			else {
			option2.data = [];
			table.render(option2);
			layer.close(index);
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.close(index);
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			});
			}
			}
			});

			@@ -544,31 +588,22 @@

			//æäº¤
			form.on('submit(Saver)', function (data) {//æäº¤
			//debugger;
			//var sMainStr = JSON.stringify(data.field);
			var tableData = table.cache['bzd-table2'];
			//for (var i = 0; i < tableData.length; i++) {
			// if (tableData[i].HIsStatus == "æ¯" ) {

			// } else {
			// //ç§»é¤å½åè¡
			// tableData.splice(i, 1);
			// i--;
			// option.data = tableData;
			// table.render(option);
			// }
			//}
			var sSubStr = JSON.stringify(tableData);
			sSubStr = "{\"oSub\": " + sSubStr + "}";
			//sSubStr = JSON.stringify(sSubStr);
			//var json = "{\"oMain\":" + sMainStr + "},{\"oMain\":" + sSubStr + "}";
			if (AllowLoadData(sSubStr, 'Saver') != false)//éç©ºéªè¯
			{
			//å¤æä¸æ¶åºä½æ¯å¦ä¸æ¡ç ä¸åºä½ä¸è´
			//var tableData = table.cache['bzd-table2'];
			//if ($("#HWHID").val() != tableData[0].HWhID \|\| $("#HSPID").val() != tableData[0].HSPID) {
			// layer.msg("å½ååºä½ä¸å®éä¸ç¬¦ï¼", { icon: 4, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			var index = layer.load();
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/LookingFor/set_SaveLookingForReturnBill_Json",
			url: GetWEBURL() + "/LookingFor/set_SaveLookingForReturnBill_Json",
			//url:"http://localhost:12761/LookingFor/set_SaveLookingForReturnBill_Json",
			async: true,
			data: { "oMain": sSubStr },
			@@ -607,20 +642,46 @@
			}
			});


			//æ«ä¸æ¶ä»ä½
			$('#HSPName').on('keydown', function (event) { //æ«ä»ä½
			var HBarCode = $('#HSPName').val()
			var HBarCode = $('#HSPName').val();
			if (event.keyCode == 13) {
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			$.ajax({
			url: GetWEBURL() + "/Web/GetSpName_Json",
			url: GetWEBURL() + "/LookingFor/getSpName_Json",
			type: "GET",
			data: { "HBarCode": HBarCode },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			//var tableData = table.cache['bzd-table2'];
			//if (tableData.length == 0) {
			// layer.msg("è¯·åæ«å®ç©æ¡ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if (result.data[0].HWHID != tableData[0].HWhID \|\| result.data[0].HItemID != tableData[0].HSPID) {
			// layer.msg("æ¤åºä½ä¸å®éä¸ç¬¦ï¼", { icon: 4, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			//} else {
			$("#HSPName").val(result.data[0].HName);
			$("#HSPID").val(result.data[0].HItemID);
			element.tabChange('tab-POStockInBill', '2');
			$("#HWHID").val(result.data[0].HWHID);
			$("#HWHName").val(result.data[0].HWhName);
			//å¯ç¨mesä»ä½ï¼æ ¹æ®èä»åºè½¬æ¢ææ°ä»åº
			$.ajax({
			url: GetWEBURL() + "/LookingFor/GetSpNameMES_Json",
			type: "GET",
			data: { "HERPWHID": $("#HWHID").val() },
			success: function (result) {
			if (result.count == 1) {
			$("#HWhID").val(result.data[0].HMESWHID);
			$("#HWHName").val(result.data[0].HMESWHNAME);
			$("#HBarCode").focus();
			}
			else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			}
			});
			}
			else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			@@ -655,6 +716,10 @@
			}
			});




			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});

			//è¿åä»åº
			@@ -724,9 +789,6 @@
			}
			}
			}
			}
			else {
			return true;
			}
			}
			</script>