MES-WEB-LayUI.git

			@@ -135,7 +135,7 @@
			//éåº
			form.on('submit(cmdCancel)', function () {
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.location.href = "../../../views/index.html";
			parent.location.href = "../../../views/index_Mobile.html"
			});
			//parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			@@ -144,27 +144,61 @@
			form.on('submit(cmdModify)', function () {
			var checkStatus = table.checkStatus('dj-table')
			, data = checkStatus.data;
			//ajaxLabelData = data;
			//layer.alert(rows);
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'å¤è´å¥åºå'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../éªæ¶å¥åº/å¤è´å¥åº/Kf_POStockInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
			, resize: false
			, cancel: function () {
			$(".layui-btn").removeClass("layui-btn-disabled");
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/WEBSController/TempList_Modify_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": data[0].HInterID, "HBillNo": data[0].HBillNo, "HBillType": 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_POStockInBill_Fast.html?OperationType=2&HInterID=' + data[0].HInterID, '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: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.msg("éè¯¯" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			})
			});
			});
			////ç¼è¾
			//form.on('submit(cmdModify)', function () {
			// var checkStatus = table.checkStatus('dj-table')
			// , data = checkStatus.data;
			// //ajaxLabelData = data;
			// //layer.alert(rows);
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'å¤è´å¥åºå'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: false //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../éªæ¶å¥åº/å¤è´å¥åº/Kf_POStockInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
			// , resize: false
			// , cancel: function () {
			// $(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});
			//å·æ°
			form.on('submit(cmdRefresh)', function () {//
			var sBillType = '1201'
			//å¨æå-å·æ°ç¼ååè¡¨
			table.render(option);
			////å¨æå-å·æ°ç¼ååè¡¨
			//table.render(option);
			table.render({
			elem: '#yd-table'
			, url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
			@@ -311,108 +345,108 @@
			});
			});

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



			//å¨æå-ç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + "/Web/DisBillEntryList_Mate_Webs_Json",
			type: "GET",
			async: false,
			data: { HBillType: sBillType, sWhere: '' },
			//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({
			elem: '#dj-table'
			, url: GetWEBURL() + '/Web/chanpinruk'
			, toolbar: '#toolbarDemo'
			, where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
			, cols: [[
			{ type: 'radio' }
			, { field: 'åæ®åç ', title: 'åæ®åç ', width: 120 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 150 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 120 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 150 }
			, { field: 'æ°é', title: 'æ°é', width: 100 }
			, { field: 'æºååå·', title: 'æºååå·', width: 150 }
			, { field: 'çº¢èå', title: 'çº¢èå', width: 120 }
			, { field: 'æºåç±»å', title: 'æºåç±»å', width: 100 }
			]]
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			})



			////å¨æå-ç¼ååè¡¨
			//$.ajax({
			// url: GetWEBURL() + "/Web/DisBillEntryList_Mate_Webs_Json",
			// type: "GET",
			// async: false,
			// data: { HBillType: sBillType, sWhere: '' },
			// //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({
			elem: '#yd-table'