MES-WEB-LayUI.git

			@@ -430,55 +430,53 @@
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],"page": page, "size": size },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];//ååæ®µæ°æ®
			if (data1.code == 1) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];
			var col = [];
			var totalArray = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) { //å¾ªåºéåæ°ç»
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType }); //ä»æ¯ä¸ªå¯¹è±¡ä¸æåæ°æ®
			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++) { //éådataæ°ç»éçæ°æ®
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) { //æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸ è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			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 {
			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 == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			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: true, width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
			}
			}
			}
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 800
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			}
			DisPlay_HideColumn();
			columns = col;
			option.cols = [col];
			option.data = data1.data;
			option.totalRow = true;
			table.render(option);
			laypage.render(optionPage);

			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -491,12 +489,6 @@
			});
			}

			////éç½®æé®
			//form.on('submit(btnReSearch)', function (data) {
			// $("#HNumber").val("");
			// $("#HName").val("");
			// $("#btnSearch").click();
			//});

			//#region æ°å¢
			function set_AddNew() {
			@@ -536,14 +528,14 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HItemID = data[0];
			var HInterID = data[0].hmainid.toString();
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			var wait = layer.load();
			//é»è¾å é¤æ¹æ³
			$.ajax({
			url: GetWEBURL() + 'QC_OutCompCheckBill/DeltetOutCompCheckBill',
			type: "GET",
			data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
			data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]},
			success: function (result) {
			console.log('gouba' + result);
			if (result.count == 1) {
			@@ -826,11 +818,11 @@



			//éèåè®¾ç½®
			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			@@ -860,8 +852,8 @@
			}
			})
			}

			//æ¾ç¤ºåæ°æ®
			//#endregion
			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			@@ -870,14 +862,14 @@
			success: function (data1) {
			if (data1.data.length != 0) {


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "hsubid", "HProcCheckEmpID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

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

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].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;
			@@ -938,20 +930,18 @@
			} else {
			table.render(option);
			}

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

			////#region æ¸ç©ºè¿æ»¤æ¡ä»¶
			//function set_ClearQuery() {
			// $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			// $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			// $("#HBillNo").val("");

			//}
			////#endregion
			//#region ä»»æåæ®µè¿æ»¤ï¼ååæ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';

	WebTM/layuiadmin/Scripts/webConfig.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBillList.html	102 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -5,9 +5,9 @@
			//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
			/var WEBURL = "http://localhost/API/"; //é¢æåæ¬å°éç½®/
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®
			/* var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°éç½®*/
			var WEBURL = "http://localhost:8082/API/"; //å¼ çå¹¿æ¬å°éç½®
			/* var WEBURL = "http://localhost:81/API/" //ç¿æ¶æ¶æ¬å°éç½®*/
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			/var WEBURL = "http://localhost:8082/LuBaoAPI/";/ //ä½ææ°æ¬å°éç½®
			//var WEBURL = "http://localhost:8088/ARAPI/"; //ä½ææ°æ¬å°éç½®(å®ç)

			@@ -787,10 +787,10 @@
			//éåº
			form.on('submit(Exit)', function (data) {
			if (OperationType == 1) {
			Pub_Close(closeType);//ç´æ¥æ°å¢closeTypeå¼ä¸º2ï¼åè¡¨è°æ°å¢closeTypeå¼ä»åè¡¨ä¼ é
			Pub_Close(1);//ç´æ¥æ°å¢closeTypeå¼ä¸º2ï¼åè¡¨è°æ°å¢closeTypeå¼ä»åè¡¨ä¼ é
			}
			else if (OperationType == 3) {
			Pub_Close(closeType);
			Pub_Close(1);
			}
			else {
			Pub_Close(2);