MES-WEB-LayUI.git

			@@ -19,14 +19,14 @@
			<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-row" style="display:none;">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">MESåºä½</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HMESSPName" id="HMESSPName" autocomplete="off" class="layui-input">
			<input type="hidden" name="HMESSPID" id="HMESSPID" value="0" autocomplete="off" class="layui-input">
			<input type="hidden" name="HExplanation" id="HExplanation" autocomplete="off" class="layui-input">
			<input type="hidden" name="HExplanation" id="HExplanation" value="" autocomplete="off" class="layui-input">
			</div>
			</div>
			<div class="layui-row">
			@@ -94,7 +94,7 @@
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»ä½</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input" style="background-color:#efefef4d;" readonly>
			<input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" autocomplete="off" class="layui-input">
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			@@ -246,7 +246,7 @@
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/timeFormat/timeFormat.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -254,11 +254,11 @@
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element;
			, admin = layui.admin
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element;

			var RZ = "";
			var Flag = sessionStorage["SourceFlag"];
			@@ -299,10 +299,9 @@
			var params = getUrlVars();
			var linterid = params[params[0]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å


			//å è½½è¡¨å¤´
			function RoadBillMain(linterid)
			{
			function RoadBillMain(linterid) {
			$.ajax({
			url: GetWEBURL() + "/Web/GetPonderationBill",
			type: "GET",
			@@ -324,8 +323,7 @@
			}

			//å è½½è¡¨ä½
			function RoadBillSub(linterid)
			{
			function RoadBillSub(linterid) {
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			@@ -333,15 +331,15 @@
			, where: { HBillID: linterid, HBillType: '1210', 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 }
			, { 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 () {
			@@ -349,21 +347,21 @@
			}
			});
			}


			//å¨æå è½½æºåç±»ååè¡¨ new










			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			//è·åæå¤§åæ®å· new
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$.ajax({
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '1210' },
			@@ -430,40 +428,86 @@
			})
			});

			//éæ©ä¿ç®¡
			form.on('submit(HKeeperID-BT)', function () {
			////éæ©ä¿ç®¡
			//form.on('submit(HKeeperID-BT)', function () {
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'ä¿ç®¡åè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HKeeper', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});

			////éæ©éªæ¶
			//form.on('submit(HSecManagerID-BT)', function (data) {//éæ©éªæ¶
			// var sMainStr = JSON.stringify(data.field);
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'éªæ¶åè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HSecManager', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});

			form.on('submit(HKeeperID-BT)', function () {//éæ©ä¿ç®¡
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ä¿ç®¡åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HKeeper', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'èååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../PublicPage/UserInformation.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HKeeper").val(checkStatus.data[0].HName);
			$("#HKeeperID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			});
			form.on('submit(HSecManagerID-BT)', function (data) {//éæ©åè´§
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'èååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../PublicPage/UserInformation.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HSecManager").val(checkStatus.data[0].HName);
			$("#HSecManagerID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			});

			//éæ©éªæ¶
			form.on('submit(HSecManagerID-BT)', function (data) {//éæ©éªæ¶
			var sMainStr = JSON.stringify(data.field);
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'éªæ¶åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HSecManager', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			});

			//éæ©é¨é¨
			form.on('submit(HDeptID-BT)', function () {
			@@ -524,40 +568,40 @@
			{
			layer.load(3);
			$.ajax(
			{
			type: "POST",
			//url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/set_SaveEntrustInBill_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			//url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_Json",
			url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json",
			async: true,
			data: { "oMain": sMainStr },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.confirm("çæå§å¤å¥åºå" + data.Message + $("#HBillNo").val(), {
			icon: 1,
			skin: 'layui-layer-lan',
			closeBtn: 0,
			btn: ['æ°å¢'],
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			//window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			parent.location.href = "../../../views/index.html"
			}//å³é
			{
			type: "POST",
			//url: "http://localhost:12761/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			//url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_Json",
			url: GetWEBURL() + "/Kf_EntrustInBill/set_SaveEntrustInBill_New_Json",
			async: true,
			data: { "oMain": sMainStr },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.confirm("çæå§å¤å¥åºå" + data.Message + $("#HBillNo").val(), {
			icon: 1,
			skin: 'layui-layer-lan',
			closeBtn: 0,
			btn: ['æ°å¢'],
			btn2: function () {
			//parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			//window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			parent.location.href = "../../../views/index.html"
			}//å³é
			}
			, function () { window.location.reload(); }//æ°å¢
			);
			}
			, function () { window.location.reload(); }//æ°å¢
			);
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			layui.form.render();
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			layui.form.render();
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			});
			return false;
			}
			});
			@@ -574,7 +618,7 @@
			});

			//æ«æ¡ç
			$('#HBarCode').on('keydown', function (event) {
			$('#HBarCode').on('keydown', function (event) {
			var sSubStr = table.cache['wl-table'];
			var sBarCode = $('#HBarCode').val()
			var sInterID = $("#HInterID").val()
			@@ -614,6 +658,7 @@
			if (event.keyCode == 13) {
			//å¤ææ¡ç æ¯å¦ä¸ºç©º new
			if (sBarCode == '') {
			playSound();
			layer.msg("æ¡ç ä¸ºç©ºï¼ä¸è½æ«æï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			@@ -628,7 +673,7 @@
			//url: "http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/get_CheckTypeByBarCode_Json",
			url: GetWEBURL() + "/Kf_EntrustInBill/get_CheckTypeByBarCode_Json",
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
			data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) {
			if (result.data.HBarType == 'ä»åºæ¡ç ') {
			@@ -682,8 +727,8 @@
			element.tabChange('tab-Kf_EntrustInBill', '3');
			}
			else {
			$("#HSupName").val(result.data.HSupName);
			$("#HSupID").val(result.data.HSupID);
			//$("#HSupName").val(result.data.HSupName); 20210719ä¿®æ¹
			//$("#HSupID").val(result.data.HSupID); 20210719ä¿®æ¹
			//$("#HDeptName").val(result.data.HDeptName);
			//$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			@@ -710,13 +755,13 @@
			//$("#HDeptName").val(result.data.HDeptName);
			layer.load(3)
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
			, cellMinWidth: 90
			, cols: [[
			{ type: 'radio' }
			elem: '#wl-table'
			, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1210', sWhere: '' }
			, cellMinWidth: 90
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			@@ -726,21 +771,23 @@
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			}
			else {
			// $("#verifycode").click();
			//layer.msg(result.Message, { icon: 5 });
			playSound();
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			layer.closeAll("loading");
			},
			error: function (err) {
			playSound();
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			@@ -753,8 +800,17 @@
			//}
			});


			function playSound() {
			var audio = document.getElementById("cs");
			if (audio == null)
			$("body").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
			var audio = document.getElementById("cs");
			audio.play();
			}

			//æ«æºåæ¹æ³
			$('#HSourceBillNo').on('keydown', function (event) {
			$('#HSourceBillNo').on('keydown', function (event) {
			var HSourceBillNo = $('#HSourceBillNo').val()
			var sInterID = $("#HInterID").val()
			var sBillNo = $("#HBillNo").val()
			@@ -778,27 +834,27 @@
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1210', 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 }
			]]
			, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillID: sInterID, HBillType: '1210', 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");
			}
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			}
			else {
			@@ -814,7 +870,7 @@
			});

			//æ«ä»ä½
			$('#HStockPlaceName').on('keydown', function (event) {
			$('#HStockPlaceName').on('keydown', function (event) {
			var HBarCode = $('#HStockPlaceName').val()
			if (event.keyCode == 13) {
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			@@ -843,13 +899,13 @@
			// , url: 'http://localhost:8083/Kf_EntrustInBill/GetHBarCodeShowBillSub'
			//, toolbar: '#toolbarDemo'
			// , where: { sMsg: linterid, sMsg2: lentryid }
			, cols: [[
			, { field: 'HMaterID', title: 'ç©æID', width: 100, hide: true }
			]]
			, page: true
			, height: 500
			, done: function () {
			}
			, cols: [[
			, { field: 'HMaterID', title: 'ç©æID', width: 100, hide: true }
			]]
			, page: true
			, height: 500
			, done: function () {
			}
			});

			//æ«MESä»ä½
			@@ -892,7 +948,7 @@
			}
			});

			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});
			//æ¸ç©ºè¡¨å¤´
			//function f_ClearTitle() {