MES-WEB-LayUI.git

			@@ -56,6 +56,14 @@
			<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">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			@@ -145,7 +153,7 @@
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline" >
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			@@ -153,8 +161,10 @@
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<div id="page" style="position: relative; bottom: 0;"></div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-form"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			@@ -197,6 +207,9 @@

			var option = [];
			var sWhere = "";
			var ins; //ç¨äºå¯¼åºexcel
			var page = 1;//åé¡µæ°æ®
			var size = 50;
			var HModName = "QC_FirstPieceCheckBillList";

			//#region ãå¨æè·åæ¨¡ååç§°ã
			@@ -206,7 +219,7 @@
			//#endregion

			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
			var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID","sorderid"];

			var sql = " ";
			//#endregion
			@@ -225,7 +238,7 @@
			//#endregion


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

			@@ -238,6 +251,9 @@
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);
			switch (obj.event) {
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			case 'btn-getCheckData':
			var data = checkStatus.data;
			layer.alert(JSON.stringify(data));
			@@ -398,7 +414,19 @@

			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			if ($("#HProject").val() == 0) {
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery();
			}
			} else {
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery(2);
			}
			}
			});
			//#endregion

			@@ -417,9 +445,9 @@
			$("#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();

			@@ -432,7 +460,7 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, page: false
			, sort: true //éç¹1ï¼è¿éçsortè¡¨ç¤º tableè¡¨å¨åå¾æ¥å£æ°æ®åï¼å¯¹é¡µé¢æ¸²æåçtableæ°æ®è¿è¡æåºãåæ¶ï¼è¿éçtrue ä¼å½±åé¡µé¢sort ä¸ä¸å°ç®å¤´ç æ¾ç¤ºææ
			, totalRow: true
			//, cellMinWidth: 90
			@@ -442,12 +470,31 @@
			soulTable.render(this);
			}
			};
			optionPage = {
			elem: 'page', //æ³¨æï¼è¿éç page æ¯ IDï¼ä¸ç¨å # å·
			count: 10000, //æ°æ®æ»æ°ï¼ä»æå¡ç«¯å¾å°
			limit: 50,
			limits: [50, 500, 5000, 50000],
			layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
			jump: function (obj, first) {

			//é¦æ¬¡ä¸æ§è¡
			if (!first) {
			//do something
			page = obj.curr;
			size = obj.limit;
			get_FastQuery();
			}
			}
			}
			laypage.render(optionPage);
			}
			//#endregion


			//#region æ¥è¯¢
			function RoadHBillNo(sqlWhere) {
			var ajaxLoad = layer.load();
			sqlWhere+=" order by åæ®å· desc "
			$.ajax({
			//h_v_QC_FirstPieceCheckBill
			url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainList',
			@@ -455,7 +502,7 @@
			async: false,
			data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.count == 1) {

			var data = [];
			var col = [];
			@@ -493,8 +540,8 @@
			, totalRow: true
			, height: 'full-50'
			, page: true //å¼å¯åé¡µ
			, limit: 500
			, limits: [500, 2000, 5000, 20000]
			, limit: 50
			, limits: [50,500, 2000, 5000]
			, cols: [col]
			, data: data1.data
			, done: function (res, curr, count) {
			@@ -506,7 +553,7 @@
			DisPlay_HideColumn();
			layer.close(ajaxLoad);

			ColFilter();
			ColFilter();

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			}
			@@ -527,16 +574,89 @@
			}
			//#endregion

			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainListPage',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.code == 1) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			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 });
			//è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
			var patrn = new RegExp(/^h/i);
			if (patrn.test(data1.list[key].ColmCols)) {
			titleData[key] = data1.list[key].ColmCols;
			}
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			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: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
			break;
			case 'Decimal':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
			break;
			case 'Int32':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
			}
			}
			}

			columns = col;
			option.cols = [col];
			option.data = data1.data;
			option.totalRow = true;
			laypage.render(optionPage);
			ins = table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}

			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#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 = $("#HDate1").val();//å¼å§æ¥æ
			var HDate2 = $("#HDate2").val();//ç»ææ¥æ
			var HDate2 = $("#HDate2").val();//ç»ææ¥æ
			var HLastResult = $("#HLastResult").val();//å¤å®ç»è®º
			var HName1 = $("#HName1").val();//è´¨æ£ååç§°
			var HName2 = $("#HName2").val();//æ£éªé¡¹ç®
			@@ -593,7 +713,13 @@
			if (HDate2) {
			sqlWhere += " and æ¥æ <= '" + HDate2 + "'";
			}
			RoadHBillNo(sqlWhere);
			if (number==2) {
			if (HProject) {
			sqlWhere += " and é¡¹ç®å· like '%" + HProject + "%'";
			}
			}
			//RoadHBillNo(sqlWhere);
			get_DisplayPage(sqlWhere);
			}
			//#endregion

			@@ -604,14 +730,14 @@
			$("#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");
			@@ -619,6 +745,37 @@
			form.render('select');

			sWhere = "";
			}
			//#endregion

			//#region å¯¼åºExecel
			function btn_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#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

			@@ -645,7 +802,7 @@

			//#endregion



			//#endregion

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

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

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			@@ -814,7 +971,7 @@
			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;
			@@ -899,7 +1056,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>';
			@@ -923,7 +1080,7 @@
			return vars;
			}
			//#endregion


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

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


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