MES-WEB-LayUI.git

			@@ -68,6 +68,7 @@
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HProcNumber" id="HProcNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HProcID" id="HProcID" value="0">
			<input type="hidden" name="HItemID" id="HItemID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -113,12 +114,6 @@
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDept" id="btnSearchDept" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">å·¥åºå·¥ä»·<br/>èµæä»£ç </label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="å·¥åºå·¥ä»·ä»£ç " id="å·¥åºå·¥ä»·ä»£ç " onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -292,8 +287,6 @@
			if (linterid == undefined) {
			linterid = 0;
			}
			//æ¥è¯¢
			GetProcPriceValue(linterid);

			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			@@ -403,6 +396,36 @@
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			table.reload(option);
			layer.close(index);
			}
			});
			}

			if (obj.event == 'HBeginDateCol') {
			var field = $(this).data('field');
			laydate.render({
			elem: this.firstChild
			, show: true //ç´æ¥æ¾ç¤º
			, closeStop: this
			, done: function (nowDate) {
			//æ¶é´éæ©å®æï¼è¡æ°æ®æ´æ°
			data[field] = nowDate;
			obj.update(data);
			checkRefresh();
			}
			});
			}

			if (obj.event == 'HEndDateCol') {
			var field = $(this).data('field');
			laydate.render({
			elem: this.firstChild
			, show: true //ç´æ¥æ¾ç¤º
			, closeStop: this
			, done: function (nowDate) {
			//æ¶é´éæ©å®æï¼è¡æ°æ®æ´æ°
			data[field] = nowDate;
			obj.update(data);
			checkRefresh();
			}
			});
			}
			@@ -532,28 +555,38 @@
			set_SaveBill(data);
			});


			//ä¿å
			function set_SaveBill(data) {
			var sSubTable = table.cache['mainTable'];
			//å é¤åè¡¨æ°æ® ä¼å ç¨æ°ç»çä½ç½®,éè¦éæ°æä¸ä¸é¡ºåº
			var num = [];
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
			num.push(table.cache["mainTable"][i])
			}
			}

			var sSubTable = num;
			for (var i = 0; i < sSubTable.length; i++) {
			if (!sSubTable[i].HMaterIDCol) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼ç©æä¸è½ä¸ºç©ºï¼", { icon: 7, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("ç¬¬" + indexRow + "è¡ï¼ç©æä¸è½ä¸ºç©ºï¼");
			return;
			}
			if (!sSubTable[i].HProcIDCol) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼å·¥åºä¸è½ä¸ºç©ºï¼", { icon: 7, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("ç¬¬" + indexRow + "è¡ï¼å·¥åºä¸è½ä¸ºç©ºï¼");
			return;
			}
			if (!sSubTable[i].HSourceNumberCol) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼èµæºä¸è½ä¸ºç©ºï¼", { icon: 7, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("ç¬¬" + indexRow + "è¡ï¼èµæºä¸è½ä¸ºç©ºï¼");
			return;
			}
			}
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			var sSubStr = JSON.stringify(num);
			var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
			var index = layer.load();
			$.ajax({
			@@ -564,14 +597,6 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			//layer.confirm(data.Message, {
			// icon: 1, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['æ°å¢'],
			// btn2: function () {
			// //parent.layui.admin.events.closeThisTabs();å³éé¡µç¾
			// //window.close();//å³éé¡µé¢ï¼æµè§å¨ææï¼PDAæ æ
			// parent.location.href = "../../../views/index.html"
			// }//å³é
			//}, function () { window.location.reload(); });//æ°å¢
			layer.close(index);
			layer.msg("æäº¤æå");
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//ä¿åæé®
			@@ -721,65 +746,50 @@
			, limit: 500
			, height: 'full-250'
			, cellMinWidth: 90
			//, cols: [[
			// { type: 'checkbox' }
			// , { field: 'HMaterIDCol', title: 'ç©æID', edit: 'text', hide: true }
			// , { field: 'HMaterNumberCol', title: 'ç©æä»£ç ', edit: 'text', event: "HMaterCheck", width: 200 }
			// , { field: 'HMaterNameCol', title: 'ç©æåç§°', width:200 }
			// , { field: 'HMaterModelCol', title: 'è§æ ¼åå·', width: 200 }
			// , { field: 'HProcIDCol', title: 'å·¥åºID', edit: 'text', hide: true }
			// , { field: 'HProcNumberCol', title: 'å·¥åºä»£ç ', edit: 'text', event: "HProcCheck" }
			// , { field: 'HProcNameCol', title: 'å·¥åºåç§°' }
			// , { field: 'HSourceIDCol', title: 'èµæºID', edit: 'text', hide: true }
			// , { field: 'HSourceNumberCol', title: 'èµæºä»£ç ', edit: 'text', event: "HSourceCheck" }
			// , { field: 'HSourceNameCol', title: 'èµæºåç§°' }
			// , { field: 'HPriceCol', title: 'åä»·', edit: 'text' }
			// , { field: 'HBeginDateCol', title: 'å¼å§æ¥æ', edit: 'text', width: 110
			// , templet: function (d) {
			// if (d.HBeginDateCol == null) {
			// return "";
			// }
			// return util.toDateString(d.HBeginDateCol, "yyyy-MM-dd");
			// }
			// }
			// , {
			// field: 'HEndDateCol', title: 'ç»ææ¥æ', edit: 'text', width: 110
			// , templet: function (d) {
			// if (d.HEndDateCol == null) {
			// return "";
			// }
			// return util.toDateString(d.HEndDateCol, "yyyy-MM-dd");
			// }
			// }
			// , { field: 'HCostFlagCol', title: 'ææ¬å¿é', templet: '#HCostFlagCol' }
			// , { field: 'HFlowFlagCol', title: 'æµè½¬é»è®¤', templet: '#HFlowFlagCol' }
			// , { field: 'HPayFlagCol', title: 'å·¥èµé»è®¤', templet: '#HPayFlagCol' }
			// , { field: 'HRemarkCol', title: 'å¤æ³¨', edit: 'text' }
			// , { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			//]]
			//, done: function (res, curr, count) {
			// option.data = res.data;
			// $('.layui-form-select').find('input').unbind("blur");
			// $('tr').each(function (e) {
			// var $cr = $(this);
			// var dataIndex = $cr.attr("data-index");
			// $.each(option.data, function (index, value) {
			// if (value.LAY_TNDEX == dataIndex) {
			// $cr.find('input').val(value.HCostFlagCol);
			// $cr.find('input').val(value.HFlowFlagCol);
			// $cr.find('input').val(value.HPayFlagCol);
			// }
			// });
			// });
			//}
			//, text: {
			// none: 'æ æ°æ®ï¼'
			//}
			, cols: [[
			{ type: 'checkbox' }
			, { field: 'HMaterIDCol', title: 'ç©æID', edit: 'text', hide: true }
			, { field: 'HMaterNumberCol', title: 'ç©æä»£ç ', edit: 'text', event: "HMaterCheck", width: 200 }
			, { field: 'HMaterNameCol', title: 'ç©æåç§°', width:200 }
			, { field: 'HMaterModelCol', title: 'è§æ ¼åå·', width: 200 }
			, { field: 'HProcIDCol', title: 'å·¥åºID', edit: 'text', hide: true }
			, { field: 'HProcNumberCol', title: 'å·¥åºä»£ç ', edit: 'text', event: "HProcCheck" }
			, { field: 'HProcNameCol', title: 'å·¥åºåç§°' }
			, { field: 'HSourceIDCol', title: 'èµæºID', edit: 'text', hide: true }
			, { field: 'HSourceNumberCol', title: 'èµæºä»£ç ', edit: 'text', event: "HSourceCheck" }
			, { field: 'HSourceNameCol', title: 'èµæºåç§°' }
			, { field: 'HPriceCol', title: 'åä»·', edit: 'text' }
			, { field: 'HBeginDateCol', title: 'å¼å§æ¥æ', event: "HBeginDateCol" }
			, { field: 'HEndDateCol', title: 'ç»ææ¥æ', event: "HEndDateCol" }
			, { field: 'HCostFlagCol', title: 'ææ¬å¿é', templet: '#HCostFlagCol' }
			, { field: 'HFlowFlagCol', title: 'æµè½¬é»è®¤', templet: '#HFlowFlagCol' }
			, { field: 'HPayFlagCol', title: 'å·¥èµé»è®¤', templet: '#HPayFlagCol' }
			, { field: 'HRemarkCol', title: 'å¤æ³¨', edit: 'text' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			, done: function (res, curr, count) {
			option.data = res.data;
			$('.layui-form-select').find('input').unbind("blur");
			$('tr').each(function (e) {
			var $cr = $(this);
			var dataIndex = $cr.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TNDEX == dataIndex) {
			$cr.find('input').val(value.HCostFlagCol);
			$cr.find('input').val(value.HFlowFlagCol);
			$cr.find('input').val(value.HPayFlagCol);
			}
			});
			});
			}
			, text: {
			none: 'æ æ°æ®ï¼'
			}
			};
			//rowdata[0].HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
			//rowdata[0].HEndDateCol = "2100-01-01";
			//option.data = rowdata;
			//table.render(option);
			rowdata[0].HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
			rowdata[0].HEndDateCol = "2100-01-01";
			option.data = rowdata;
			table.render(option);
			}

			form.on('select(HCostFlagCol)', function (data) {
			@@ -812,6 +822,17 @@
			});
			});

			//å¤é å·æ°è¡¨æ ¼
			function checkRefresh() {
			for (var i = 1; i <= option.data.length; i++) {
			$('#HCostFlagCol' + i + '').find("option[value='" + option.data[i - 1].HCostFlagCol + "']").attr("selected", true);
			$('#HFlowFlagCol' + i + '').find("option[value='" + option.data[i - 1].HFlowFlagCol + "']").attr("selected", true);
			$('#HPayFlagCol' + i + '').find("option[value='" + option.data[i - 1].HPayFlagCol + "']").attr("selected", true);
			}
			form.render('select');
			}

			//ç¼è¾
			function GetProcPriceValue(HItemID) {
			if (HItemID == '' \|\| HItemID == null) {
			HItemID = 0;
			@@ -821,58 +842,44 @@
			url: GetWEBURL() + "/Gy_ProcPrice/GetProcPriceValue",
			type: "GET",
			data: { "HItemID": HItemID },
			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: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -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')}}</div>", width: 200 });
			break;
			default:
			if (data[i].name == 'ç©æä»£ç ' \|\| data[i].name == 'å·¥åºä»£ç ' \|\| data[i].name == 'èµæºä»£ç ') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, edit: 'text', width: 200 });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			}
			success: function (d) {
			layer.close(ajaxLoad);
			if (d.count == 1) {//ä¸»è¡¨
			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HItemID": d.data[0].HItemID
			, "HProcNumber": d.data[0].å·¥åºä»£ç
			, "HProcID": d.data[0].HProcIDCol
			, "HProcName": d.data[0].å·¥åºåç§°
			, "HMaterNumber": d.data[0].ç©æä»£ç
			, "HMaterID": d.data[0].HMaterID
			, "HMaterName": d.data[0].ç©æåç§°
			, "HMaterModel": d.data[0].è§æ ¼åå·
			, "HDeptName": d.data[0].é¨é¨åç§°
			, "HDeptID": d.data[0].Hdeptid
			, "HMakeDate": Format(new Date(d.data[0].å¶åæ¥æ), 'yyyy-MM-dd')
			, "HMaker": d.data[0].å¶åäºº
			});

			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 'full-80'
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			var rowdata = [];
			for (var i = 0; i < d.data.length; i++) {
			//åè¡¨ èµå¼
			rowdata.push({
			"HMaterIDCol": d.data[i].HMaterID, "HMaterNumberCol": d.data[i].ç©æä»£ç , "HMaterNameCol": d.data[i].ç©æåç§°, "HMaterModelCol": d.data[i].è§æ ¼åå·, "HProcIDCol": d.data[i].HProcID,
			"HProcNumberCol": d.data[i].å·¥åºä»£ç , "HProcNameCol": d.data[i].å·¥åºåç§°, "HSourceIDCol": d.data[i].HSourceID, "HSourceNumberCol": d.data[i].èµæºä»£ç , "HSourceNameCol": d.data[i].èµæºåç§°, "HPriceCol": d.data[i].åä»·,
			"HBeginDateCol": Format(new Date(d.data[i].å¼å§æ¥æ), 'yyyy-MM-dd'), "HEndDateCol": Format(new Date(d.data[i].ç»ææ¥æ), 'yyyy-MM-dd'), "HCostFlagCol": (d.data[i].HCostFlag == 0 ? false : true), "HFlowFlagCol": (d.data[i].HFlowFlag == 0 ? false : true), "HPayFlagCol": (d.data[i].HPayFlag == 0 ? false : true),
			"HRemarkCol": d.data[i].å¤æ³¨
			});
			}
			option.data = rowdata;
			table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			for (var i = 0; i < d.data.length; i++) {
			$('#HCostFlagCol' + (i + 1)).find("option[value='" + d.data[i].HCostFlag + "']").attr("selected", true);
			$('#HFlowFlagCol' + (i + 1)).find("option[value='" + d.data[i].HFlowFlag + "']").attr("selected", true);
			$('#HPayFlagCol' + (i + 1)).find("option[value='" + d.data[i].HPayFlag + "']").attr("selected", true);
			}
			form.render('select');
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {