MES-WEB-LayUI.git

			@@ -207,7 +207,7 @@
			</div>
			</div>
			<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">æäº¤</button>
			<button type="button" lay-submit="" class="layui-btn" id="Saver" lay-filter="Saver">æäº¤</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">ç¼è¾</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">å·æ°</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">å é¤</button>
			@@ -688,64 +688,106 @@
			});

			form.on('submit(cmdDelete)', function () {//å é¤
			var checkStatus = table.checkStatus('wl-table')
			, data = checkStatus.data;
			// console.log(data);
			var sInterID = $('#HInterID').val()
			var sMaterID = data[0].HMaterID
			var sBillType = '1203'
			var sAuxPropID = data[0].HAuxPropID
			//var sMTONo = data[0].HMTONo
			var sMTONo = ''
			var sSourceInterID = data[0].HSourceInterID
			var sSourceEntryID = data[0].HSourceEntryID
			$.ajax(
			{
			type: "Get",
			//url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/OtherInBill/Delete_Json",
			async: true,
			data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1203', 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 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			}
			else {
			layer.msg(data.Message, { icon: 2 });
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			}, function () {
			//do something
			});
			}
			});
			//var checkStatus = table.checkStatus('wl-table')
			// , data = checkStatus.data;
			//// console.log(data);
			//var sInterID = $('#HInterID').val()
			//var sMaterID = data[0].HMaterID
			//var sBillType = '1203'
			//var sAuxPropID = data[0].HAuxPropID
			////var sMTONo = data[0].HMTONo
			//var sMTONo = ''
			//var sSourceInterID = data[0].HSourceInterID
			//var sSourceEntryID = data[0].HSourceEntryID
			//$.ajax(
			// {
			// type: "Get",
			// //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			// url: GetWEBURL() + "/OtherInBill/Delete_Json",
			// async: true,
			// data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
			// dataType: "json",
			// success: function (data) {
			// if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			// table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_Json'
			// , toolbar: '#toolbarDemo'
			// , where: { HBillID: sInterID, HBillType: '1203', 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 }
			// ]]
			// , height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			// });
			// }
			// else {
			// layer.msg(data.Message, { icon: 2 });
			// }
			// },
			// error: function (err) {
			// layer.msg('éè¯¯' + err, {
			// icon: 5,
			// time: 20000
			// }, function () {
			// //do something
			// });
			// }
			// });
			});

			//form.on('submit(Saver)', function (data) {//æäº¤
			// //ç°åº¦æäº¤æé®Saver
			// document.getElementById("Saver").disabled = true;
			// //debugger;
			// data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//ç»ç»
			// var sMainStr = JSON.stringify(data.field);
			// //var hOrgID = sessionStorage["OrganizationID"];
			// var sMain = sMainStr;
			// var sSubStr = table.cache['wl-table'];
			// var sSourceType = $("#HBillType").val();
			// $.ajax(
			// {
			// type: "POST",
			// url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
			// //url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			// async: true,
			// data: { "oMain": sMain },
			// dataType: "json",
			// success: function (data) {
			// if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			// layer.msg(data.Message , { icon: 1 });
			// //
			// //Sub_ClearBill();
			// //
			// //ç°åº¦æäº¤æé®Saver
			// document.getElementById("Saver").disabled = false;
			// }
			// else {
			// layer.msg(data.Message, { icon: 5 });
			// //ç°åº¦æäº¤æé®Saver
			// document.getElementById("Saver").disabled = false;
			// }
			// layer.closeAll("loading");
			// },
			// error: function (err) {
			// layer.msg("éè¯¯:" + err, { icon: 5 });
			// //ç°åº¦æäº¤æé®Saver
			// document.getElementById("Saver").disabled = false;
			// }
			// });
			//});

			form.on('submit(Saver)', function (data) {//æäº¤
			//ç°åº¦æäº¤æé®Saver
			@@ -757,36 +799,47 @@
			var sMain = sMainStr;
			var sSubStr = table.cache['wl-table'];
			var sSourceType = $("#HBillType").val();
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
			//url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMain },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message , { icon: 1 });
			//
			//Sub_ClearBill();
			//
			if (AllowLoadData(sSubStr) != false)//éç©ºéªè¯
			{
			layer.load(3);
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/OtherInStockBill/set_SaveOtherInStockBill_Json",
			//url: "http://localhost:12761/OtherInStockBill/set_SaveOtherInStockBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMain },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.confirm("çæå¶ä»å¥åºå" + data.Message + $("#HBillNo").val(), {
			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 {
			layer.msg(data.Message, { icon: 5 });
			//ç°åº¦æäº¤æé®Saver
			document.getElementById("Saver").disabled = false;
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5 });
			//ç°åº¦æäº¤æé®Saver
			document.getElementById("Saver").disabled = false;
			}
			else {
			layer.msg(data.Message, { icon: 5 });
			//ç°åº¦æäº¤æé®Saver
			document.getElementById("Saver").disabled = false;
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5 });
			//ç°åº¦æäº¤æé®Saver
			document.getElementById("Saver").disabled = false;
			}
			});
			});
			}
			else {
			layer.msg("æ°æ®ä¸å®æ´ï¼ä¸åè®¸æäº¤:", { icon: 5 });
			//ç°åº¦æäº¤æé®Saver
			document.getElementById("Saver").disabled = false;
			}
			});


			@@ -1048,9 +1101,12 @@
			elem: '#wl-table'
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 90
			,limit:3000
			, totalRow: true
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQty', title: 'éé', width: 150, totalRow: true }
			, { field: 'HAuxQty', title: 'ç®±æ°', width: 150, totalRow: true }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			@@ -1213,6 +1269,12 @@
			$("#HDeptID").val(obj[0].HItemID);
			}
			function AllowLoadData(sSubStr) { //éç©ºéªè¯
			//æ°åæ£å(åå«å°æ°)
			var reg = /^\d+(\.\d+)?$/;
			if (reg.test($("#HQty").val()) == false \|\| $("#HQty").val() == '') {
			layer.msg("æ°éå¿é¡»ä¸ºæ°éæå°æ°", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			//if ($("#HSourceBillNo").val() == '') {
			// layer.msg("è¯·åæ«æºå!", { icon: 5 });
			// return false;