MES-WEB-LayUI.git

			@@ -70,7 +70,7 @@
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åæ®å·<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<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>
			</div>
			@@ -81,19 +81,18 @@
			<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs8 layui-inline">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¾åºå<label style="color:red"> * </label></label>
			<div class="layui-input-inline" style="width:750px">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:700px;">
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:700px;">
			<div class="layui-input-inline">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä»åº<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			@@ -104,8 +103,6 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">éªæ¶å</label>
			<div class="layui-input-inline">
			@@ -126,6 +123,9 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">

			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-inline">
			@@ -136,8 +136,6 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">æºåç±»å</label>
			<div class="layui-input-inline">
			@@ -156,30 +154,19 @@
			</button>
			</div>
			<!--<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
			</div>-->
			<div class="layui-input-inline">
			<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
			</div>-->
			</div>
			</div>
			<div class="layui-row">

			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">è´è´£äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>


			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">é¨é¨<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value=0 style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			@@ -200,6 +187,20 @@
			<input class="layui-input" name="HProjectName" id="HProjectName" style="background-color:#efefef4d;" readonly autocomplete="off">
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">é¨é¨<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value=0 style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>

			</div>
			<!--<div class="layui-row">

			@@ -347,6 +348,12 @@
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</script>
			<script>
			//#region ææ¬æ¡è¾å¥æç´¢ç¸å³æ°æ®-åé
			var childPage = null; //è·ååçªå£å¯¹è±¡ï¼ç¨äºæä½åçªå£çåéåæ¹æ³
			var currRowIndex = 0; //ç¨äºå®ä½åçªå£å½åéä¸çè¡
			var childData = null; //ç¨äºè·ååçªå£è¿åçæ°æ®
			//#endregion

			//#region æå æ³¨é
			//#endregion
			layui.config({
			@@ -1843,6 +1850,208 @@
			//è¡åå¿«æ·é®çé
			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 == "HMaterID") { //å®ä½å½åæ£å¨è¾å¥çææ¬æ¡çåå
			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_MaterialList";
			var childSWhere = "select top(10) HItemID,ç©æä»£ç ,ç©æåç§°,è§æ ¼åå·,HUnitID,è®¡éåä½åç§° from " + tableView + " where 1=1 and ç»ç»åç§° = '" + sessionStorage["Organization"] + "' and (ç©æä»£ç like '%" + value + "%' or ç©æåç§° like '%" + value + "%') order by ç©æä»£ç desc";
			childPage.getData(childSWhere, tableView);
			}, 200);
			}
			, end: function () {
			obj.event = "";
			childPage = null;
			currRowIndex = 0;
			if (childData != null) {
			OptionData = childData;

			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HSupID").val();
			if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
			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"]; //éé¢ç²¾åº¦
			$.ajax({
			url: GetWEBURL() + "/Gy_Supplier/xg",
			//url: "http://localhost:12761/Gy_Supplier/xg",
			type: "GET",
			data: {
			"HInterID": HSupID
			},
			success: function (d) {
			var HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01;
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			, "HTaxRate": HTaxRate * 100
			, "HQty": HQty //æ´æ°HQtyåæ®µï¼HQty
			, "HPrice": HPrice //æ´æ°HPriceåæ®µï¼HPrice
			, "HMoney": HMoney //æ´æ°HMoneyåæ®µï¼HMoney
			, "HlineTotal": HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal
			, "HTaxPrice": HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			})
			}
			});
			} else if (typeof (OptionData.HItemID) != "undefined") {
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			}

			OptionData = {};

			childData = null;
			}
			}
			});
			} else {
			setTimeout(function () {
			var value = $(e.currentTarget).val().replace("'", ""); //è·åææ¬æ¡ææ°å¼
			currRowIndex = 0;
			var tableView = "h_v_Gy_MaterialList";
			var childSWhere = "select top(10) HItemID,ç©æä»£ç ,ç©æåç§°,è§æ ¼åå·,HUnitID,è®¡éåä½åç§° from " + tableView + " where 1=1 and ç»ç»åç§° = '" + sessionStorage["Organization"] + "' and (ç©æä»£ç like '%" + value + "%' or ç©æåç§° like '%" + value + "%') order by ç©æä»£ç desc";
			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);

			if (childData != null) {
			OptionData = childData;

			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HSupID").val();
			if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
			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"]; //éé¢ç²¾åº¦
			$.ajax({
			url: GetWEBURL() + "/Gy_Supplier/xg",
			//url: "http://localhost:12761/Gy_Supplier/xg",
			type: "GET",
			data: {
			"HInterID": HSupID
			},
			success: function (d) {
			var HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01;
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			, "HTaxRate": HTaxRate * 100
			, "HQty": HQty //æ´æ°HQtyåæ®µï¼HQty
			, "HPrice": HPrice //æ´æ°HPriceåæ®µï¼HPrice
			, "HMoney": HMoney //æ´æ°HMoneyåæ®µï¼HMoney
			, "HlineTotal": HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal
			, "HTaxPrice": HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			})
			}
			});
			} else if (typeof (OptionData.HItemID) != "undefined") {
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			}

			OptionData = {};
			childData = null;
			}


			childPage = null;
			currRowIndex = 0;
			childData = null;
			obj.event = "";
			}
			}
			}

			}
			//#endregion

			if (event.key == "F7") {
			//ç©æ
			if (obj.event == "HMaterID") {
			@@ -2378,14 +2587,15 @@
			//è¡åå é¤
			function set_GridDelete(obj) {
			var data = obj.data;
			var rowIndex = $(obj.tr).attr("data-index");
			var rowIndex = $(obj.tr).attr("data-index");//è·åè¡ç´¢å¼
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			console.log("ç´¢å¼ä¸º:" + rowIndex);
			if (rowIndex === '0') {
			layer.msg('é¦è¡æ æ³å é¤ï¼ï¼ï¼');
			} else {
			obj.del();
			obj.del();//åå é¤
			table.cache["mainTable"].splice(rowIndex, 1); //â¡å½»åºç§»é¤åç´ ï¼ä»ç¼åéç§»é¤è¿ä¸è¡
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			table.reload(option);
			layer.close(index);
			@@ -2469,9 +2679,9 @@
			res = result.data;
			//layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			}, error: function (err) {
			res = "none";
			layer.alert("åçéè¯¯!", { icon: 5 });
			layer.alert("åçéè¯¯!"+err, { icon: 5 });
			}
			});
			return res;
			@@ -2520,9 +2730,9 @@
			res = result.data;
			//layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			}, error: function (err) {
			res = "none";
			layer.alert("åçéè¯¯!", { icon: 5 });
			layer.alert("åçéè¯¯!" + err, { icon: 5 });
			}
			});
			return res;