MES-WEB-LayUI.git

			@@ -96,6 +96,14 @@
			<input type="text" class="layui-input ForFilteringSchemes" name="HName1" id="HName1">
			</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>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			@@ -213,8 +221,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="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			@@ -257,6 +267,9 @@

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

			//#region ãå¨æè·åæ¨¡ååç§°ã
			@@ -266,7 +279,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
			@@ -297,6 +310,9 @@

			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			//æ°å¢
			case 'set_AddNew': set_AddNew();
			break;
			@@ -399,7 +415,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

			@@ -449,8 +477,8 @@
			$("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_Display(sWhere);
			//è·åé¡¹ç®å·
			Get_HProject();
			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();

			@@ -463,7 +491,7 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, page: false
			, sort: true //éç¹1ï¼è¿éçsortè¡¨ç¤º tableè¡¨å¨åå¾æ¥å£æ°æ®åï¼å¯¹é¡µé¢æ¸²æåçtableæ°æ®è¿è¡æåºãåæ¶ï¼è¿éçtrue ä¼å½±åé¡µé¢sort ä¸ä¸å°ç®å¤´ç æ¾ç¤ºææ
			, totalRow: true
			//, cellMinWidth: 90
			@@ -473,6 +501,24 @@
			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
			//#endregion çå¬ç½æ ¼è¡¨ä½äºä»¶
			@@ -557,8 +603,8 @@
			, totalRow: true
			, height: 'full-50'
			, page: true //å¼å¯åé¡µ
			, limit: 500
			, limits: [500, 2000, 5000, 20000]
			, limit: 50
			, limits: [50, 2000, 5000 ]
			, cols: [col]
			, data: data1.data
			, done: function (res, curr, count) {
			@@ -568,6 +614,7 @@
			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();
			table.render(option);
			ins = table.render(option);

			ColFilter();

			@@ -588,11 +635,84 @@
			}
			//#endregion

			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sqlWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/QC_ProcessCheckMainBill/QC_ProcessCheckMainBillListPage',
			type: "GET",
			data: { "sWhere": sqlWhere, "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();//è§æ ¼åå·
			@@ -701,7 +821,14 @@
			if (HDate2) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate2 + "'";
			}
			get_Display(sqlWhere);
			if (number == 2) {
			if (HProject) {
			sqlWhere += " and é¡¹ç®å· like '%" + HProject + "%'";
			}
			}
			//get_Display(sqlWhere);
			//æ°æ®åºåé¡µæ¥è¯¢
			get_DisplayPage(sqlWhere);
			}
			//#endregion

			@@ -713,7 +840,7 @@
			$("#HBillNo").val("");
			$("#HProNumber").val("");
			$("#HName").val("");

			$("#HProject").val("");
			$("#HNumber").val("");
			$("#HModel").val("");
			$("#HName1").val("");
			@@ -737,6 +864,14 @@
			sWhere = "";
			}
			//#endregion


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


			//#region æ°å¢
			function set_AddNew() {
			@@ -947,7 +1082,7 @@
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["title"] + ",";
			colName += option.cols[0][i]["field"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			@@ -956,7 +1091,7 @@
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

			layer.open({
			type: 2
			@@ -978,85 +1113,190 @@
			}
			//#endregion
			//#region æ¾ç¤ºåæ°æ®
			//function DisPlay_HideColumn() {
			// $.ajax({
			// url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			// type: "GET",
			// data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			// success: function (data1) {
			// if (data1.data.length != 0) {

			// 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;
			// }
			// //è®¾ç½®åå®½
			// if (dataCols[3] > 0) {
			// option.cols[0][i + 1]["width"] = dataCols[3];
			// }
			// //è®¾ç½®åå®¹åä½å¤§å°
			// if (data1.data[0].HFontSize != 0) {
			// option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			// } else {
			// option.cols[0][i + 1]["style"] = "font-size:100%";
			// }
			// //è®¾ç½®åå®½
			// //if (data1.data[0].HColumnWidth != 0) {
			// // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			// //} else {
			// // option.cols[0][i + 1]["width"] = "";
			// //}
			// //æ¾ç¤ºå
			// if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			// option.cols[0][i + 1]["hide"] = false;
			// }
			// //åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			// switch (dataCols[2]) {
			// case "L":
			// option.cols[0][i + 1]["align"] = "left";
			// break;
			// case "M":
			// option.cols[0][i + 1]["align"] = "center";
			// break;
			// case "R":
			// option.cols[0][i + 1]["align"] = "right";
			// break;
			// }
			// }

			// //åæ¶å»ç»å
			// for (var i = 1; i < option.cols[0].length - 1; i++) {
			// if (option.cols[0][i]["fixed"] != null) {
			// option.cols[0][i]["fixed"] = null;
			// }
			// else {
			// break;
			// }
			// }
			// //å»ç»å
			// if (data1.data[0].HFixCols != 0) {
			// for (var i = 0; i < data1.data[0].HFixCols; i++) {
			// if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			// data1.data[0].HFixCols += 1;
			// }
			// option.cols[0][i + 1]["fixed"] = "left";
			// }
			// }
			// table.render(option);
			// } else {
			// table.render(option);
			// }

			// //å·æ°æé®æ¾ç¤º
			// var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			// var HBillType = "7507";
			// Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			// }, error: function () {
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			// })
			//}
			//#endregion

			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			//var titleData = ["åæ®ID", "HMouldID", "hsubid", "HManagerID", "æºåä¸»åç ", "æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			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;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			if (dataCol.length == option.cols[0].length - 1) {
			//éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			for (var j = 0; j < option.cols[0].length - 1; j++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[j].split('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[5]) {
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			if (dataCol.length == newCols[0].length - 1) {
			option.cols = newCols;
			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			}
			}
			table.render(option);

			} else {
			table.render(option);

			}

			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "7507";
			@@ -1067,6 +1307,7 @@
			})
			}
			//#endregion


			//#region ä»»æåæ®µè¿æ»¤ï¼ååæ¾ç¤ºä¸ææ¡
			function ColFilter() {
			@@ -1083,7 +1324,7 @@

			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>';
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
			}
			}
			$("#ColName1").empty();
			@@ -1123,6 +1364,31 @@
			vars[hash[0]] = hash[1];
			}
			return vars;
			}
			//#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

			@@ -1169,7 +1435,7 @@
			document.getElementById("HFilterScheme_Now").style.display = "none";
			//æ§è¡æ¥è¯¢æ¹æ³
			//æ¥è¯¢
			//get_FastQuery();
			get_FastQuery();

			form.render("select");
			}