MES-WEB-LayUI.git

			@@ -129,38 +129,6 @@
			<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:30px;padding-left:0px;">ä»åº</label>
			</div>
			<div class="layui-col-xs10">
			<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">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-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:30px;padding-left:0px;">ä»ä½</label>
			</div>
			<div class="layui-col-xs10">
			<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:30px;padding-left:0px;">ä¿ç®¡</label>
			</div>
			<div class="layui-col-xs10">
			@@ -236,6 +204,38 @@
			</div>
			<!--ç©æä¿¡æ¯-->
			<div class="layui-tab-item">
			<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:30px;padding-left:0px;">ä»åº</label>
			</div>
			<div class="layui-col-xs10">
			<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">
			</div>
			<div class="layui-col-xs2">
			<button type="button" lay-submit="" lay-filter="HWHID-BT" class="layui-btn" id="HWHID-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:30px;padding-left:0px;">ä»ä½</label>
			</div>
			<div class="layui-col-xs10">
			<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-row">
			<div class="layui-col-xs12">
			<div class="layui-form-item" style="padding:0px;margin:0px"></div>
			@@ -547,6 +547,32 @@
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			})
			//#endregion

			//#region çå¬ç½æ ¼è¡¨ä½äºä»¶
			table.on('tool(wl-table)', function (obj) {
			var data = obj.data;

			//ç©æä»£ç è¶é¾æ¥
			if (obj.event == 'ç©æä»£ç ') { //æ£æ¥ obj.event æ¯å¦çäºåç¬¦ä¸² 'ç©æä»£ç 'ãå¦æçäºï¼åæ§è¡ifå¾ªç¯
			var HMaterNumber = data.ç©æä»£ç .toString(); //å£°æåéHMaterNumber ä¸º data.ç©æä»£ç
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			type: 2 //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe
			, area: ['100%', '100%']
			, title: 'åæ¶åºåä¿¡æ¯' //è®¾ç½®å¼¹åºå±çååååé
			, closeBtn: 1 //æ¾ç¤ºå³éæé®
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../WMSæ«ç æ¨¡å/åºåæ¥è¯¢/KF_ICInventoryByCLD_PDA.html?OperationType=2&HMaterNumber=' + HMaterNumber //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼
			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			}
			, cancel: function () { //ç¹å»åæ¶æ¶ä½¿ç¨åè°
			}
			})
			}
			});
			//#endregion

			//å¤ææ¯å¦æ°å¢ï¼è·åæå¤§åæ®å·
			if (HInterID != 0) {
			@@ -1687,8 +1713,13 @@
			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 {
			} else if (data[i].name == 'ç©æä»£ç ') {
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, event: 'ç©æä»£ç ', event: 'ç©æä»£ç ', templet: function (d) {
			return '<span style="color: blue;">' + d.ç©æä»£ç + '</span>'
			}, style: 'cursor: pointer;'
			});
			} else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			@@ -1698,6 +1729,8 @@

			if (data[i].name == 'æ°é' \|\| data[i].name == 'æºåæ°é' \|\| data[i].name == 'æ¡ç ä¸ªæ°') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
			} else if (data[i].name == 'ç©æåç§°' \|\| data[i].name == 'è§æ ¼åå·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', width: 180 });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center' });
			}