MES-WEB-LayUI.git

			@@ -62,13 +62,26 @@
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">åæ®ç±»å</label>
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æºåç±»å</label>
			</div>
			<div class="layui-col-xs8">
			<select name=" HBillType" id="HBillType">
			<option value="1402">åè´§éç¥å</option>
			<option value="1401">éå®è®¢å</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<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" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">ç¡®å®</button>
			</div>
			</div>
			</div>
			@@ -90,7 +103,7 @@
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">åè¿ååºä»åº</label>
			<label class="layui-form-label" style="width:60px;padding-left:0px;">åè¿ååºä»åº</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HWHNAME_FIFO" id="HWHNAME_FIFO" lay-verify="HWHNAME_FIFO" autocomplete="off" class="layui-input">
			@@ -104,13 +117,10 @@
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;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" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">ç¡®å®</button>
			<input type="date" name="HDate" id="HDate" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			@@ -332,10 +342,9 @@
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, laydate = layui.laydate
			, element = layui.element;



			var HStockOrgID = sessionStorage["OrganizationID"]
			var option = [];

			//æºåæ¾è´§åè¡¨
			@@ -380,8 +389,21 @@
			$("#HMakerID").hide();
			$("#HBillerID").val(sessionStorage["HBillerID"]);
			$("#HBillerID").hide();
			$("#HDate").val(formatDate(sessionStorage["HDate"]));
			var HSourceFlag = sessionStorage["SourceFlag"];

			// ç¼è¾è·åè¡¨å¤´æ¶æ¶é´æ ¼å¼ç«æ£æ¹å¼
			function formatDate(date) {
			var d = new Date(date),
			month = '' + (d.getMonth() + 1),
			day = '' + d.getDate(),
			year = d.getFullYear();

			if (month.length < 2) month = '0' + month;
			if (day.length < 2) day = '0' + day;

			return [year, month, day].join('-');
			}

			//åå§åæç»è¡¨æ ¼
			function set_InitGrid() {
			@@ -445,6 +467,16 @@
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å


			//åå§åè¡¨åæä»¶
			set_InitFrom();

			//åå§åè¡¨åæä»¶
			function set_InitFrom() {
			//å¸¸è§ç¨æ³
			laydate.render({
			elem: '#HDate'
			});
			}

			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			@@ -456,12 +488,35 @@
			// console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HBillType").val(d.data[0].HSourceBillType);
			$("#HBillType").val(d.data[0].HSourceBillType == null ? "1402" : d.data[0].HSourceBillType);
			//è·åæºåç±»åãæºååå·
			if (d.data[0].HSourceBillType == "1402") {
			$("#HBillType").empty();
			$("#HBillType").val("1402");
			var optionHtml = '';
			optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + 'åè´§éç¥å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else if (d.data[0].HSourceBillType == "1401") {
			$("#HBillType").empty();
			$("#HBillType").val("1401");
			var optionHtml = '';
			optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + 'éå®è®¢å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else {
			//$("#HBillType").val("-1");
			}
			$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
			$("#HSourceBillNo").attr("disabled", "true");
			HSourceFlag = true;
			$("#HDeptID").val(result.data[0].HDeptID);
			$("#HDeptName").val(result.data[0].HDeptName);
			$("#HDeptID").val(d.data[0].HDeptID);
			$("#HDeptName").val(d.data[0].HDeptName);
			$("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));

			//$("#HWHID").val(d.data[0].HWhID);
			//$("#HStockPlaceID").val(d.data[0].HSPID);
			@@ -592,6 +647,7 @@
			//console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
			//$("#HInterID").val('132522535');
			//$("#HBillNo").val('421458026');
			set_InitGrid();
			@@ -603,6 +659,7 @@
			RoadBillSub(linterid);
			}


			form.on('submit(HWHID-BT)', function () {//éæ©ä»åº
			layer.open({
			type: 2
			@@ -611,13 +668,27 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			});
			//form.on('submit(HWHID-BT)', function () {//éæ©ä»åº
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'ä»åºåè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});
			form.on('submit(HWHID_FIFO-BT)', function () {//éæ©åè¿ååºä»åº
			layer.open({
			type: 2
			@@ -758,7 +829,9 @@
			});

			form.on('submit(Cancel)', function () {
			parent.location.href = "../../../views/index.html"
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			window.close();
			});
			})

			//ç¼è¾
			@@ -920,23 +993,23 @@
			var sSourceType = $("#HBillType").val();
			if (AllowLoadData(sSubStr) != false)//éç©ºéªè¯
			{
			var flage = true;
			for (var i = 0; i < sSubStr.length; i++) {
			if (sSubStr[i].HQty == 0) {
			flage = false;
			}
			}
			if (!flage) {
			layer.confirm('å®éæ«æå·æ°ä¸º0å°äºæ¾è´§åæ°éï¼æ¯å¦ç»§ç»æäº¤ï¼', {
			btn: ['ç»§ç»', 'åæ¶'], skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º"
			}, function () {
			Saver(sMainStr);
			}, function () {
			layer.closeAll("loading");
			});
			} else {
			//var flage = true;
			//for (var i = 0; i < sSubStr.length; i++) {
			// if (sSubStr[i].HQty == 0) {
			// flage = false;
			// }
			//}
			//if (!flage) {
			// layer.confirm('å®éæ«æå·æ°ä¸º0å°äºæ¾è´§åæ°éï¼æ¯å¦ç»§ç»æäº¤ï¼', {
			// btn: ['ç»§ç»', 'åæ¶'], skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º"
			// }, function () {
			// Saver(sMainStr);
			// }, function () {
			// layer.closeAll("loading");
			// });
			//} else {
			Saver(sMainStr);
			}
			//}

			}
			});
			@@ -1296,6 +1369,15 @@
			if (sBarCode != "") {
			$('#HBarCode').val("");
			}
			//ä»ä½å¿é¡»å½å¥
			//if (sHSPID == '' \|\| sHSPID == 0) {
			// //
			// playSound();
			// layer.msg("ä»ä½ä¸ºç©ºï¼ä¸è½æ«æï¼", { icon: 5, btn: ['ç¡®å®'], time: 100000, offset: 't' });
			// //11
			// return false;
			//}
			//
			$.ajax({
			url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
			type: "GET",