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">
			@@ -21,13 +21,13 @@
			<div class="layui-form-item" style="padding:15px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:90px;padding-left:0px;">æºåå·</label>
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æºåå·</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:90px;padding-left:0px;">å®ç©æ¡ç </label>
			<label class="layui-form-label" style="width:60px;padding-left:0px;">å®ç©æ¡ç </label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input">
			@@ -45,6 +45,7 @@
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;display:none">è¡¨å¤´ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;" class="layui-this">æç»ä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">å·²æ«ä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--è¡¨å¤´ä¿¡æ¯-->
			@@ -121,6 +122,10 @@
			<div class="layui-tab-item layui-show">
			<table class="layui-hide" id="bzd-table" lay-filter="bzd-table"></table>
			</div>
			<!--å·²æ«ä¿¡æ¯-->
			<div class="layui-tab-item">
			<table class="layui-hide" id="bzd-table2" lay-filter="bzd-table2"></table>
			</div>
			</div>
			</div>
			<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
			@@ -159,7 +164,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"; });
			}

			//åå§åºæ¬ä¿¡æ¯èµå¼
			@@ -173,6 +178,14 @@
			$("#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("");
			@@ -195,17 +208,18 @@
			, page: true
			//, height: 256
			, cellMinWidth: 90
			, limit: 500
			, cols: [[
			{ type: 'numbers', title: 'åºå·' }
			, { field: 'HIsStatus', title: 'æ¯å¦æ«ç ' }
			, { field: 'HSourceInterID', title: 'æºåID', hide: true }
			, { field: 'HSourceBillNo', title: 'æºåå·', width: 110 }
			, { field: 'HMTONo', title: 'æ¹å·', width: 180 }
			, { field: 'HSPID', title: 'ä»ä½ID', hide: true }
			, { field: 'HSPName', title: 'ä»ä½', hide: true }
			, { field: 'HStatus', title: 'å¨åºç¶æ', width: 165 }
			, { field: 'HWhID', title: 'ä»åºID', hide: true }
			, { field: 'HWhName', title: 'ä»åº' }
			, { field: 'HSPID', title: 'ä»ä½ID', hide: true }
			, { field: 'HSPName', title: 'ä»ä½' }
			, { field: 'HWhName', title: 'ä»åº', width: 130, hide: true }
			, { 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 }
			@@ -217,20 +231,64 @@
			, { field: 'HMaterModel', title: 'è§æ ¼åå·' }
			, { field: 'å³æ¶åºå', title: 'å³æ¶åºå' }
			, { field: 'HBarCode', title: 'æ¡ç ç¼å·', hide: true }
			, { field: 'HInterID', title: 'åæ®ID' }
			, { field: 'HInterID', title: 'åæ®ID', hide: true }
			, { field: 'HBillNo', title: 'åæ®å·' }
			, { field: 'HMakerID', title: 'å¶åäººID' }
			, { field: 'HMakerID', title: 'å¶åäººID', hide: true }
			, { field: 'HMaker', title: 'å¶åäºº' }
			, { field: 'HBillType', title: 'HBillType' }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			]]
			, text: {
			none: 'ææ ç¸å³æ°æ®ï¼è¯·åæ«ææºåå·ï¼' //é»è®¤ï¼æ æ°æ®ãæ³¨ï¼è¯¥å±æ§ä¸º layui 2.2.5 å¼å§æ°å¢
			}
			};

			//ä¸»è¡¨åè¡¨-å·²æ«ä¿¡æ¯
			var option2 = {
			elem: '#bzd-table2'
			//, toolbar: '#toolbarDemo'
			, page: true
			//, height: 256
			, cellMinWidth: 90
			, limit: 500
			, cols: [[
			{ type: 'numbers', title: 'åºå·' }
			, { field: 'HIsStatus', title: 'æ¯å¦æ«ç ' }
			, { field: 'HMTONo', title: 'æ¹å·', width: 180 }
			, { field: 'HSPID', title: 'ä»ä½ID', hide: true }
			, { field: 'HSPName', title: 'ä»ä½', hide: true }
			, { field: 'HStatus', title: 'å¨åºç¶æ', width: 165 }
			, { 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: 'HGroupID', title: 'çç»ID', hide: true }
			, { field: 'HGroup', title: 'çç»' }
			, { field: 'HSourceID', title: 'çäº§èµæºID', hide: true }
			, { field: 'HSource', title: 'çäº§èµæº', width: 115, templet: '#sexTpl' }
			, { field: 'HQty', title: 'æ°é' }
			, { field: 'HMaterID', title: 'ç©æID', hide: true }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 120 }
			, { field: 'HMaterNumber', title: 'ç©æç¼ç ' }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·' }
			, { field: 'å³æ¶åºå', title: 'å³æ¶åºå' }
			, { field: 'HBarCode', title: 'æ¡ç ç¼å·', hide: true }
			, { field: 'HInterID', title: 'åæ®ID', hide: true }
			, { field: 'HBillNo', title: 'åæ®å·' }
			, { field: 'HMakerID', title: 'å¶åäººID', hide: true }
			, { field: 'HMaker', title: 'å¶åäºº' }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			]]
			, text: {
			none: 'ææ ç¸å³æ°æ®ï¼è¯·åæ«æå®ç©æ¡ç ï¼' //é»è®¤ï¼æ æ°æ®ãæ³¨ï¼è¯¥å±æ§ä¸º layui 2.2.5 å¼å§æ°å¢
			}
			};

			//åå§å è½½è¡¨æ ¼
			option.data = [];
			table.render(option);

			option2.data = [];
			table.render(option2);

			//è¿å¥é¡µé¢é»è®¤åæ å¨æºåå·ä¸
			$("#HSourceBillNo").focus();
			@@ -285,9 +343,9 @@
			rowFlage += i + 1 + ",";
			}
			}
			if (rowFlage) {
			layer.msg("ç¬¬" + rowFlage + "è¡æ°æ®æ æ¡ç ï¼è¯·åçææ¡ç ï¼", { icon: 5, btn: ['æå·²ç¥æ'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			//if (rowFlage) {
			// layer.msg("ç¬¬" + rowFlage + "è¡æ°æ®æ æ¡ç ï¼è¯·åçææ¡ç ï¼", { icon: 5, btn: ['æå·²ç¥æ'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			//}
			$("#HSourceBillNo").attr("readonly", "readonly");//æºåå·åªè¯»
			$("#HSourceBillNo").css("background-color", "#efefef4d");
			element.tabChange('tab-LookingForBill', '2'); //è·³è½¬é¡µç¾
			@@ -305,6 +363,7 @@
			}
			});

			var data = new Object();
			//æ«å®ç©æ¡ç
			$('#HBarCode').on('keydown', function (event) {
			var HBarCode = $('#HBarCode').val()
			@@ -319,10 +378,14 @@
			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("è¯¥å®ç©å¨è£åä¸ï¼ä¸åè®¸æ«ç ", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			} else {
			}
			//else if (sSubStr[i].HStatus != null && sSubStr[i].HStatus != "" && sSubStr[i].HStatus != "å¨åº")
			//{
			// layer.close(index);
			// layer.msg("è¯¥å®ç©å¨" + sSubStr[i].HSource+"è£åä¸ï¼ä¸åè®¸æ«ç ", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			//}
			else
			{
			sSubStr[i].HIsStatus = "æ¯";
			sSubStr[i].HSourceID = $("#HSourceID").val();
			sSubStr[i].HSource = $("#HSource").val();
			@@ -334,15 +397,20 @@
			sSubStr[i].HMaker = $("#HMaker").val();
			option.data = table.cache["bzd-table"];
			table.render(option);
			layer.close(index);
			$('#HBarCode').val("");
			//å¨æè·åå·²æ«ç è®°å½å¹¶æ·»å å°å·²æ«ä¿¡æ¯ä¸
			table.cache["bzd-table2"].push(sSubStr[i]);
			option2.data = table.cache["bzd-table2"];
			table.render(option2);
			element.tabChange('tab-LookingForBill', '3');//è·³è½¬é¡µç¾
			layer.close(index);
			layer.msg("æ«ç æåï¼", { icon: 1, time: 1000 });
			}
			}
			}
			if (rowCount == 0) {
			layer.close(index);
			layer.msg("æ ææ¡ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æ¨æ«çæ¡ç ä¸å¨æ¾è´§æ¸åä¸ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}


			@@ -425,18 +493,18 @@
			form.on('submit(Saver)', function (data) {//æäº¤
			//debugger;
			//var sMainStr = JSON.stringify(data.field);
			var tableData = table.cache['bzd-table'];
			for (var i = 0; i < tableData.length; i++) {
			if (tableData[i].HIsStatus == "æ¯" ) {
			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);
			}
			}
			// } else {
			// //ç§»é¤å½åè¡
			// tableData.splice(i, 1);
			// i--;
			// option.data = tableData;
			// table.render(option);
			// }
			//}
			var sSubStr = JSON.stringify(tableData);
			sSubStr = "{\"oSub\": " + sSubStr + "}";
			//sSubStr = JSON.stringify(sSubStr);
			@@ -452,15 +520,15 @@
			async: true,
			data: { "oMain": sSubStr },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			layer.confirm(data.Message, {
			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"
			}//å³é
			success: function (result) {
			if (result.count == 1) {
			layer.confirm(result.Message, {
			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 {