MES-WEB-LayUI.git

			@@ -44,23 +44,24 @@
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æé´é</label>
			<div class="layui-input-block">
			<select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¼å§æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBeginDate" id="HDate1">
			<input type="text" class="layui-input ForFilteringSchemes" name="HDate1" id="HDate1">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ææ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HEndDate" id="HDate2">
			<input type="text" class="layui-input ForFilteringSchemes" name="HDate2" id="HDate2">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">é¡¹ç®å·</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			@@ -156,60 +157,6 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -286,7 +233,7 @@
			//#endregion


			//#region è¿å¥é¡µé¢å³å è½½
			//#region è¿å¥é¡µé¢å³å è½½
			//åå§åçé¢
			set_ClearBill();

			@@ -459,31 +406,16 @@

			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			});
			//#endregion

			//#endregion
			//#endregion
			//æ¥æé´éä¸æåè¡¨çå¬
			form.on('select(HInitTimeCycle)', function (data) {
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);

			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

			//æ§è¡æ¥è¯¢æ¹æ³
			if ($("#HProject").val() == 0) {
			get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			get_FastQuery(2);
			}
			});
			//#endregion

			//#endregion

			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³

			//#region åå§åçé¢
			@@ -494,25 +426,12 @@
			laydate.render({
			elem: '#HDate2'
			});
			//åå§åæ¥æé´éãå¼å§æ¥æãç»ææ¥æ
			setSelect_HInitTimeCycle();
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			}

			//æ ¹æ®æ¥æé´éè®¾ç½®å¼å§æ¶é´ä¸ç»ææ¶é´
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			//RoadHBillNo(sql);
			set_InitGrid();
			//è·åé¡¹ç®å·
			Get_HProject();
			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();

			@@ -530,43 +449,13 @@
			, totalRow: true
			//, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, limits: [50, 500, 5000, 50000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			};
			}
			//#endregion

			//#endregion çå¬ç½æ ¼è¡¨ä½äºä»¶
			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;

			//åæ®å·è¶é¾æ¥
			if (obj.event == 'åæ®å·') { //æ£æ¥ obj.event æ¯å¦çäºåç¬¦ä¸² 'åæ®å·'ãå¦æçäºï¼åæ§è¡ifå¾ªç¯
			var linterid = data.hmainid.toString(); //å£°æåélinterid ä¸º data.hmainid
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			type: 2 //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe
			, area: ['100%', '100%']
			, title: 'ç¼è¾' + HPageTitle //è®¾ç½®å¼¹åºå±çååååé
			, closeBtn: 1//æ¾ç¤ºå³éæé®
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../é¦ä»¶æ£éªå/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&hID=' + linterid //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼

			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			get_FastQuery(table, option);
			}
			, cancel: function () { //ç¹å»åæ¶æ¶ä½¿ç¨åè°
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			}
			});
			//#endregion

			//#region æ¥è¯¢
			function RoadHBillNo(sqlWhere) {
			@@ -578,7 +467,7 @@
			async: false,
			data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.count == 1) {

			var data = [];
			var col = [];
			@@ -591,10 +480,6 @@
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			} else if ($.inArray(data[i].name, totalArray) > -1) { //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else if (data[i].name == 'åæ®å·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·' });
			}
			else {
			switch (data[i].Type) {
			@@ -633,7 +518,7 @@
			DisPlay_HideColumn();
			layer.close(ajaxLoad);

			ColFilter();
			ColFilter();

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			}
			@@ -656,14 +541,15 @@


			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			function get_FastQuery(number) {
			var sqlWhere = " and 1=1 ";
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HProject = $("#HProject").val();//é¡¹ç®å·
			var HNumber = $("#HNumber").val();//ç©æç¼ç
			var HName = $("#HName").val();//ç©æåç§°
			var HModel = $("#HModel").val();//è§æ ¼åå·
			var HDate1 = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate2 = $("#HEndDate").val();//ç»ææ¥æ
			var HDate1 = $("#HDate1").val();//å¼å§æ¥æ
			var HDate2 = $("#HDate2").val();//ç»ææ¥æ
			var HLastResult = $("#HLastResult").val();//å¤å®ç»è®º
			var HName1 = $("#HName1").val();//è´¨æ£ååç§°
			var HName2 = $("#HName2").val();//æ£éªé¡¹ç®
			@@ -672,12 +558,7 @@
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			@@ -699,48 +580,7 @@
			}
			sqlWhere += " and " + ColName + " " + com;
			}
			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (HBillNo)
			sqlWhere += " and åæ®å· like '%" + HBillNo + "%'";
			if (HNumber)
			@@ -761,10 +601,15 @@
			sqlWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";

			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
			sqlWhere += " and æ¥æ >= '" + HDate1 + "'";
			}
			if (HDate2) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'";
			sqlWhere += " and æ¥æ <= '" + HDate2 + "'";
			}
			if (number==2) {
			if (HProject) {
			sqlWhere += " and é¡¹ç®å· like '%" + HProject + "%'";
			}
			}
			RoadHBillNo(sqlWhere);
			}
			@@ -772,36 +617,51 @@

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {

			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ
			$("#HBillNo").val("");
			$("#HProNumber").val("");
			$("#HName").val("");
			$("#HReceiveEmp").val("");
			$("#HBillStatus").val("");

			$("#HProject").val("");
			$("#HNumber").val("");
			$("#HModel").val("");
			$("#HName1").val("");
			$("#HName2").val("");
			$("#HName3").val("");
			$("#HProcExchBillNo").val("");


			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			form.render('select');

			sWhere = "";
			}
			//#endregion

			//#region è·åé¡¹ç®å·
			function Get_HProject() {
			//è·åé¡¹ç®å·
			var HProjectList = '<option value="0" style="color:red;" selected></option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Gy_Material/Get_HProject",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
			}
			$("#HProject").append(HProjectList);
			form.render('select');

			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			@@ -828,7 +688,7 @@

			//#endregion



			//#endregion

			//#region å·æ°
			@@ -871,7 +731,7 @@
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion
			//#endregion

			//#region åå³é/å³éæ°æ®
			function set_CloseBill(num) {
			@@ -943,7 +803,7 @@
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion
			//#endregion

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			@@ -991,14 +851,13 @@

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			//var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 1; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			@@ -1083,7 +942,7 @@
			Organization = '<option style="color:blue;" value="' + HSelectedVal + '" selected="selected">' + HSelectedVal + '</option>';
			Organization += '<option value="0" ></option>';
			}


			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true && option.cols[0][i].field != HSelectedVal) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			@@ -1091,31 +950,10 @@
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelistæ°ç»åå«ä¸æ¶é´ç¸å³çæ´æ°å¼
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"]; //itilelistä¸valuelistå¼ç¸å¯¹äºçè¡¨ï¼ä¸ä½ä¸ºä¸ææ¡ææ¬æ¾ç¤º

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';//å®ä¹åç¬¦ä¸²HInitTimeCycle_ArrayList ä½ç¨äºä¸æåçhtmlåå®¹ åå«optionåç´ ï¼å¼ä¸ºâ1ï¼ä¸å¨ä¸ææ¡æ¾ç¤ºä»»æé´é
			for (var i = 0; i < valueList.length; i++) { // éåvalueList æ°ç» ä½¿æ¯ä¸ä¸ªå¼çæä¸ä¸ªå¯¹åºoptionåç´
			HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// æçæçoptionåç´ æ·»å å¥HInitTimeCycle_ArrayListåç¬¦ä¸²ä¸
			}

			$("#HInitTimeCycle").empty(); //ä½¿ç¨jqueryçemptyæ¹æ³æ¸ç©ºHInitTimeCycle_ArrayList <select>åç´ çå¼
			$("#HInitTimeCycle").append(HInitTimeCycle_ArrayList); //ä½¿ç¨appendæ¹æ³æå»ºä¹åHInitTimeCycle_ArrayListåç¬¦ä¸² çåå®¹ä¼ å¥HInitTimeCycle
			form.render('select'); //è°ç¨ éæ°æ¸²æselectåç´

			$("#HInitTimeCycle").val("29"); //ä½¿ç¨jQueryçval()æ¹æ³å°ä¸æåè¡¨çéä¸å¼è®¾ç½®ä¸º"29 ï¼ä¸æ¾ç¤ºãè¿ä¸æå¤©ã
			}
			//#endregion
			//#region è·ååæ°
			function getUrlVars() {
			var vars = [], hash;
			@@ -1128,7 +966,7 @@
			return vars;
			}
			//#endregion


			//#region ãè¿æ»¤æ¹æ¡ã

			//è·åå½åç¨æ·çé»è®¤è¿æ»¤æ¹æ¡
			@@ -1164,7 +1002,7 @@
			}
			}
			//æ¥è¯¢
			get_FastQuery();
			get_FastQuery();
			form.render("select");
			} else {
			//å½åç¨æ·æ²¡æè®¾ç½®é»è®¤çè¿æ»¤æ¹æ¡
			@@ -1173,7 +1011,7 @@
			//æ§è¡æ¥è¯¢æ¹æ³
			//æ¥è¯¢
			get_FastQuery();


			form.render("select");
			}
			}, error: function () {