MES-WEB-LayUI.git

			@@ -74,6 +74,7 @@
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
			<input type="hidden" name="HInterID" id="HInterID" value="0">
			<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value=0>
			<input type="hidden" name="HBillSubType" id="HBillSubType" value="">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			@@ -376,7 +377,7 @@
			var month = date.getMonth() + 1;
			var year = date.getFullYear();
			var shijian = year + "-" + month + "-" + day;

			var topScroll = 0;//è®°å½æ»å¨æ¡çä½ç½®
			var allVal;
			//#endregion
			var HModName = "Add_Edit_Kf_POStockInBillList"
			@@ -406,7 +407,8 @@
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			}

			var HBillSubType = getParams("HBillSubType") == "" ? "1201" : getParams("HBillSubType");//åæ®åç±»å
			$("#HBillSubType").val(HBillSubType);


			//#region è·åæå¤§åæ®å·
			@@ -793,11 +795,13 @@
			table.on('edit(mainTable)', function (obj) {
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var ref1 = /^-?\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"]; //éé¢ç²¾åº¦
			topScroll = $('#mainTable').next('.layui-table-view').find('.layui-table-body').scrollTop();//è·åæ»å¨æ¡ä½ç½®
			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			@@ -808,14 +812,23 @@
			case "HQty": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp) \|\| temp == 0) {
			if (!ref1.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HQty: oldText
			});
			table.render(option);

			layer.msg("æ°éè¯·è¾å¥å¤§äº0çæ°å!");
			layer.msg("æ°éè¯·è¾å¥ä¸ä¸º0çæ°å!");
			return;
			} else if (temp * 1 == 0) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HQty: oldText
			});
			table.render(option);

			layer.msg("æ°éè¯·è¾å¥ä¸ä¸º0çæ°å!");
			return;
			}

			@@ -975,7 +988,7 @@
			, HMoney: HMoney
			, HlineTotal: HlineTotal
			});
			//table.render(option);
			table.render(option);
			break;
			case "HTaxPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -1129,6 +1142,9 @@
			, { field: 'HRemark', title: 'å¤æ³¨', width: 100, edit: 'text' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			, done: function (res, curr, count) {
			$(".layui-table-main").scrollTop(topScroll);
			}
			}

			option.data = [];
			@@ -1149,8 +1165,10 @@
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼

			var data = result.data[0];
			allVal = result.data[0];
			HBillSubType = data.HBillSubType;
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			@@ -1683,7 +1701,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'é¡¹ç®åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../é¡¹ç®ç®¡ç/å·¥ç¨é¡¹ç®/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
			, content: ['../../é¡¹ç®ç®¡ç/å·¥ç¨é¡¹ç®/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID + "&HBillSubType=" + HBillSubType, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -3037,6 +3055,7 @@
			function AllowLoadData(data) {

			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var ref1 = /^-?\d+(\.\d+)?$/; //å¤æåç¬¦ä¸²æ¯å¦ä¸ºæ°å(åå«æ´æ°ãæµ®ç¹æ°)ï¼æ£åè¡¨è¾¾å¼
			var temp = "";

			//if ($("#HWHID").val() == 0) {
			@@ -3094,11 +3113,11 @@

			//å®åæ°éæ ¼å¼æ ¡éª
			temp = option.data[i]["HQty"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ°éä¸è½ä¸º0ï¼");
			if (!ref1.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éè¯·è¾å¥ä¸ä¸º0çæ°åï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ°éè¯·è¾å¥å¤§äº0çæ°åï¼");
			} else if (temp * 1 == 0) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éè¯·è¾å¥ä¸ä¸º0çæ°åï¼");
			return false;
			}

			@@ -3129,15 +3148,15 @@
			return false;
			}

			//éé¢æ ¼å¼æ ¡éª
			temp = option.data[i]["HMoney"] + "";
			if (temp == "0") {
			//layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢ä¸è½ä¸º0ï¼");
			//return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢è¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}
			////éé¢æ ¼å¼æ ¡éª
			//temp = option.data[i]["HMoney"] + "";
			//if (temp == "0") {
			// //layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢ä¸è½ä¸º0ï¼");
			// //return false;
			//} else if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢è¯·è¾å¥å¤§äº0çæ°åï¼");
			// return false;
			//}
			//æ¶æä»åºéç©ºéªè¯
			if (option.data[i]["HWHID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ¶æä»åºæªéæ©ï¼");
			@@ -3152,6 +3171,17 @@

			//#endregion

			//å°urlåæ°ä¸çä¸æä¹±ç éæ°è½¬æ¢æä¸æ
			function getParams(key) {
			var reg = new RegExp("(^\|&)" + key + "=([^&]*)(&\|$)");
			//å¦æå°åæ ä¸åºç°ä¸æåè¿è¡ç¼ç
			var r = encodeURI(window.location.search).substr(1).match(reg);
			if (r != null) {
			//å°ä¸æç¼ç çåç¬¦éæ°åæä¸æ
			return decodeURI(unescape(r[2]));
			}
			return "";
			};

			//ä»¥ä¸æ¯layuiæ¨¡å
			});