MES-WEB-LayUI.git

			@@ -56,6 +56,14 @@
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBarCode">ç¡®å®</button>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:50px;padding-left:0px;">åè®¡  æ°é</label>
			</div>
			<div class="layui-col-xs8">
			<input type="text" name="HQty_Total" id="HQty_Total" lay-verify="HQty_Total" autocomplete="off" class="layui-input" readonly>
			</div>
			</div>
			</div>
			<div class="layui-tab" lay-filter="tab-Sc_PackUnionBill_PDA">
			<ul class="layui-tab-title" lay-filter="tab-all">
			@@ -83,6 +91,9 @@
			</div>
			<div class="layui-col-xs8 layui-input-inline mobile">
			<input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBillNoChange">ä¿®æ¹</button>
			</div>
			</div>
			<div class="layui-row">
			@@ -156,6 +167,7 @@
			var params = getBillTemp();
			var HInterID_Temp = params[params[0]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®ID
			var HBillNo_Temp = params[params[1]]; //ä»ç¼ååè¡¨ä¸è¿ååæ®å·
			var HModName_Temp = params[params[2]]; //ä»ç»´æ¤é¡µé¢è¿åæ¨¡åå
			//#endregion

			//#region å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			@@ -247,12 +259,14 @@
			if (HBarCode_Pre == "" \|\| HBarCode_Pre_Flag != 1) {
			playSound();
			layer.msg("ç»ä¸åç¼ä¸è½ä¸ºç©ºï¼è¯·è®¾ç½®ç»ä¸åç¼å¹¶ç¡®è®¤ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			$('#HBarCode').val("");
			return false;
			}

			if (sBarCode.indexOf(HBarCode_Pre) != 0) {
			playSound();
			layer.msg("æ¡ç åç¼ä¸ä¸ºç»ä¸åç¼ï¼è¯·æ£æ¥æ¡ç ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			$('#HBarCode').val("");
			return false;
			}

			@@ -331,8 +345,29 @@
			}
			}
			}

			//for (var i = 0; i < data1.data.length; i++) {
			// data1.data[i]["HQty"] = 1;
			//}

			$("#HQty_Total").val(data1.data.length);

			var data_Temp = []; //åæ¾åè¡¨éè¦æ¾ç¤ºçæ°æ®
			var data_temp_length = 10; //éè¿ç¼ååè¡¨ææ°å¢è¿å¥é¡µé¢æ¶ï¼åè¡¨æ¾ç¤ºçæå¤§è®°å½æ°
			if (data1.data.length < data_temp_length) {
			data_temp_length = data1.data.length;
			}
			for (var i = 0; i < data_temp_length; i++) {
			data_Temp.push(data1.data[i]);
			}

			if (HModName_Temp == "Gy_getCusBarCodeBillList") {
			data_Temp = data1.data;
			}


			//option.cols = [col];
			option.data = data1.data;
			option.data = data_Temp;
			table.cache['wl-table'] = null; //æ¸ç©ºè¡¨æ ¼ç¼åæ°æ®
			ins = table.render(option);
			layer.close(ajaxLoad);
			@@ -367,6 +402,73 @@
			//ç¦ç¨ ç»ä¸åç¼ ææ¬æ¡
			$('#HBarCode_Pre').prop('disabled', true); //ç»ä¸åç¼ ææ¬æ¡ä¸å¯ç¼è¾
			});
			//#endregion
			//#endregion

			//#region ä¿®æ¹åæ®å·
			//#region ä¿®æ¹åæ®å·
			form.on('submit(cmdHBillNoChange)', function (data) {
			layer.prompt({ formType: 2, title: "è¯·è¾å¥åæ®å·ï¼", value: HBillNo },
			function (value, index) {
			if (option.data!=null&& option.data.length > 0) {
			layer.msg("å½ååæ®å·²ç»åå¨æ«ç è®°å½ï¼ä¸å¯ä»¥ä¿®æ¹åæ®å·!", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
			return;
			}

			if (value == "") {
			layer.msg("åæ®å·ä¸å¯ä»¥ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't' });
			return;
			}

			if (judgeHBillNoIsInTempList(value)) {
			HBillNo = value;
			$("#HBillNo").val(HBillNo);
			}
			layer.close(index);
			});
			});
			//#endregion

			//#region å¤æåæ®å·æ¯å¦ä¸ºç¼ååè¡¨ä¸çåæ®å·ï¼æ¯åä¿®æ¹æåå¹¶è®¾ç½®ç»ä¸åç¼ï¼å¦åä¿®æ¹å¤±è´¥ã
			function judgeHBillNoIsInTempList(value) {
			//å¤æç»æ
			var judgeFlag = false;

			$.ajax({
			type: "GET",
			async: false,
			url: GetWEBURL() + "/WEBSController/Gy_getCusBarCodeBill_judgeHBillNoIsInTempList",
			data: { "HInterID": HInterID, "HBillType": HBillType, "HBillNo": value, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
			success: function (result) {
			if (result.count == 1) {
			if (result.data == null) {

			} else {
			var data = result.data;
			$("#HBarCode_Pre").val(data[0]["HBarCode_Pre"]);

			HBarCode_Pre_Flag = 1;

			//ç¦ç¨ç¡®è®¤æé®
			$('#cmdHBarCode_Pre').addClass("layui-btn-disabled").attr("disabled", true);//æé®åä¸ºä¸å¯ç¼è¾ç¶æ
			//ç¦ç¨ ç»ä¸åç¼ ææ¬æ¡
			$('#HBarCode_Pre').prop('disabled', true); //ç»ä¸åç¼ ææ¬æ¡ä¸å¯ç¼è¾
			}

			judgeFlag = true;
			}
			else {
			layer.msg(result.Message, { icon: 5, time: 100000, offset: 't', btn: ['ç¡®è®¤'] }, function () { $("#HBarCode").focus(); });

			judgeFlag = false;
			}
			layer.closeAll("loading");
			},
			complete: function (XHR, TS) { XHR = null }//åæ¶èµæº
			});

			return judgeFlag;
			}
			//#endregion
			//#endregion

			@@ -504,9 +606,10 @@
			, height: 'full-50'
			//, page: true
			, cellMinWidth: 90
			, limit: 1000
			, limit: 100000
			//, limits: [50, 500, 5000, 20000]
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'HItemID', title: 'HItemID', hide: true }
			@@ -514,7 +617,7 @@
			, { field: 'HBillNo', title: 'åæ®å·', width: 125, sort: true }
			, { field: 'HBillType', title: 'åæ®ç±»å', width: 125, sort: true, hide: true }
			, { field: 'HBarCode', title: 'æ¡ç ç¼å·', width: 125, sort: true }
			, { field: 'HQty', title: 'æ°é', width: 125, sort: true, hide: true }
			, { field: 'HQty', title: 'æ°é', width: 125, sort: true, totalRow: true, hide: true }
			, { field: 'HOrgID', title: 'HOrgID', sort: true, hide: true }
			, { field: 'HDate', title: 'æ¥æ', width: 125, sort: true }
			, { field: 'HRelationInterID', title: 'HRelationInterID', width: 125, sort: true, hide: true }