MES-WEB-LayUI.git

			@@ -138,6 +138,8 @@
			, table = layui.table
			, form = layui.form
			, element = layui.element;
			var option = {}

			//æ¸ç©ºçé¢ new

			var sBillType = '1202'
			@@ -214,27 +216,7 @@
			}
			})
			});
			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: 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");
			}
			}


			table.render({
			elem: '#sy-table'
			@@ -258,28 +240,34 @@

			// url: GetWEBURL() + '/Web/chanpinruk',
			form.on('submit(cmdRefresh)', function () {//å·æ°
			table.render({
			elem: '#dj-table'
			, url: GetWEBURL() + '/Web/chanpinruk'
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, 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");
			}
			}),
			////å·æ°ç¼ååè¡¨çæ¸²æ
			//table.render({
			// elem: '#dj-table'
			// , url: GetWEBURL() + '/Web/chanpinruk'
			// , toolbar: '#toolbarDemo'
			// , defaultToolbar: []
			// , 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");
			// }
			//}),

			//å¨æåè¡¨-å·æ°ç¼ååè¡¨
			table.render(option);

			//å·æ°å·²ä¸ä¼ åè¡¨
			table.render({
			elem: '#yd-table'
			, url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
			@@ -314,16 +302,19 @@
			form.on('submit(cmdRescind)', function () {
			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
			var sBillNo = data[0].HBillNo
			var sInterID = data[0].HInterID = 'undefined' ? data[0].åæ®åç : data[0].HInterID;
			var sBillNo = data[0].HBillNo = 'undefined' ? data[0].åæ®å· : data[0].HBillNo;
			var sBillType = '1202'
			$.ajax(
			{
			@@ -365,7 +356,7 @@
			var checkStatus = table.checkStatus('dj-table')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var sInterID = data[0].HInterID
			var sInterID = data[0].HInterID = 'undefined' ? data[0].åæ®åç : data[0].HInterID;
			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax(
			@@ -475,30 +466,106 @@
			})
			});

			////ç¼ååè¡¨
			//table.render({
			// elem: '#dj-table'
			// , url: GetWEBURL() + '/Web/chanpinruk'
			// , toolbar: '#toolbarDemo'
			// , defaultToolbar: []
			// , 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");
			// }
			//})

			table.render({
			elem: '#dj-table'
			, url: GetWEBURL() + '/Web/chanpinruk'
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, 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
			});
			}
			})


			//å·²ä¸ä¼ åè¡¨
			table.render({