~jhz/KaiShanLAYUI-invalid.git

			@@ -70,7 +70,7 @@
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»åº</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
			<input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" readonly>
			<input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			@@ -88,7 +88,7 @@
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
			</div>
			</div>
			</div>
			@@ -253,6 +253,7 @@
			$("#HMakerID").hide();
			$("#HBillerID").val(sessionStorage["HBillerID"]);
			$("#HBillerID").hide();
			var HSourceFlag = sessionStorage["SourceFlag"];
			//é»è®¤å¸¦å¥çä»åºï¼å¦æå¯ç¨ä»ä½åä»ä½ææï¼å¦ææ²¡æå¯ç¨åä»ä½ç°åº¦ new

			$("#HBarCode").focus();
			@@ -268,6 +269,14 @@
			}
			return vars;
			}

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

			var params = getUrlVars();
			var linterid = params[params[0]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å
			@@ -465,7 +474,7 @@
			});

			form.on('submit(Cancel)', function () {
			sessionStorage["SourceFlag"] = false;
			//sessionStorage["SourceFlag"] = false;
			parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			})
			@@ -621,7 +630,7 @@
			//url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
			success: function (result) {
			debugger;
			if (result.count == 1) {
			@@ -652,7 +661,7 @@
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			//if (result.data.HSourceBillType == "3711") {
			// $("#HBillType").val("3711");
			@@ -664,7 +673,7 @@
			element.tabChange('tab-ProductlnBill', '3');
			}
			else {
			if (sessionStorage["SourceFlag"] == "true") {
			if (HSourceFlag == "true") {
			element.tabChange('tab-ProductlnBill', '3');
			}
			else {
			@@ -673,7 +682,7 @@
			//$("#HDeptName").val(result.data.HDept);
			//$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			//if (result.data.HSourceBillType == "3711") {
			// $("#HBillType").val("3711");
			@@ -694,28 +703,28 @@
			layer.load(3)
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			, url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			, url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			}
			else {
			@@ -755,7 +764,7 @@
			data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			layer.load(3)
			element.tabChange('tab-ProductlnBill', '2');
			table.render({
			@@ -798,7 +807,7 @@
			if (event.keyCode == 13) {
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			$.ajax({
			url: GetWEBURL() + "/Web/GetSpName_Json",
			url: GetWEBURL() + "/LookingFor/getSpName_Json",
			type: "GET",
			data: { "HBarCode": HBarCode },
			success: function (result) {