MES-WEB-LayUI.git

			@@ -291,6 +291,7 @@
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></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>
			</div>
			@@ -316,6 +317,13 @@
			</script>

			<script>
			//#region ææ¬æ¡è¾å¥æç´¢ç¸å³æ°æ®-åé
			var childPage = null; //è·ååçªå£å¯¹è±¡ï¼ç¨äºæä½åçªå£çåéåæ¹æ³
			var currRowIndex = 0; //ç¨äºå®ä½åçªå£å½åéä¸çè¡
			var childData = null; //ç¨äºè·ååçªå£è¿åçæ°æ®
			//#endregion


			var HDataTemp = {};
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -500,6 +508,10 @@
			form.render('select');
			}
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;

			}
			});
			@@ -519,10 +531,15 @@
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var temp = "";
			var Dec = getDecByMaterID(obj.data.HMaterID) //è·åç²¾åº¦
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			//var Dec = getDecByMaterID(obj.data.HMaterID) //è·åç²¾åº¦
			//var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			//var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			//var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦

			var HQtyDec = 4; //æ°éç²¾åº¦
			var HPriceDec = 4; //åä»·ç²¾åº¦
			var HMoneyDec = 2; //éé¢ç²¾åº¦

			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			@@ -600,7 +617,7 @@
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			//HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));
			HSumMoney = dealDoubleToFixed(HSumMoney, 2);

			@@ -905,6 +922,8 @@
			option.data = rowdata;
			table.render(option);

			DisPlay_HideColumn();

			}
			//#endregion

			@@ -933,6 +952,89 @@
			//#region åè¡¨ï¼å¿«æ·é®(F7)æå¼å¼¹çª
			function set_GridCellCheck(obj) {
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			//#region åè¡¨ææ¬æ¡è¾å¥åæ£ç´¢æ°æ®
			if (event.key != "F7") {
			var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
			if (obj.event == "HPMoneyName") { //å®ä½å½åæ£å¨è¾å¥çææ¬æ¡çåå
			if ($.inArray(event.key, errKeys) == -1) { //å¦ææä¸çé®ä½ä¸æ¯ æ¹åé®ï¼åå·æ°å¼¹çªä¸çæ°æ®
			if (childPage == null) { //å¤æå½ååçªå£æ¯å¦å·²ç»æå¼ï¼è¥æªæå¡ï¼åæå¼é¡µé¢ï¼å¹¶è·ååçªå£çå¯¹è±¡
			var offset = $(this).offset(); //è·åè§¦åäºä»¶çåç´ çä½ç½®ï¼ç¨äºå®ä½åçªå£æå¼çä½ç½®
			var innerHeight = window.innerHeight;
			var top = offset.top + 0.05 * innerHeight;
			var left = offset.left;
			if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
			top = top - 0.3 * innerHeight - 0.05 * innerHeight;
			}
			layer.open({
			type: 2 //å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['25%', '30%'] //å¤§å°
			, shadeClose: true //ç¹å»é®ç½©æ¶å³éå¼¹çª
			, offset: [top, left]
			, title: false //ä¸æ¾ç¤ºæ é¢æ
			//, title: 'é¡¹ç®è´¹ç¨åè¡¨' //æ é¢
			, shift: 2 //å¼¹åºå¨ç»
			, closeBtn: 0 //ç¦ç¨å³éæé®
			, content: ["../../åºç¡èµæ/éç¨åºç¡èµæ/Gy_CommonBaseData.html?OperationType=2", "yes"]
			, success: function (layero, index) {
			setTimeout(function () {
			var value = $(e.currentTarget).val().replace("'", ""); //è·åææ¬æ¡ææ°å¼
			currRowIndex = 0;
			var tableView = "h_v_Gy_ProjectMoney";
			var childSWhere = "select top(10) HItemID,é¡¹ç®è´¹ç¨ä»£ç ä»£ç ,é¡¹ç®è´¹ç¨åç§° åç§° from " + tableView + " where 1=1 and (é¡¹ç®è´¹ç¨åç§° like '%" + value + "%' or é¡¹ç®è´¹ç¨ä»£ç like '%" + value + "%') ";
			childPage.getData(childSWhere, tableView);
			}, 200);
			}
			, end: function () {
			obj.event = "";
			childPage = null;
			currRowIndex = 0;
			if (childData != null) {
			obj.update({
			"HProjectMoneyID": childData.HItemID
			, "HPMoneyName": childData.åç§°
			})
			childData = null;
			}
			}
			});
			} else {
			setTimeout(function () {
			var value = $(e.currentTarget).val().replace("'", ""); //è·åææ¬æ¡ææ°å¼
			currRowIndex = 0;
			var tableView = "h_v_Gy_ProjectMoney";
			var childSWhere = "select top(10) HItemID,é¡¹ç®è´¹ç¨ä»£ç ä»£ç ,é¡¹ç®è´¹ç¨åç§° åç§° from " + tableView + " where 1=1 and (é¡¹ç®è´¹ç¨åç§° like '%" + value + "%' or é¡¹ç®è´¹ç¨ä»£ç like '%" + value + "%') ";
			childPage.getData(childSWhere, tableView);
			}, 200);
			}
			} else { //å¦ææä¸çé®ä½æ¯ æ¹åé®ï¼åè°æ´çªå£ä¸ éä¸è¡ çä½ç½®
			if (event.key == "ArrowUp") {
			currRowIndex--;
			childPage.setSelectedRow(currRowIndex);
			} else if (event.key == "ArrowDown") {
			currRowIndex++;
			childPage.setSelectedRow(currRowIndex);
			} else if (event.key == "Enter") {
			//æå¨å¤±ç¦
			var element = document.getElementById("HBillNo");
			element.focus();

			childPage.getSelectedData(currRowIndex);
			obj.update({
			"HProjectMoneyID": childData.HItemID
			, "HPMoneyName": childData.åç§°
			})
			childPage = null;
			currRowIndex = 0;
			childData = null;
			obj.event = "";
			}
			}
			}

			}
			//#endregion

			if (event.key == "F7") {
			//å¨å·ç®¡ç
			if (obj.event == "HPMoneyName") {
			@@ -959,7 +1061,7 @@
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (typeof (HDataTemp.HItemID) != "undefined") {
			if (typeof(HDataTemp.HItemID) != "undefined") {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HProjectMoneyID": HDataTemp.HItemID
			@@ -971,8 +1073,49 @@
			});
			}
			obj.event = "";
			return false;
			//return false;
			}
			})

			$(document).off('dblclick', ".layui-table-edit").on('dblclick', '.layui-table-edit', function (e) {
			//å¨å·ç®¡ç
			if (obj.event == "HPMoneyName") {
			//æå¼å¨å·ç®¡çå°çªä½
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'é¡¹ç®è´¹ç¨åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_ProjectMoney.html?OperationType=2", "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('è¯·éæ©æ°æ®');
			}

			obj.update({
			"HProjectMoneyID": checkStatus.data[0].HItemID
			, "HPMoneyName": checkStatus.data[0].é¡¹ç®è´¹ç¨åç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (typeof (HDataTemp.HItemID) != "undefined") {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HProjectMoneyID": HDataTemp.HItemID
			, "HPMoneyName": HDataTemp.é¡¹ç®è´¹ç¨åç§°
			})
			HDataTemp = {};
			}
			}
			});
			}
			obj.event = "";
			//return false;
			})
			}
			//#endregion
			@@ -1436,6 +1579,130 @@
			});
			}
			//#endregion

			//#region åè¡¨1ï¼éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			for (var i = 0; i < urlLen.length - 4; i++) {
			contentUrl += "../";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

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

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//#endregion
			//#region åè¡¨1ï¼æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			async: false,
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			async: false,
			success: function (data1) {
			if (data1.data.length != 0) {
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["HMaterID", "HUnitID", "æºååç ", "æºåååç ", "æºåå·", "æºåç±»å", "å³èæ°é", "å³èéé¢", "HQty_Old", "HQty_New"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			titleData = [];

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

			for (var i = 0; i < option.cols[0].length - 2; 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;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			}

			//åæ¶å»ç»å
			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);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion
			//#endregion

			});
			@@ -1455,7 +1722,7 @@

			function GetProjectMoneyValue(obj) //è¿åè´¹ç¨é¡¹ç®
			{
			HDataTemp = obj[0];
			HDataTemp = obj;
			}

			function GetHSupValue(obj) //è¿åå®¢æ·