MES-WEB-LayUI.git

			@@ -34,120 +34,64 @@
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HDate">
			<input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
			<input type="date" class="layui-input ForFilteringSchemes" id="HEndDate">
			</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: 85px;">
			<select name="HMonth" id="HMonth" lay-verify="HMonth">
			<option value="åæ ¼">åæ ¼</option>
			<option value="ä¸åæ ¼">ä¸åæ ¼</option>
			<select name="HResult" id="HResult" lay-verify="HResult">
			<option value="-1">å¨é¨</option>
			<option value="1">åæ ¼</option>
			<option value="0">ä¸åæ ¼</option>
			</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; width: 125px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æå¹´ä»½-->
			</select>
			<label class="layui-form-label" style="width: 85px; padding: 9px 18px;">çäº§èµæº</label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="HSourceID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;margin-left:5%;">

			</div>
			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" 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>
			<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
			<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="HBatchWork" id="HBatchWork" lay-verify="HBatchWork">
			<option value="">è¯·éæ©</option>
			<option value="1">éäº§</option>
			<option value="0">ééäº§</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style=" margin-top: 10px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" 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>
			<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 class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" 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>
			<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="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			@@ -156,13 +100,13 @@
			<div class="layui-tab layui-tab-card">
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<!--è¿åºç«è®°å½-->
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			</div>
			</div>
			</div>
			<script type="text/html" id="toolbarDemo1">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			@@ -192,7 +136,8 @@
			, soulTable = layui.soulTable
			var sWhere = "";
			var option = [];
			var HModName = "QC_QualityStatisticsDailyReport";
			var ins; //ç¨äºå¯¼åºexcel
			var HModName = "QC_MoistureContentDataLedger";
			var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			//#endregion
			@@ -214,6 +159,9 @@
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			};
			});

			@@ -227,81 +175,49 @@
			set_ClearQuery();
			});


			//éæ©çäº§èµæº
			form.on('submit(btnHSource)', function () {
			btnHSource();
			});

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³

			// åå§åçé¢
			function set_ClearBill() {
			Year();
			DeptName();
			Organ();
			//set_InitGrid();
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			Get_HProject(); //è·åé¡¹ç®å·
			GetGy_Division();//è·åäºä¸é¨
			//æ¥è¯¢
			get_FastQuery();
			}

			//å¹´
			function Year() {
			var yyyy = new Date().getFullYear();
			var YearOption = "";
			for (var i = 0; i <= 10; i++) {
			YearOption += '<option style="color:blue;" value="' + (yyyy - 5 + i) + '">' + (yyyy - 5 + i) + '</option>';
			}
			$("#HYear").append(YearOption);
			$("#HYear").val(yyyy);
			$("#HMonth").val(new Date().getMonth()+1);
			form.render('select');
			}

			//çäº§è½¦é´
			function DeptName() {
			//è·åè½¦é´å
			var HDeptName = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			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++) {
			if (i == 0)
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
			else
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';

			}
			$("#HDeptName").append(HDeptName);
			form.render('select');
			//çäº§èµæºéæ©é¡µé¢
			function btnHSource() {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'çäº§èµæºåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			layer.closeAll("loading");
			}
			})
			}
			//è·åæ°æ®
			$("#HSourceID").val(checkStatus.data[0].HItemID);
			$("#HSourceName").val(checkStatus.data[0].çäº§èµæºåç§°);


			//è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			async: false,
			success: function (result) {
			var Organization = "";
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HOrgID").append(Organization);
			$("#HOrgID").val(sessionStorage["OrganizationID"])
			form.render('select');
			}
			layer.closeAll("loading");
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}

			@@ -309,35 +225,22 @@

			var columns = [];
			columns.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			columns.push({ field: 'å·¥åº', title: 'å·¥åº', sort: true, width: 90});
			columns.push({ field: 'å¤å®ç»æ', title: 'å¤å®ç»æ', sort: true, width: 110 });
			columns.push({ field: 'ä¸è¯åå ', title: 'ä¸è¯åå ', sort: true, width: 110 });
			columns.push({ field: 'æ»è®¡', title: 'æ»è®¡', sort: true, totalRow: true, width: 90});

			//è·åå¹´
			var yyyy = $("#HYear").val();
			//è·åæä»½
			var MM = $("#HMonth").val();
			//è·åå¼å§æä»½çæå¤§å¤©æ°
			var SumMonth = new Date(yyyy, MM, 0).getDate(); //å¨æä¸¤æä¹å·®

			for (var i = 0; i < SumMonth; i++) {
			columns.push({ field: Format(yyyy + '/' + MM + '/' + (i + 1), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (i + 1), 'MM.dd'), width: 80 })
			}

			columns.push({ field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 180});
			columns.push({ field: 'æºå°å·', title: 'æºå°å·', sort: true, width: 110 });
			columns.push({ field: 'åæ ·éé', title: 'åæ ·éé', sort: true, totalRow: true, width: 110 });
			columns.push({ field: 'æµéç»æ', title: 'æµéç»æ', sort: true, width: 110});
			columns.push({ field: 'å¤å®ç»æ', title: 'å¤å®ç»æ', sort: true, width: 110});
			columns.push({ field: 'æ£æµäºº', title: 'æ£æµäºº', sort: true, width: 110});
			columns.push({ field: 'å¤æ³¨', title: 'å¤æ³¨', sort: true, width: 110});
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo1'
			, height: 'full-50'
			, page: true
			//, cellMinWidth: 'auto'
			, totalRow: true
			, limit: 500
			, data:[]
			, limits: [50, 500, 5000, 20000]
			//, done: function (res, curr, count) {
			// soulTable.render(this);
			//}
			, limits: [50, 500, 5000, 20000]
			, cols: [columns]
			};
			table.render(option);
			@@ -348,23 +251,65 @@

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/QC_CustomerAppealReport/QC_QualityStatisticsDailyReport',
			url: GetWEBURL() + '/QC_CustomerAppealReport/QC_MoistureContentDataLedger',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {

			option.data=data1.data
			table.render(option);
			if (data1.list.length > 0) {
			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', totalRowText: 'åè®¡è¡' });
			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 {
			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;
			case 'long':
			case 'Int32':
			case 'Int64':
			case 'double':
			case 'Decimal':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}

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

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo1'
			, height: 'full-50'
			, page: true
			, totalRow: true
			, limit: 500
			, data: data1.data
			, limits: [50, 500, 5000, 20000]
			, cols: [col]
			};
			} else {
			set_InitGrid();
			option.data = data1.data
			}

			table.render(option);
			ins = table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -379,115 +324,97 @@

			// å¿«éè¿æ»¤
			function get_FastQuery() {
			var HYear = $("#HYear").val();
			var HMonth = $("#HMonth").val();
			var HDeptName = $("#HDeptName").val();
			var HOrgID = $("#HOrgID").val();

			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) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " 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 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}


			var HBeginDate = $("#HBeginDate").val();
			var HEndDate = $("#HEndDate").val();
			var HResult = $("#HResult").val();
			var HSourceID = $("#HSourceID").val();
			var HProject = $("#HProject").val();//é¡¹ç®å·
			var HBatchWork = $("#HBatchWork").val();//æ¯å¦éäº§
			var HDivisionName = $("#HDivisionName").val();//äºä¸é¨

			sWhere = {
			HYear: HYear
			, HMonth: HMonth
			, HDeptName: HDeptName
			, HOrgID: HOrgID
			HBeginDate: HBeginDate
			,HEndDate: HEndDate
			, HResult: HResult
			, HSourceID: HSourceID
			, HProject: HProject
			, HBatchWork: HBatchWork
			, HDivisionName: HDivisionName
			}
			set_InitGrid();
			//set_InitGrid();
			get_Display(JSON.stringify(sWhere));
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			function set_ClearQuery() {
			$("#HICMOBillNo").val("");
			$("#HBardCode").val("");
			$("#HProcExchBillNo").val("");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HResult").val("");
			$("#HSourceID").val("");
			$("#HProject").val("");
			$("#HBatchWork").val("");
			$("#HDivisionName").val("");
			form.render('select');

			sWhere = "";
			}

			//#region è·åé¡¹ç®å·
			function Get_HProject() {
			//è·åé¡¹ç®å·
			var HProjectList = '<option value="" 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

			//#region è·åäºä¸é¨
			function GetGy_Division() {
			//è·åäºä¸é¨
			var HDivisionList = '<option value="" style="color:red;" selected></option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
			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++) {
			HDivisionList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
			}
			$("#HDivisionName").append(HDivisionList);
			form.render('select');

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

			//#region å¯¼åºExecel
			function btn_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";