MES-WEB-LayUI.git

			@@ -88,9 +88,9 @@
			<div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_MaterialLowerBill_PDA">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;">åæ®ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">ç©æä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;display:none;">ç©æä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">å·²ä¸æ¶ä¿¡æ¯</li>
			<li lay-id="4" style="padding:1px;">åºåä¿¡æ¯</li>
			<li lay-id="4" style="padding:1px;">ä¸æ¶åºå</li>
			</ul>
			<div class="layui-tab-content">
			<!--åæ®ä¿¡æ¯-->
			@@ -185,9 +185,9 @@
			</div>
			</div>
			<!--ç©æä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-row">
			<div class="layui-col-xs12">
			<div class="layui-tab-item" style="display:none;">
			<div class="layui-row" style="display:none;">
			<div class="layui-col-xs12" style="display:none;">
			<div class="layui-form-item" style="padding:0px;margin:0px"></div>
			<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
			</div>
			@@ -267,6 +267,7 @@
			var OperationType = 1 //æä½ç±»åï¼1æ°å¢ã2ä»ç¼ååè¡¨ä¸è¿åï¼
			var listOption = [];
			var LowerListOption = [];
			var FIFOListOption = [];
			var columns = "";
			var Lowercolumns = "";
			var HModName = "Kf_MaterialLowerBill_PDA";
			@@ -916,7 +917,7 @@
			element.tabChange('tab-Kf_MaterialLowerBill_PDA', '3');
			}
			else {
			element.tabChange('tab-Kf_MaterialLowerBill_PDA', '2');
			element.tabChange('tab-Kf_MaterialLowerBill_PDA', '4');
			}
			$("#HCarBarCode").select();
			$("#HCarBarCode").focus();
			@@ -965,6 +966,8 @@
			table.render(LowerListOption);
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			//æ¾ç¤ºåºåä¿¡æ¯åè¡¨
			DisInventoryList();
			}
			else {
			playSound();
			@@ -1152,7 +1155,8 @@
			function DisBillEntryList() {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
			//url: GetWEBURL() + '/WEBSController/GetBillEntryTmpList_Json',
			url: GetWEBURL() + '/WEBSController/MaterialLowerBill_MaterInv',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
			success: function (result) {
			@@ -1234,7 +1238,78 @@

			//#endregion

			//#region æ¾ç¤ºåºååè¡¨ä¿¡æ¯
			function DisInventoryList() {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/WEBSController/MaterialLowerBill_MaterInv',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
			success: function (result) {
			var data = [];
			var col = [];
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in result.list) {
			//å¨æè·ååè¡¨ææåå
			data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
			//è·åä¸éè¦æ¾ç¤ºçåï¼Hå¼å¤´çåä¸æ¾ç¤ºï¼
			var patrn = new RegExp(/^h/i);
			if (patrn.test(result.list[key].ColmCols)) {
			titleData[key] = result.list[key].ColmCols;
			}
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'radio', totalRowText: 'åè®¡' });
			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 {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			default:

			if (data[i].name == 'æ°é' \|\| data[i].name == 'æºåæ°é' \|\| data[i].name == 'æ¡ç ä¸ªæ°') {
			col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
			} else if (data[i].name == 'ç©æåç§°' \|\| data[i].name == 'è§æ ¼åå·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
			}
			}
			}
			}
			columns = col;
			FIFOListOption.cols = [columns];
			FIFOListOption.data = result.data;
			FIFOListOption.totalRow = true;
			table.cache['wl-table'] = null; //æ¸ç©ºè¡¨æ ¼ç¼åæ°æ®
			table.render(FIFOListOption);

			}
			else {
			FIFOListOption.cols = [[
			{ field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 100 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'ä»åº', title: 'ä»åº', width: 100 }
			, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ', width: 100 }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', width: 100 }
			, { field: 'åºåæ°é', title: 'åºåæ°é', width: 100 }
			]];
			FIFOListOption.data = [];
			table.render(FIFOListOption);
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});
			}

			//#endregion

			});