MES-WEB-LayUI.git

			@@ -231,7 +231,7 @@
			var HMainEntryRow = 1;//åæ®å·åç¼
			var HqtyBill = 0;//è¿ç«åæ®æ°é




			//åå§è¡¨æ ¼æ°æ®
			var option1 = {
			@@ -394,10 +394,10 @@
			var rowIndex = $(obj.tr).attr("data-index");
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			obj.del();
			option1.data = table.cache["mainTable1"];//å°æ°æ®ç»å®å°dataä¸
			table.reload(option1);
			layer.close(index);
			obj.del();
			option1.data = table.cache["mainTable1"];//å°æ°æ®ç»å®å°dataä¸
			table.reload(option1);
			layer.close(index);
			});
			}
			if (obj.event === 'edit') {
			@@ -648,7 +648,19 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpNumber1").val(checkStatus.data[0].èåä»£ç );
			$("#HEmpName1").val(checkStatus.data[0].èååç§°);
			$("#HEmpID1").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, resize: false
			, cancel: function (index, layero) {
			}
			@@ -662,7 +674,19 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker2', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpNumber2").val(checkStatus.data[0].èåä»£ç );
			$("#HEmpName2").val(checkStatus.data[0].èååç§°);
			$("#HEmpID2").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, resize: false
			, cancel: function (index, layero) {
			}
			@@ -676,7 +700,19 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker3', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpNumber3").val(checkStatus.data[0].èåä»£ç );
			$("#HEmpName3").val(checkStatus.data[0].èååç§°);
			$("#HEmpID3").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, resize: false
			, cancel: function (index, layero) {
			}
			@@ -690,7 +726,19 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker4', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpNumber4").val(checkStatus.data[0].èåä»£ç );
			$("#HEmpName4").val(checkStatus.data[0].èååç§°);
			$("#HEmpID4").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, resize: false
			, cancel: function (index, layero) {
			}
			@@ -704,7 +752,19 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker5', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpNumber5").val(checkStatus.data[0].èåä»£ç );
			$("#HEmpName5").val(checkStatus.data[0].èååç§°);
			$("#HEmpID5").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, resize: false
			, cancel: function (index, layero) {
			}
			@@ -718,7 +778,19 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker6', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpNumber6").val(checkStatus.data[0].èåä»£ç );
			$("#HEmpName6").val(checkStatus.data[0].èååç§°);
			$("#HEmpID6").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, resize: false
			, cancel: function (index, layero) {
			}
			@@ -732,7 +804,19 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker7', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpNumber7").val(checkStatus.data[0].èåä»£ç );
			$("#HEmpName7").val(checkStatus.data[0].èååç§°);
			$("#HEmpID7").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, resize: false
			, cancel: function (index, layero) {
			}
			@@ -746,13 +830,25 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker8', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpNumber8").val(checkStatus.data[0].èåä»£ç );
			$("#HEmpName8").val(checkStatus.data[0].èååç§°);
			$("#HEmpID8").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, resize: false
			, cancel: function (index, layero) {
			}
			})
			});



			//#region æ«æ¡å½¢ç (æµè½¬å¡)
			$('#HBarCode').on('keydown', function (event) {
			@@ -834,7 +930,7 @@

			//var sSubStr = JSON.stringify(num);

			var HEmpName1 = $("#HEmpName1").val();
			var HEmpName1 = $("#HEmpName1").val();
			var HEmpName2 = $("#HEmpName2").val();
			var HEmpName3 = $("#HEmpName3").val();
			var HEmpName4 = $("#HEmpName4").val();
			@@ -854,8 +950,7 @@

			var HMaker = "";
			var HEmpNum = "";
			if (HEmpName1 != "")
			{
			if (HEmpName1 != "") {
			HMaker = HMaker + "," + HEmpName1;
			HEmpNum = HEmpNum + "," + HEmpNumber1;
			}
			@@ -898,20 +993,16 @@
			async: true,
			data: { "oMain": sSubStr },
			dataType: "json",
			success: function (result)
			{
			if (result.count == 1)
			{
			success: function (result) {
			if (result.count == 1) {
			layer.msg("æ«ç åºç«æåï¼");
			}
			else
			{
			else {
			layer.close(index);
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err)
			{
			error: function (err) {
			layer.close(index);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			@@ -932,7 +1023,7 @@
			//#endregion

			//#region è¡åäºä»¶


			//#endregion

			//#region æµæ°´å·åè½¦æ¹æ³
			@@ -1066,7 +1157,7 @@
			$.ajax({
			url: GetWEBURL() + '/Cj_StationOutBill/get_BarCodeDetail',
			type: "GET",
			data: { "HMainInterID": $("#HMainInterID").val()},
			data: { "HMainInterID": $("#HMainInterID").val() },
			success: function (data1) {
			if (data1.count == 1) {
			option1.data = data1.data;
			@@ -1095,7 +1186,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1105,7 +1196,8 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HMaterName").val(checkStatus.data[0].HNumber);
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -1276,7 +1368,7 @@

			//#endregion



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