MES-WEB-LayUI.git

			@@ -93,11 +93,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;
			//æ¸ç©ºçé¢ new

			//å¨æå è½½æºåç±»ååè¡¨ new
			@@ -137,8 +137,45 @@


			form.on('submit(cmdModify)', function () {
			//var checkStatus = table.checkStatus('dj-table')
			// , data = checkStatus.data;
			//var sInterID = data[0].HInterID
			//var sBillNo = data[0].HBillNo
			//var sBillType = '1202'

			//$.ajax({
			// url: GetWEBURL() + "/ProductIn/ProductInTempList_Modify",
			// type: "GET",
			// data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
			// success: function (result) {
			// if (result.count == 1) {
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'äº§åå¥åºå'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: false //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../éªæ¶å¥åº/äº§åå¥åº/Kf_ProductInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
			// // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + JSON.stringify(data), 'yes']
			// // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + rows, 'yes']
			// , resize: false
			// , cancel: function () {
			// $(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			// }
			// else {
			// layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			// }
			// })
			// }

			////ajaxLabelData = data;
			////layer.alert(rows);
			var checkStatus = table.checkStatus('dj-table')
			, data = checkStatus.data;
			, data = checkStatus.data;
			//ajaxLabelData = data;
			//layer.alert(rows);
			layer.open({
			@@ -157,30 +194,73 @@
			}
			})
			});

			var option = {
			elem: '#dj-table'
			//, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 80 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 80 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 100 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			, { field: 'HRedBlueFlag', title: 'çº¢èå', width: 100 }
			, { field: 'HSourceBillType', title: 'æºåç±»å', width: 100 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}
			// url: GetWEBURL() + '/Web/chanpinruk',
			form.on('submit(cmdRefresh)', function () {//å·æ°
			var sBillType = '1202'
			table.render({
			elem: '#dj-table'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Mate_Webs_Json'
			,toolbar: '#toolbarDemo'
			, where: { HBillType: sBillType,sWhere:''}
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 80 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 80 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 100 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			, { field: 'HRedBlueFlag', title: 'çº¢èå', width: 100 }
			, { field: 'HSourceBillType', title: 'æºåç±»å', width: 100 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			});
			,url: GetWEBURL() + '/Web/chanpinruk'
			, toolbar: '#toolbarDemo'
			, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 80 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 80 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 100 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			, { field: 'HRedBlueFlag', title: 'çº¢èå', width: 100 }
			, { field: 'HSourceBillType', title: 'æºåç±»å', width: 100 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			}),
			table.render({
			elem: '#yd-table'
			, url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 80 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 80 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 100 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 100 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 100 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 100 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			})
			});


			@@ -190,7 +270,7 @@
			, data = checkStatus.data;
			var sInterID = data[0].HInterID
			var sBillNo = data[0].HBillNo
			var sBillType = '1205'
			var sBillType = '1202'
			$.ajax(
			{
			type: "Get",
			@@ -200,14 +280,15 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			}
			});
			}
			else {
			layer.msg(data.Message, { icon: 2 });
			}
			@@ -229,16 +310,7 @@
			form.on('submit(cmdDelete)', function () {//å é¤
			var checkStatus = table.checkStatus('dj-table')
			, data = checkStatus.data;
			// console.log(data);
			// var sInterID = $('#HInterID').val()
			var sInterID = data[0].HInterID
			//var sMaterID = data[0].HMaterID
			//var sBillType = $('#HBillType').val()
			//var sAuxPropID = data[0].HAuxPropID
			////var sMTONo = data[0].HMTONo
			//var sMTONo = 0
			//var sSourceInterID = data[0].HSourceInterID
			//var sSourceEntryID = data[0].HSourceEntryID
			$.ajax(
			{
			type: "Get",
			@@ -247,14 +319,15 @@
			data: { "sHInterID": sInterID },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			if (data.count == 1) { // è¯´æéªè¯æåäº,
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			});
			}
			else {
			layer.msg(data.Message, { icon: 2 });
			@@ -276,9 +349,9 @@
			var sBillType = '1202'
			table.render({
			elem: '#dj-table'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Mate_Webs_Json'
			, url: GetWEBURL() + '/Web/chanpinruk'
			,toolbar: '#toolbarDemo'
			, where: { HBillType: sBillType,sWhere:''}
			, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"]}
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 80 }
			@@ -298,14 +371,13 @@


			//å·²ä¸ä¼ åè¡¨
			var
			table.render({
			elem: '#yd-table'
			, url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
			, cols: [[
			{ type: 'radio' }
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 80 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 80 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 100 }