MES-WEB-LayUI.git

			@@ -423,7 +423,7 @@
			}
			else {
			layer.msg(d.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () { parent.location.href = "../../../views/index_Mobile.html"; });
			}
			},
			@@ -530,7 +530,7 @@
			, totalRow: true
			, height: 'full-60'
			, cellMinWidth: 90
			, limit: 50
			, limit: 200
			};
			}

			@@ -543,6 +543,32 @@
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			})
			//#endregion

			//#region çå¬ç½æ ¼è¡¨ä½äºä»¶
			table.on('tool(wl-table)', function (obj) {
			var data = obj.data;

			//ç©æä»£ç è¶é¾æ¥
			if (obj.event == 'ç©æä»£ç ') { //æ£æ¥ obj.event æ¯å¦çäºåç¬¦ä¸² 'ç©æä»£ç 'ãå¦æçäºï¼åæ§è¡ifå¾ªç¯
			var HMaterNumber = data.ç©æä»£ç .toString(); //å£°æåéHMaterNumber ä¸º data.ç©æä»£ç
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			type: 2 //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe
			, area: ['100%', '100%']
			, title: 'åæ¶åºåä¿¡æ¯' //è®¾ç½®å¼¹åºå±çååååé
			, closeBtn: 1 //æ¾ç¤ºå³éæé®
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../WMSæ«ç æ¨¡å/åºåæ¥è¯¢/KF_ICInventoryByCLD_PDA.html?OperationType=2&HMaterNumber=' + HMaterNumber //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼
			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			}
			, cancel: function () { //ç¹å»åæ¶æ¶ä½¿ç¨åè°
			}
			})
			}
			});
			//#endregion

			//å¤ææ¯å¦æ°å¢ï¼è·åæå¤§åæ®å·
			if (HInterID != 0) {
			@@ -573,7 +599,7 @@
			HBillNo = $('#HBillNo').val()
			}
			else {
			layer.msg(d.Message, { icon: 0, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg(d.Message, { icon: 0, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			@@ -661,7 +687,7 @@
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			layer.msg("ä»åºæ¡ç ä¸ºç©ºï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HWHName").select();
			$("#HWHName").focus();
			@@ -702,7 +728,7 @@
			$("#HStockPlaceName").removeAttr("disabled");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			layer.msg(result.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HWHName").select();
			$("#HWHName").focus();
			@@ -751,7 +777,7 @@
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			layer.msg("ä»ä½æ¡ç ä¸ºç©ºï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HStockPlaceName").select();
			$("#HStockPlaceName").focus();
			@@ -782,7 +808,7 @@
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			layer.msg(result.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HStockPlaceName").select();
			$("#HStockPlaceName").focus();
			@@ -828,7 +854,7 @@
			$("#HKeeperID").val("0");
			$("#HKeeperName").val("");
			layer.msg("ä¿ç®¡åæ¡ç ä¸ºç©ºï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HKeeperName").select();
			$("#HKeeperName").focus();
			@@ -856,7 +882,7 @@
			$("#HKeeperID").val("0");
			$("#HKeeperName").val("");
			layer.msg(result.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HKeeperName").select();
			$("#HKeeperName").focus();
			@@ -898,7 +924,7 @@
			$("#HSecManagerID").val("0");
			$("#HSecManagerName").val("");
			layer.msg("éªæ¶åæ¡ç ä¸ºç©ºï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HSecManagerName").select();
			$("#HSecManagerName").focus();
			@@ -926,7 +952,7 @@
			$("#HSecManagerID").val("0");
			$("#HSecManagerName").val("");
			layer.msg(result.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HSecManagerName").select();
			$("#HSecManagerName").focus();
			@@ -968,7 +994,7 @@
			$("#HDeptID").val("0");
			$("#HDeptName").val("");
			layer.msg("é¨é¨æ¡ç ä¸ºç©ºï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HDeptName").select();
			$("#HDeptName").focus();
			@@ -996,7 +1022,7 @@
			$("#HDeptID").val("0");
			$("#HDeptName").val("");
			layer.msg(result.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HDeptName").select();
			$("#HDeptName").focus();
			@@ -1038,7 +1064,7 @@
			$("#HSupID").val("0");
			$("#HSupName").val("");
			layer.msg("ä¾åºåæ¡ç ä¸ºç©ºï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HSupName").select();
			$("#HSupName").focus();
			@@ -1066,7 +1092,7 @@
			$("#HSupID").val("0");
			$("#HSupName").val("");
			layer.msg(result.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HSupName").select();
			$("#HSupName").focus();
			@@ -1161,12 +1187,12 @@
			});//æ°å¢
			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', 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.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			layer.closeAll("loading");
			@@ -1238,12 +1264,12 @@
			}
			else {
			playSound();
			layer.msg(data.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg(data.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', 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.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			layer.closeAll("loading");
			@@ -1366,7 +1392,7 @@
			else {
			playSound();
			layer.msg(result.Message, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			element.tabChange('tab-Kf_EntrustInBill_PDA', '1');
			$("#HSourceBillNo").select();
			@@ -1422,7 +1448,7 @@
			if (sBarCode == "") {
			playSound();
			layer.msg("è¯·æ«æè¦å é¤çæ¡ç ", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1451,7 +1477,7 @@
			else {
			playSound();
			layer.msg(data.Message, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1462,7 +1488,7 @@
			error: function (err) {
			playSound();
			layer.msg('éè¯¯' + err, {
			icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1476,7 +1502,7 @@
			if (sBarCode == '') {
			playSound();
			layer.msg("æ¡ç ä¸ºç©ºï¼è¯·æ«ææ¡ç ï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1626,7 +1652,7 @@
			else {
			playSound();
			layer.msg(result.Message, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1637,7 +1663,7 @@
			error: function (err) {
			playSound();
			layer.msg("éè¯¯ï¼" + err, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1679,19 +1705,26 @@
			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å
			}
			else {
			} else if (data[i].name == 'ç©æä»£ç ') {
			col.push({
			field: data[i].id, title: data[i].name, align: 'left', sort: true, width: 120, event: 'ç©æä»£ç ', event: 'ç©æä»£ç ', templet: function (d) {
			return '<span style="color: blue;">' + d.ç©æä»£ç + '</span>'
			}, style: 'cursor: pointer;'
			});
			} else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			default:

			if (data[i].name == 'æ°é' \|\| data[i].name == 'æºåæ°é' \|\| data[i].name == 'æ¡ç ä¸ªæ°') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
			col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
			} else if (data[i].name == 'ç©æåç§°' \|\| data[i].name == 'è§æ ¼åå·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center' });
			col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
			}
			}
			}
			@@ -1831,15 +1864,15 @@
			//åæ®ä¸ä¼ åå¤æ
			function AllowLoadData(sSubStr) {
			if (HInterID == 0) {
			layer.msg("åæ®åç è·åå¤±è´¥ï¼éè¯¯çåæ®åç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("åæ®åç è·åå¤±è´¥ï¼éè¯¯çåæ®åç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			if (HBillNo == '') {
			layer.msg("åæ®å·è·åå¤±è´¥ï¼éè¯¯çåæ®å·ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("åæ®å·è·åå¤±è´¥ï¼éè¯¯çåæ®å·ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			if (sSubStr.length == 0) {
			layer.msg("æ²¡ææ«ç ä¿¡æ¯ï¼è¯·åæ«ææ¡ç ï¼ç¡®è®¤æ è¯¯ååæäº¤ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æ²¡ææ«ç ä¿¡æ¯ï¼è¯·åæ«ææ¡ç ï¼ç¡®è®¤æ è¯¯ååæäº¤ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			//å¤ææ¯å¦å·²æ«æç©ææ¡ç
			@@ -1851,7 +1884,7 @@
			}
			}
			if (s == 0) {
			layer.msg("æ²¡ææ«æç©ææ¡ç ï¼è¯·åæ«æç©ææ¡ç ï¼ç¡®è®¤æ è¯¯ååæäº¤ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æ²¡ææ«æç©ææ¡ç ï¼è¯·åæ«æç©ææ¡ç ï¼ç¡®è®¤æ è¯¯ååæäº¤ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			}