MES-WEB-LayUI.git

			@@ -236,7 +236,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/' //éæèµæºæå¨è·¯å¾
			@@ -244,11 +244,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"];
			@@ -289,10 +289,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",
			@@ -314,8 +313,7 @@
			}

			//å è½½è¡¨ä½
			function RoadBillSub(linterid)
			{
			function RoadBillSub(linterid) {
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/Kf_EntrustInBill/DisBillEntryList_Webs_Json'
			@@ -323,15 +321,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 () {
			@@ -339,21 +337,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' },
			@@ -514,40 +512,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://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"
			}//å³é
			}
			, 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;
			}
			});
			@@ -564,7 +562,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()
			@@ -672,8 +670,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);
			@@ -700,13 +698,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 }
			@@ -716,11 +714,11 @@
			, { 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 {
			@@ -744,7 +742,7 @@
			});

			//æ«æºåæ¹æ³
			$('#HSourceBillNo').on('keydown', function (event) {
			$('#HSourceBillNo').on('keydown', function (event) {
			var HSourceBillNo = $('#HSourceBillNo').val()
			var sInterID = $("#HInterID").val()
			var sBillNo = $("#HBillNo").val()
			@@ -768,27 +766,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 {
			@@ -804,7 +802,7 @@
			});

			//æ«ä»ä½
			$('#HStockPlaceName').on('keydown', function (event) {
			$('#HStockPlaceName').on('keydown', function (event) {
			var HBarCode = $('#HStockPlaceName').val()
			if (event.keyCode == 13) {
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			@@ -833,13 +831,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ä»ä½
			@@ -882,7 +880,7 @@
			}
			});

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