MES-WEB-LayUI.git

			@@ -14,6 +14,7 @@
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<style>
			.layui-col-xs8 {
			@@ -86,6 +87,7 @@
			<select name="HMainSourceBillType" id="HMainSourceBillType">
			<option value="1401">éå®è®¢å</option>
			<option value="1402">åè´§éç¥å</option>
			<option value="-1">æå·¥å½å¥</option>
			</select>
			</div>
			</div>
			@@ -240,11 +242,12 @@

			</div>-->
			<div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
			<button type="button" lay-submit="" lay-filter="cmdAdd" class="layui-btn" id="cmdAdd">æ°å¢</button>
			<button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">æäº¤</button>
			<button type="button" lay-submit="" lay-filter="cmdAdd" class="layui-btn" style="width: 15%; text-align: center;" id="cmdAdd">æ°å¢</button>
			<button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" style="width: 15%; text-align: center;" id="cmdSaver">æäº¤</button>
			<!--<button type="button" lay-submit="" lay-filter="cmdModify" class="layui-btn" id="cmdModify">ç¼è¾</button>-->
			<button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">æ¸ç©º</button>
			<button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">éåº</button>
			<button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" style="width: 15%; text-align: center;" id="cmdDelete">æ¸ç©º</button>
			<button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" style="width: 15%; text-align: center;" id="cmdCancel">éåº</button>
			<button type="button" lay-submit="" lay-filter="cmdRefresh" class="layui-btn" style="width: 15%; text-align: center;" id="cmdRefresh">å·æ°</button>
			</div>
			</div>

			@@ -303,6 +306,9 @@
			var OperationType = params[params[0]] == null ? 1 : params[params[0]]; //ä»ç¼ååè¡¨ä¸è¿åæ°æ®ç±»åï¼1æ°å¢ã2ä»ç¼ååè¡¨ä¸è¿åï¼
			var HInterID_Temp = params[params[1]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®ID


			var loadSubTableBar = 0; //å è½½åè¡¨åçæ è®°ï¼ä¸º0æ¶éè¦å è½½åæ°æ®ï¼ä¸º1æ¶ä¸éè¦å è½½åæ°æ®

			//#endregion

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			@@ -329,7 +335,7 @@
			}
			else {
			layer.msg(d.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () { parent.location.href = "../../../views/index_Mobile_QiaoYi.html"; });
			}
			},
			@@ -482,7 +488,7 @@
			HBillNo = $('#HBillNo').val()
			}
			else {
			layer.msg(d.Message, { icon: 0, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg(d.Message, { icon: 0, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			@@ -568,7 +574,7 @@
			$("#HStockPlaceName").removeAttr("readonly");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			layer.msg("ä»åºæ¡ç ä¸ºç©ºï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HWHName").select();
			$("#HWHName").focus();
			@@ -609,7 +615,7 @@
			$("#HStockPlaceName").removeAttr("readonly");
			$('#HSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			layer.msg(result.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HWHName").select();
			$("#HWHName").focus();
			@@ -654,7 +660,7 @@
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			layer.msg("ä»ä½æ¡ç ä¸ºç©ºï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HStockPlaceName").select();
			$("#HStockPlaceName").focus();
			@@ -685,7 +691,7 @@
			$("#HStockPlaceID").val("0");
			$("#HStockPlaceName").val("");
			layer.msg(result.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HStockPlaceName").select();
			$("#HStockPlaceName").focus();
			@@ -727,7 +733,7 @@
			$("#HKeeperID").val("0");
			$("#HKeeperName").val("");
			layer.msg("ä¿ç®¡åæ¡ç ä¸ºç©ºï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HKeeperName").select();
			$("#HKeeperName").focus();
			@@ -754,7 +760,7 @@
			$("#HKeeperID").val("0");
			$("#HKeeperName").val("");
			layer.msg(result.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HKeeperName").select();
			$("#HKeeperName").focus();
			@@ -796,7 +802,7 @@
			$("#HSecManagerID").val("0");
			$("#HSecManagerName").val("");
			layer.msg("åè´§åæ¡ç ä¸ºç©ºï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HSecManagerName").select();
			$("#HSecManagerName").focus();
			@@ -823,7 +829,7 @@
			$("#HSecManagerID").val("0");
			$("#HSecManagerName").val("");
			layer.msg(result.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HSecManagerName").select();
			$("#HSecManagerName").focus();
			@@ -865,7 +871,7 @@
			$("#HDeptID").val("0");
			$("#HDeptName").val("");
			layer.msg("é¨é¨æ¡ç ä¸ºç©ºï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HDeptName").select();
			$("#HDeptName").focus();
			@@ -892,7 +898,7 @@
			$("#HDeptID").val("0");
			$("#HDeptName").val("");
			layer.msg(result.Message, {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HDeptName").select();
			$("#HDeptName").focus();
			@@ -968,12 +974,12 @@
			});//æ°å¢
			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			layer.closeAll("loading");
			@@ -1045,12 +1051,12 @@
			}
			else {
			playSound();
			layer.msg(data.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg(data.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			layer.closeAll("loading");
			@@ -1067,14 +1073,44 @@

			form.on('submit(cmdCancel)', function () {
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			if (OperationType == 2) {
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			}
			else {
			parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
			}
			//æ´æ°åè¿ååºä¸´æ¶è¡¨ç¶æï¼æ´æ° HlineStatus =1ï¼
			$.ajax({
			type: "Get",
			url: GetWEBURL() + "/WEBSController/set_DelPonderationBillMain_Temp_FIFO_New_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": HInterID, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			if (OperationType == 2) {
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			parent.location.reload(); //å·æ°ç¶é¡µé¢ï¼æ³¨æä¸å®è¦å¨å³éå½åiframeå±ä¹åæ§è¡å·æ°
			parent.layer.close(index); //åæ§è¡å³é
			}
			else {
			parent.location.href = "../../../views/index_Mobile_QiaoYi.html";
			}
			}
			else {
			layer.msg(data.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			complete: function (XHR, TS) { XHR = null },//åæ¶èµæº
			error: function (err) {
			layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			});
			})

			//#endregion

			//#region å·æ°

			form.on('submit(cmdRefresh)', function () {
			//å·æ°è¡¨ä½æç»
			DisBillEntryList();
			element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '2');
			})

			//#endregion
			@@ -1097,7 +1133,7 @@
			if (HSourceFlag == false) {
			playSound();
			layer.msg("è¯·åæ«ææºåæ¡ç ï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
			$("#HSourceBillNo").select();
			@@ -1108,7 +1144,7 @@
			if (sHWHID == 0) {
			playSound();
			layer.msg("ä»åºæªéæ©ï¼è¯·åéæ©ä»åºæä»ä½ï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
			$("#HStockPlaceName").select();
			@@ -1195,7 +1231,7 @@
			else {
			playSound();
			layer.msg(result.Message, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			element.tabChange('tab-Kf_SellOutBill_QiaoYi_PDA', '1');
			$("#HSourceBillNo").select();
			@@ -1247,7 +1283,7 @@
			if (sBarCode == "") {
			playSound();
			layer.msg("è¯·æ«æè¦å é¤çæ¡ç ", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1275,7 +1311,7 @@
			else {
			playSound();
			layer.msg(data.Message, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1286,7 +1322,7 @@
			error: function (err) {
			playSound();
			layer.msg('éè¯¯' + err, {
			icon: 2, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1299,7 +1335,7 @@
			if (sBarCode == '') {
			playSound();
			layer.msg("æ¡ç ä¸ºç©ºï¼è¯·æ«ææ¡ç ï¼", {
			icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1419,7 +1455,7 @@
			else {
			playSound();
			layer.msg(result.Message, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1430,7 +1466,7 @@
			error: function (err) {
			playSound();
			layer.msg("éè¯¯ï¼" + err, {
			icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", btn: ['ç¡®è®¤']
			}, function () {
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1454,50 +1490,52 @@
			data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HStockOrgID": HStockOrgID },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			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;
			if (loadSubTableBar == 0) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			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: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			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: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:

			if (data[i].name == 'ç±³æ°' \|\| data[i].name == 'æºåç±³æ°' \|\| data[i].name == 'ä»¶æ°') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80, totalRow: true });
			}
			else if (data[i].name == 'ç©æä»£ç ' \|\| data[i].name == 'æºååå·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
			}
			else if ( data[i].name == 'ç©æåç§°') {
			col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 300 });
			}
			else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center' });
			if (data[i].name == 'ç±³æ°' \|\| data[i].name == 'æºåç±³æ°' \|\| data[i].name == 'ä»¶æ°') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 80, totalRow: true });
			}
			else if (data[i].name == 'ç©æä»£ç ' \|\| data[i].name == 'æºååå·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 150 });
			}
			else if (data[i].name == 'ç©æåç§°') {
			col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 300 });
			}
			else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center' });
			}
			}
			}
			}
			columns = col;
			listOption.cols = [columns];
			}
			columns = col;
			listOption.cols = [columns];
			listOption.data = result.data.Materlist;
			listOption.totalRow = true;
			BarCodelistOption.data = result.data.BarCodelist;
			@@ -1515,7 +1553,7 @@
			}
			}
			else {
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			@@ -1583,15 +1621,15 @@
			//åæ®ä¸ä¼ åå¤æ
			function AllowLoadData(sSubStr) {
			if (HInterID == 0) {
			layer.msg("åæ®åç è·åå¤±è´¥ï¼éè¯¯çåæ®åç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("åæ®åç è·åå¤±è´¥ï¼éè¯¯çåæ®åç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			if (HBillNo == '') {
			layer.msg("åæ®å·è·åå¤±è´¥ï¼éè¯¯çåæ®å·ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("åæ®å·è·åå¤±è´¥ï¼éè¯¯çåæ®å·ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			if (sSubStr.length == 0) {
			layer.msg("æ²¡ææ«ç ä¿¡æ¯ï¼è¯·åæ«ææ¡ç ï¼ç¡®è®¤æ è¯¯ååæäº¤ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æ²¡ææ«ç ä¿¡æ¯ï¼è¯·åæ«ææ¡ç ï¼ç¡®è®¤æ è¯¯ååæäº¤ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			//å¤ææ¯å¦å·²æ«æç©ææ¡ç
			@@ -1603,7 +1641,7 @@
			}
			}
			if (s == 0) {
			layer.msg("æ²¡ææ«æç©ææ¡ç ï¼è¯·åæ«æç©ææ¡ç ï¼ç¡®è®¤æ è¯¯ååæäº¤ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æ²¡ææ«æç©ææ¡ç ï¼è¯·åæ«æç©ææ¡ç ï¼ç¡®è®¤æ è¯¯ååæäº¤ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			}