MES-WEB-LayUI.git

			@@ -65,7 +65,7 @@
			</div>
			<div class="layui-col-xs10">
			<div class="layui-col-xs10">
			<input type="text" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d?\.?\d?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="number" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d?\.?\d?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" style="float: right " lay-filter="cmdAdd" class="layui-btn" id="cmdAdd">æ·»å </button>
			@@ -151,12 +151,22 @@
			console.log("playSound");
			var audio = document.getElementById("cs");
			audio.play();
			audio.onended = function () {
			// å½é³é¢ææ¥å®ææ¶ï¼è°ç¨ pause åè®¾ç½® currentTime ä¸º 0 ä»¥åæ¢ææ¥å¹¶éç½®
			audio.pause();
			audio.currentTime = 0;
			};
			}
			//æåæç¤ºé³
			function playSound_OK() {
			console.log("playSound_OK");
			var audio = document.getElementById("cs2");
			audio.play();
			audio.onended = function () {
			// å½é³é¢ææ¥å®ææ¶ï¼è°ç¨ pause åè®¾ç½® currentTime ä¸º 0 ä»¥åæ¢ææ¥å¹¶éç½®
			audio.pause();
			audio.currentTime = 0;
			};
			}

			//#region åå§åçé¢
			@@ -167,7 +177,7 @@
			set_InitGrid(); //åå§åè¡¨æ ¼

			//åæ é»è®¤å¨æ¡ç ä½ç½®ä¸
			var pFocus = $("#HBarCode");
			var pFocus = $("#HQty");
			pFocus.focus(); //è·ååæ
			pFocus.select();
			}
			@@ -178,6 +188,7 @@
			listOption = {
			elem: '#wl-table'
			//, toolbar: '#toolbarDemo'
			, page: true
			, totalRow: true
			, height: 'full-50'
			, cellMinWidth: 90
			@@ -185,7 +196,7 @@
			};
			}

			//#region ä»ç¼ååè¡¨ä¸è¿åä¿¡æ¯
			//#region ä»æ«ç æ¨¡åè·³è½¬è¿åä¿¡æ¯
			function getUrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			@@ -209,10 +220,19 @@

			//#endregion

			//å¤ææ¯å¦æ°å¢ï¼è·åæå¤§åæ®å·
			if (HInterID != 0) {
			$("#HBarCode").select();
			$("#HBarCode").focus(); //è·ååæ
			//è¿åç©æä¿¡æ¯
			$("#HBarCode").val(HMaterID);
			var sBarCode = $('#HBarCode').val()
			if (sBarCode == 0) {
			$('#HBarCode').val("");
			$("#HBarCode").select();
			$("#HBarCode").focus(); //è·ååæ
			}
			else {
			GetBarCode();
			$("#HQty").focus(); //è·ååæ
			}
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			}
			@@ -222,9 +242,7 @@
			return;
			}


			//#endregion



			//#region åè½æ§ä»¶
			@@ -258,11 +276,11 @@
			layer.msg(data.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			layer.close(index)
			layer.closeAll("loading");
			})
			}
			@@ -289,8 +307,8 @@
			//æ«ææ¡ç
			$('#HBarCode').on('keydown', function (event) {
			if (event.keyCode == 13) {
			layer.load(3)
			GetBarCode();
			$("#HQty").select();
			$("#HQty").focus(); //è·ååæ
			layer.closeAll("loading");
			}
			@@ -298,8 +316,8 @@

			//æ¡ç æé®
			form.on('submit(HBarCode-BT)', function (data) {
			layer.load(3)
			GetBarCode();
			$("#HQty").select();
			$("#HQty").focus(); //è·ååæ
			layer.closeAll("loading");
			});
			@@ -309,9 +327,15 @@
			var sBarCode = $('#HBarCode').val()
			if (sBarCode == '') {
			playSound();
			layer.msg("æ¡ç ä¸ºç©ºï¼è¯·æ«ææ¡ç ï¼", { icon: 0, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æ¡ç ä¸ºç©ºï¼è¯·æ«ææ¡ç ï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			return;
			}
			layer.load(3)
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/WEBSController/GetBarCode_Json",
			@@ -329,14 +353,26 @@
			}
			else {
			playSound();
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg(result.Message, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			playSound();
			layer.msg("éè¯¯ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("éè¯¯ï¼" + err, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			}
			});
			layer.closeAll("loading");
			}

			//#endregion
			@@ -345,9 +381,7 @@

			//æ·»å æé®
			form.on('submit(cmdAdd)', function (data) {
			layer.load(3)
			GetMeesageByBarCode();
			layer.closeAll("loading");
			});

			//å°æ¡ç ä¿¡æ¯åå¥æ¡ç ä¸´æ¶è¡¨
			@@ -356,14 +390,25 @@
			var sBarCode = $('#HBarCode').val()
			if (sBarCode == '') {
			playSound();
			layer.msg("æ¡ç ä¸ºç©ºï¼è¯·æ«ææ¡ç ï¼", { icon: 0, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æ¡ç ä¸ºç©ºï¼è¯·æ«ææ¡ç ï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			return;
			}
			if (sHQty == "" \|\| sHQty ==0) {
			if (sHQty == "" \|\| sHQty <= 0 \|\| sHQty > 100) {
			playSound();
			layer.msg("æ°éä¸åè®¸å°äº0ï¼è¯·è¾å¥æ°éï¼", { icon: 0, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æ°éä¸åè®¸å°äº0ï¼å¤§äº100ï¼è¯·éæ°è¾å¥æ°éï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HQty").select();
			$("#HQty").focus();
			});
			return;
			}
			layer.load(3)
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
			@@ -374,19 +419,33 @@
			playSound_OK();
			//æ¸ç©ºæ°é
			$("#HQty").val("");
			$("#HQty").select();
			$("#HQty").focus();
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			}
			else {
			playSound();
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg(result.Message, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			playSound();
			layer.msg("éè¯¯ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("éè¯¯ï¼" + err, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			});
			}
			});
			layer.closeAll("loading");
			}

			//#endregion
			@@ -398,7 +457,7 @@
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/WEBSController/GetBarCodeByMaterID_Temp_Json',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			async: true, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": HInterID, "HBillType": HBillType, "HMaterID": HMaterID },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			@@ -416,7 +475,7 @@
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			col.push({ type: 'radio', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			@@ -429,7 +488,7 @@
			break;
			default:

			if (data[i].name == 'æ°é' \|\| data[i].name == 'æ¡ç ä¸ªæ°') {
			if (data[i].name == 'ç±³æ°' \|\| data[i].name == 'ä»¶æ°') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
			}
			else {
			@@ -439,17 +498,6 @@
			}
			}
			columns = col;

			////è®¾ç½®èµå¼åå®½
			//var colWidth = getColumnsWidth();
			//if (colWidth == "" \|\| colWidth == []) {

			//}
			//else {
			// $.each(columns, function (x, m) {
			// m["width"] = colWidth[x];
			// });
			//}
			listOption.cols = [columns];
			listOption.data = result.data;
			listOption.totalRow = true;
			@@ -463,38 +511,10 @@
			//layer.msg(result.Message);
			//layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			}

			//#region è·ååå®½
			function getColumnsWidth() {
			var result = [];
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			//è·ååå®½
			$.ajax({
			type: "Get",
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
			async: false,
			dataType: "json",
			data: { "colNum": colNum, "Name": HModName },
			success: function (data1) {
			if (data1.code == 1) {
			result = data1.data;
			}
			else if (data1.code == -1) {

			}
			else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			return result;
			}
			//#endregion

			//#endregion