MES-WEB-LayUI.git

			@@ -31,21 +31,49 @@
			</div>
			<div class="layui-form-item" style="padding:15px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width: 30px;padding-left: 0px;">æ¡ç </label>
			</div>
			<div class="layui-col-xs7">
			<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn layui_btn_sm" id="HBarCode-BT">ç¡®å®</button>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs6">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">æ°é</label>
			<label class="layui-form-label" style="width: 30px;padding-left: 0px;">æ¡ç </label>
			</div>
			<div class="layui-col-xs7">
			<div class="layui-col-xs9">
			<input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			</div>
			</div>
			<div class="layui-col-xs6">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width: 30px; margin-left: 8px; padding-left: 0px;">æ°é</label>
			</div>
			<div class="layui-col-xs5">
			<input type="number" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d?\.?\d?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
			</div>
			<div class="layui-col-xs4">
			<button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
			<div class="layui-col-xs6">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»åº</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HSCWHName" id="HSCWHName" lay-verify="HSCWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" lay-filter="HSCWHID-BT" class="layui-btn" id="HSCWHID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
			</div>
			</div>
			<div class="layui-col-xs6">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:30px;padding-left:0px;">ä»ä½</label>
			</div>
			<div class="layui-col-xs6">
			<input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" lay-filter="HSCSpID-BT" class="layui-btn" id="HSCSpID-BT" style="width: 30px; margin-left: 8px;padding-left:8px">...</button>
			</div>
			</div>
			</div>
			@@ -81,12 +109,12 @@
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" lay-filter="cmdHSourceBillNo" class="layui-btn" id="cmdHSourceBillNo" style="width:55px;">
			<button type="button" lay-submit="" lay-filter="cmdHSourceBillNo" class="layui-btn" id="cmdHSourceBillNo" style="width: 45px; margin-left: 10px; padding-left: 12px">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-2px;"></i>
			</button>
			</div>
			<div class="layui-col-xs2" style="float: right;">
			<button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 40px; margin-left: 0px;padding-left:10px">OK</button>
			<button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
			</div>
			</div>
			</div>
			@@ -139,10 +167,10 @@
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs2">
			<div class="layui-col-xs2" style="margin-left:-10px">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">è°å¥ä»åº</label>
			</div>
			<div class="layui-col-xs10">
			<div class="layui-col-xs10" style="margin-left:10px">
			<div class="layui-col-xs10">
			<input type="text" name="HWHName" id="HWHName" lay-verify="HWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input">
			@@ -155,48 +183,16 @@
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs2">
			<div class="layui-col-xs2" style="margin-left:-10px">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">è°å¥ä»ä½</label>
			</div>
			<div class="layui-col-xs10">
			<div class="layui-col-xs10" style="margin-left:10px">
			<div class="layui-col-xs10">
			<input type="text" name="HStockPlaceName" id="HStockPlaceName" lay-verify="HStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" lay-filter="HSpID-BT" class="layui-btn" id="HSpID-BT">...</button>
			</div>
			</div>
			</div>
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs2">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">è°åºä»åº</label>
			</div>
			<div class="layui-col-xs10">
			<div class="layui-col-xs10">
			<input type="text" name="HSCWHName" id="HSCWHName" lay-verify="HSCWHName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HSCWHID" id="HSCWHID" lay-verify="HSCWHID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" lay-filter="HSCWHID-BT" class="layui-btn" id="HSCWHID-BT">...</button>
			</div>
			</div>
			</div>
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs2">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">è°åºä»ä½</label>
			</div>
			<div class="layui-col-xs10">
			<div class="layui-col-xs10">
			<input type="text" name="HOutStockPlaceName" id="HOutStockPlaceName" lay-verify="HOutStockPlaceName" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
			<input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" lay-filter="HSCSpID-BT" class="layui-btn" id="HSCSpID-BT">...</button>
			</div>
			</div>
			</div>
			@@ -219,10 +215,10 @@
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs2">
			<div class="layui-col-xs2" style="margin-left:-10px">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">è°åºç»ç»</label>
			</div>
			<div class="layui-col-xs10">
			<div class="layui-col-xs10" style="margin-left:10px">
			<select name=" HStockOutOrgID" id="HStockOutOrgID" disabled>
			<!--å¨ææ¸²æç»ç»-->
			</select>
			@@ -231,10 +227,10 @@
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs2">
			<div class="layui-col-xs2" style="margin-left:-10px">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">è°å¥ç»ç»</label>
			</div>
			<div class="layui-col-xs10">
			<div class="layui-col-xs10" style="margin-left:10px">
			<select name=" HStockInOrgID" id="HStockInOrgID" disabled>
			<!--å¨ææ¸²æç»ç»-->
			</select>
			@@ -325,40 +321,40 @@
			</div>
			<div class="layui-form-item" style="padding: 0px; margin: 0px">
			<div class="layui-row">
			<div class="layui-col-xs2">
			<div class="layui-col-xs2" style="margin-left:-10px">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">è°å¥ä»åº</label>
			</div>
			<div class="layui-col-xs10">
			<div class="layui-col-xs10" style="margin-left:10px">
			<input type="text" name="HWHName_B" id="HWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
			</div>
			</div>
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs2">
			<div class="layui-col-xs2" style="margin-left:-10px">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">è°å¥ä»ä½</label>
			</div>
			<div class="layui-col-xs10">
			<div class="layui-col-xs10" style="margin-left:10px">
			<input type="text" name="HSPName_B" id="HSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
			</div>
			</div>
			</div>
			<div class="layui-form-item" style="padding: 0px; margin: 0px">
			<div class="layui-row">
			<div class="layui-col-xs2">
			<div class="layui-col-xs2" style="margin-left:-10px">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">è°åºä»åº</label>
			</div>
			<div class="layui-col-xs10">
			<div class="layui-col-xs10" style="margin-left:10px">
			<input type="text" name="HSCWHName_B" id="HSCWHName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
			</div>
			</div>
			</div>
			<div class="layui-form-item" style="padding:0px;margin:0px">
			<div class="layui-row">
			<div class="layui-col-xs2">
			<div class="layui-col-xs2" style="margin-left:-10px">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">è°åºä»ä½</label>
			</div>
			<div class="layui-col-xs10">
			<div class="layui-col-xs10" style="margin-left:10px">
			<input type="text" name="HSCSPName_B" id="HSCSPName_B" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
			</div>
			</div>
			@@ -686,7 +682,7 @@
			//æ¾ç¤ºè¡¨ä½æç»
			DisBillEntryList();
			HSourceFlag = true;
			element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2');
			element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '3');
			}
			else {
			//è·åæå¤§åæ®IDãåæ®å·
			@@ -814,7 +810,6 @@
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2');
			//åæ æ¾ç¤ºå°æ¡ç ä¸
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -897,7 +892,6 @@
			$("#HOutStockPlaceID").val(result.data[0].HItemID);
			$("#HSCWHName").val(result.data[0].HWhName);
			$("#HSCWHID").val(result.data[0].HWHID);
			element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2');
			//åæ æ¾ç¤ºå°æ¡ç ä¸
			$("#HBarCode").select();
			$("#HBarCode").focus();
			@@ -1444,7 +1438,7 @@
			form.render('select');
			HStockInOrgID = $('#HStockInOrgID').val()
			HStockOutOrgID = $('#HStockOutOrgID').val()
			element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2');
			element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '3');
			$("#HBarCode").select();
			$("#HBarCode").focus();
			//è°å¥è°åºç»ç»ä¸ç»å¥ç»ç»ä¸åæ¶ï¼æ¸ç©ºè°å¥è°åºä»åºä»ä½æ°æ®
			@@ -1627,7 +1621,6 @@
			$("#HOutStockPlaceName").removeAttr("disabled");
			$('#HSCSpID-BT').removeClass("layui-btn-disabled").attr("disabled", false);//æé®æ¢å¤æ£å¸¸ç¶æ
			}
			element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2'); //è·³è½¬é¡µç¾
			return;//ç»æ
			}
			else if (result.data.hBarTypeField == 'ä»ä½æ¡ç ') {
			@@ -1635,7 +1628,6 @@
			$("#HOutStockPlaceID").val(result.data.hSPIDField);
			$("#HSCWHName").val(result.data.hWhNameField);
			$("#HSCWHID").val(result.data.hWhIDField);
			element.tabChange('tab-Kf_MoveStockStepInBill_PDA', '2');//è·³è½¬é¡µç¾
			return;//ç»æ
			}
			else if (result.data.hBarTypeField == 'é¨é¨æ¡ç ') {
			@@ -1792,14 +1784,18 @@
			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 });
			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: 'center', totalRow: true });
			col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
			} else if (data[i].name == 'ç©æä»£ç ') {
			col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
			} 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: 'center' });
			col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
			}
			}
			}