~jhz/KaiShanLAYUI-invalid.git

			@@ -16,18 +16,18 @@
			<div class="layui-card-body" style="padding: 5px; height:800px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div style="background-color:#0085E8;">
			<span style="color: white;"><i class="layui-icon layui-icon-form"></i>æ¾è´§å</span>
			<span style="color: white;"><i class="layui-icon layui-icon-form"></i>ä¸æ¶æ¾è´§å</span>
			</div>
			<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">
			@@ -155,6 +155,13 @@
			, form = layui.form
			, element = layui.element;

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "../../user/login.html"; });
			}

			//åå§åºæ¬ä¿¡æ¯èµå¼
			$("#HWHID").val(sessionStorage["HWHID"]);
			$("#HWHName").val(sessionStorage["HWHName"]);
			@@ -173,7 +180,7 @@
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '1252' },
			data: { "HBillType": '1253' },
			success: function (d) {
			//console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			@@ -191,14 +198,14 @@
			, 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: 'å¨åºç¶æ' }
			, { field: 'HWhID', title: 'ä»åºID', hide: true }
			, { field: 'HWhName', title: 'ä»åº' }
			, { field: 'HSPID', title: 'ä»ä½ID', hide: true }
			, { field: 'HSPName', title: 'ä»ä½' }
			, { field: 'HStatus', title: 'å¨åºç¶æ', width: 165 }
			, { field: 'HWhID', title: 'ä»åºID', hide: true }
			, { field: 'HWhName', title: 'ä»åº' }
			, { 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 }
			@@ -210,11 +217,11 @@
			, { 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 å¼å§æ°å¢
			@@ -312,10 +319,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();
			@@ -445,15 +456,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 {