MES-WEB-LayUI.git

			@@ -67,6 +67,7 @@
			<label class="layui-form-label">å·¥åä»£ç </label>
			<div class="layui-input-inline">
			<select name="HWorksNumber" id="HWorksNumber" lay-filter="HWorksNumber" class="layui-input" value="" style="float:left;width:150px">
			<!--<option value="0">èæ</option>-->
			</select>
			</div>
			</div>
			@@ -85,13 +86,14 @@
			<option value="1">çäº§è®¢å</option>
			<option value="2">çäº§æ±æ¥å</option>
			<option value="3">éè´è®¢å</option>
			<option value="4">æ¶æéç¥å</option>
			<!--<option value="4">æ¶æéç¥å</option>
			<option value="5">å§å¤è®¢å</option>
			<option value="6">çäº§å¥åºå</option>
			<option value="7">éè´å¥åºå</option>
			<option value="8">éå®éè´§å</option>
			<option value="9">çäº§éæå</option>
			<option value="10">å·¥åºæµè½¬å¡</option>
			<option value="10">å·¥åºæµè½¬å¡</option>-->
			<option value="11">éå®åºåºå</option>
			</select>
			</div>
			</div>
			@@ -108,6 +110,7 @@
			<label class="layui-form-label">æ¡ç ç±»å</label>
			<div class="layui-input-inline">
			<select name="HBarCodeType" id="HBarCodeType" lay-filter="HBarCodeType" class="layui-input" value="" style="float:left;width:150px">
			<!--<option value="11">å¯ä¸æ¡ç </option>-->
			</select>
			</div>
			</div>
			@@ -179,6 +182,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

			//è·ååæ°
			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			@@ -469,6 +478,9 @@
			case '10':
			return "å·¥åºæµè½¬å¡";
			break;
			case '11':
			return 'éå®åºåºå';
			break;
			}
			}

			@@ -593,6 +605,17 @@
			$('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//çææé®ç¦ç¨
			for (var i = 0; i < table.cache['mainTable'].length; i++) {
			table.cache['mainTable'][i]["HDate"] = $("#HDate").val();
			if (table.cache["mainTable"][i].HMaterName!=null&&(table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 \|\| table.cache["mainTable"][i].HMaterName.indexOf(";") != -1)) {
			table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "â").replaceAll(";", "ï¼")
			}
			if (table.cache["mainTable"][i].HMaterModel!=null&&(table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 \|\| table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1)) {
			table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replaceAll("\"", "â").replaceAll(";", "ï¼")
			}
			if (table.cache["mainTable"][i].HPinfan!=null&&("HPinfan" in table.cache["mainTable"][i])) {
			if (table.cache["mainTable"][i].HPinfan.indexOf("\"") != -1 \|\| table.cache["mainTable"][i].HPinfan.indexOf(";") != -1) {
			table.cache["mainTable"][i].HPinfan = table.cache["mainTable"][i].HPinfan.replaceAll("\"", "â").replaceAll(";", "ï¼")
			}
			}
			}
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			HMaterInfo = table.cache['mainTable'];
			@@ -1443,6 +1466,123 @@
			//è¡¨æ ¼è¡åäºä»¶å¿«æ·é®çé
			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 == "HMaterNumber") { //å®ä½å½åæ£å¨è¾å¥çææ¬æ¡çåå
			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) {
			obj.update({
			"HMaterID": childData.HItemID,
			"HMaterNumber": childData.ç©æä»£ç ,
			"HMaterName": childData.ç©æåç§°,
			"HMaterModel": childData.è§æ ¼åå·,
			"HUnitID": childData.HUnitID,
			"HUnitNumber": childData.è®¡éåä½ä»£ç ,
			"HUnitName": childData.è®¡éåä½åç§°
			});

			if ($("#HBarCodeType").find("option:selected").html() == 'æçæ¡ç ') {
			obj.update({
			HQty: 1, //æ°é
			HMinQty: 1, //æå°åè£æ°é
			HBQty: 1 //ç®±æ°
			});
			}

			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("HSourceBillNo");
			element.focus();

			childPage.getSelectedData(currRowIndex);

			if (childData != null) {
			obj.update({
			"HMaterID": childData.HItemID,
			"HMaterNumber": childData.ç©æä»£ç ,
			"HMaterName": childData.ç©æåç§°,
			"HMaterModel": childData.è§æ ¼åå·,
			"HUnitID": childData.HUnitID,
			"HUnitNumber": childData.è®¡éåä½ä»£ç ,
			"HUnitName": childData.è®¡éåä½åç§°
			});

			if ($("#HBarCodeType").find("option:selected").html() == 'æçæ¡ç ') {
			obj.update({
			HQty: 1, //æ°é
			HMinQty: 1, //æå°åè£æ°é
			HBQty: 1 //ç®±æ°
			});
			}

			childData = null;
			}


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

			}
			//#endregion

			if (event.key == "F7") {
			//ç©æä¿¡æ¯ å¦æå¨ç©æä»£ç å æF7
			if (obj.event === 'HMaterNumber') //ç©æä¿¡æ¯ å¦æå¨æ¨¡å·ä»£ç å æF7