MES-WEB-LayUI.git

			@@ -36,8 +36,9 @@
			</div>-->
			<div class="layui-tab" lay-filter="tab-POStockInBillList">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1">åæ®åè¡¨</li>
			<li lay-id="2">æºåçå</li>
			<li lay-id="1">ç¼ååè¡¨</li>
			<li lay-id="2">å·²ä¸ä¼ åè¡¨</li>
			<li lay-id="3">å·²ä¸ä¼ æ¥è¯¢</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			@@ -51,6 +52,28 @@
			<div class="layui-row">
			<div class="layui-col-xs12">
			<table class="layui-hide" id="yd-table" lay-filter="yd-table"></table>
			</div>
			</div>
			</div>
			<div class="layui-tab-item">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æºåå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo">
			</div>
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdQuery">æ¥è¯¢</button>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs12">
			<table class="layui-hide" id="sy-table" lay-filter="sy-table"></table>
			</div>
			</div>
			</div>
			@@ -97,9 +120,10 @@
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element;
			, element = layui.element;
			var option = {};
			//æ¸ç©ºçé¢ new

			var sBillType = '1210'
			//å¨æå è½½æºåç±»ååè¡¨ new

			//å è½½æºåç±»å
			@@ -107,11 +131,15 @@
			//è¯»ååæ®åè¡¨
			//

			form.on('submit(Cancel)', function () {
			parent.location.href = "../../../views/index.html"

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

			//ç¼è¾
			form.on('submit(cmdModify)', function () {
			var checkStatus = table.checkStatus('dj-table')
			, data = checkStatus.data;
			@@ -131,46 +159,29 @@
			}
			})
			});

			//å·æ°
			form.on('submit(cmdRefresh)', function () {//
			table.render({
			elem: '#dj-table'
			, 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(option);
			table.render({
			elem: '#yd-table'
			, url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
			, page: true // å¼å¯åé¡µ
			, limits: [20, 40, 80, 100]
			, limit: 20
			, 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: 'HInterID', title: 'åæ®åç ', width: 120 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 150 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 120 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 150 }
			]]
			, height: 500
			, done: function () {
			@@ -178,9 +189,7 @@
			}
			})
			});


			/æ¤éåè½
			//æ¤éåè½
			form.on('submit(cmdRescind)', function () {
			var checkStatus = table.checkStatus('yd-table')
			, data = checkStatus.data;
			@@ -219,70 +228,182 @@
			}
			});
			});



			//å é¤
			form.on('submit(cmdDelete)', function () {//å é¤
			var checkStatus = table.checkStatus('dj-table')
			, data = checkStatus.data;
			var sInterID = data[0].HInterID
			$.ajax(
			{
			type: "Get",
			url: GetWEBURL() + "/ProductInBillList/Delete_Json",
			async: true,
			data: { "sHInterID": sInterID },
			dataType: "json",
			success: function (data) {
			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 });
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			}, function () {
			//do something
			if (checkStatus.data.length === 1) {
			var sInterID = data[0].HInterID;
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax(
			{
			type: "Get",
			url: GetWEBURL() + "/ProductInBillList/Delete_Json",
			async: true,
			data: { "sHInterID": sInterID },
			dataType: "json",
			success: function (data) {
			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 });
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			}, function () {
			//do something
			});
			}
			});
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}

			});
			//æ¥è¯¢
			form.on('submit(cmdQuery)', function () {
			var HBillNo = $("#HBillNo").val();
			var HSourceBillNo = $("#HSourceBillNo").val();
			var index = layer.load();//é®ç½©
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Web/QueryBillUpdateLoad_Json',
			type: "GET",
			data: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(index);
			} else {
			layer.close(index);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			});
			}, error: function () {
			layer.close(index);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			});



			var sBillType = '1210'
			table.render({
			elem: '#dj-table'
			, 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: '#dj-table'
			// , url: GetWEBURL() + '/Web/chanpinruk'
			// , toolbar: '#toolbarDemo'
			// , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HInterID', title: 'åæ®åç ', width: 120 }
			// , { field: 'HBillNo', title: 'åæ®å·', width: 150 }
			// , { field: 'HMaker', title: 'å¶åäºº', width: 120 }
			// , { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 150 }
			// , { field: 'HQty', title: 'æ°é', width: 100 }
			// , { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			// , { field: 'HRedBlueFlag', title: 'çº¢èå', width: 120 }
			// , { field: 'HSourceBillType', title: 'æºåç±»å', width: 100 }
			// ]]
			// , height: 500
			// , done: function () {
			// layer.closeAll("loading");
			// }
			//})



			//å¨æå
			$.ajax({
			url: GetWEBURL() + "/Web/chanpinruk1",
			type: "GET",
			async: false,
			data: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] },
			//async: false,
			success: function (data1) {

			if (data1.count == 1) {

			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'radio', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, "") > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}

			option = {
			elem: '#dj-table'
			, toolbar: '#toolbarDemo'
			, height: 500
			, page: true //å¼å¯åé¡µ
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [col]
			, data: data1.data
			};
			table.render(option);
			} else {
			option = {
			elem: '#dj-table'
			, toolbar: '#toolbarDemo'
			, height: 500
			, page: true //å¼å¯åé¡µ
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'radio' }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 150 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			]]
			, data: []
			};
			table.render(option);
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			}, function () {
			//do something
			});
			}
			})




			//å·²ä¸ä¼ åè¡¨
			@@ -291,24 +412,48 @@
			, url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
			, toolbar: '#toolbarDemo'
			, where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
			, page: true // å¼å¯åé¡µ
			, limits: [20, 40, 80, 100]
			, limit: 20
			, 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: 'HInterID', title: 'åæ®åç ', width: 120 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 150 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 120 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 150 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			})

			//å·²ä¸ä¼ æ¥è¯¢
			table.render({
			elem: '#sy-table'
			, toolbar: '#toolbarDemo'
			, cols: [[
			{ type: 'radio' }
			, { field: 'HInterID', title: 'åæ®åç ', width: 120 }
			, { field: 'HBillNo', title: 'åæ®å·', width: 150 }
			, { field: 'HMaker', title: 'å¶åäºº', width: 120 }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 15 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 150 }
			]]
			, height: 500
			})

			//å·æ°æç»é¡µç¾
			table.render({
			elem: '#mx-table'
			@@ -316,7 +461,7 @@
			//, toolbar: '#toolbarDemo'
			// , where: { sMsg: linterid, sMsg2: lentryid }
			, cols: [[
			, { field: 'HMaterID', title: 'ç©æID', width: 100, hide: true }
			, { field: 'HMaterID', title: 'ç©æID', width: 150, hide: true }
			]]
			, page: true
			, height: 500