MES-WEB-LayUI.git

			@@ -38,6 +38,7 @@
			<ul class="layui-tab-title" lay-filter="tab-all">
			<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>
			@@ -100,18 +123,96 @@
			, element = layui.element;
			//æ¸ç©ºçé¢ new

			var sBillType = '1203';
			var col = [];
			var option = {}
			//å¨æå è½½æºåç±»ååè¡¨ new

			//å è½½æºåç±»å
			set_ClearBill();
			//åå§åçé¢
			function set_ClearBill() {
			get_Display();

			//è¯»ååæ®åè¡¨
			//

			form.on('submit(Cancel)', function () {
			parent.location.href = "../../../views/index.html"
			table.render({
			elem: '#dj-table'
			, url: GetWEBURL() + '/Web/chanpinruk'
			, toolbar: '#toolbarDemo'
			, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
			, cols: [[
			{ type: 'radio' }
			, { field: 'åæ®åç ', title: 'åæ®åç ', width: 80 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 80 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 100 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 100 }
			, { field: 'æ°é', title: 'æ°é', width: 100 }
			, { field: 'æºååå·', title: 'æºååå·', width: 100 }
			, { field: 'çº¢èå', title: 'çº¢èå', width: 100 }
			, { field: 'æºåç±»å', 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: 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: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 120 }
			]]
			, 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: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 120 }
			]]
			, height: 500
			})
			}

			//éåº
			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;
			@@ -132,61 +233,28 @@
			})
			});


			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({
			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");
			}
			})
			//å·æ°
			form.on('submit(cmdRefresh)', function () {
			location.reload();
			});



			//æ¤éåè½
			form.on('submit(cmdRescind)', function () {
			var checkStatus = table.checkStatus('yd-table')
			, data = checkStatus.data;
			var sInterID = data[0].HInterID
			var sBillNo = data[0].HBillNo
			var checkStatus = table.checkStatus('yd-table');
			var checkStatus2 = table.checkStatus('sy-table');
			var checkStatus3 = table.checkStatus('dj-table');
			var data = "";
			if (checkStatus.data.length != 0) {
			data = checkStatus.data;
			} else if (checkStatus2.data.length != 0) {
			data = checkStatus2.data;
			} else if (checkStatus3.data.length != 0) {
			data = checkStatus3.data;
			}else {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			var sInterID = data[0].HInterID == 'undefined' ? data[0].åæ®åç : data[0].HInterID;
			var sBillNo = data[0].HBillNo == 'undefined' ? data[0].åæ®å· : data[0].HBillNo;
			var sBillType = '1203'
			$.ajax(
			{
			@@ -213,7 +281,7 @@
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			time: 2000
			}, function () {
			//do something
			});
			@@ -226,113 +294,158 @@

			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",
			url: GetWEBURL() + "/Web/Delete_Json",
			async: true,
			data: { "sHInterID": sInterID },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			//layer.msg(data.Message, { icon: 1 });
			table.render({
			elem: '#dj-table'
			, url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
			, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			, where: { HBillType: '1203', 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
			})
			}
			else {
			layer.msg(data.Message, { icon: 2 });
			}
			},
			error: function (err) {
			layer.msg('éè¯¯' + err, {
			icon: 5,
			time: 20000
			}, function () {
			//do something
			});
			}
			});
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var sInterID = data[0].HInterID == 'undefined' ? data[0].åæ®åç : data[0].HInterID;
			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax(
			{
			type: "Get",
			url: GetWEBURL() + "/Web/Delete_Json",
			async: true,
			data: { "sHInterID": sInterID },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			get_Display();
			}
			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();
			// //è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			// $.ajax({
			// url: GetWEBURL() + '/Gy_Mould/list1',
			// 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 });
			// }
			// });
			//});



			form.on('submit(cmdQuery)', function () {
			var HBillNo = $("#HBillNo").val();
			var HSourceBillNo = $("#HSourceBillNo").val();;


			table.render({
			elem: '#sy-table'
			, url: GetWEBURL() + '/ProductInBillList/list1'
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, where: { "BillType": sBillType, "HBillNo": HBillNo, "HSourceBillNo": HSourceBillNo }
			, 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: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HOrgID', title: 'ç»ç»', width: 120 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			})
			});


			//å è½½ç¼ååè¡¨æ°æ®
			function get_Display() {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Web/GetOtherInBillMain_TempList_New',
			type: "GET",
			data: { "HBillType": sBillType, "sHMaker": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]},
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			//ç»ç©ºçæ°ç»èµå¼
			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' });
			for (var i = 0; i < data.length; i++) {
			if (data[i].name == 'åæ®åç ' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			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')}}</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'
			, cols: [col]
			, data: data1.data
			, height: 550
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			};

			//å¨ææ¾ç¤ºåå
			table.render(option);

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			var sBillType = '1203'
			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: '#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");
			}
			})
			//å·æ°æç»é¡µç¾
			table.render({
			elem: '#mx-table'