MES-WEB-LayUI.git

			@@ -55,22 +55,23 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">
			<!--å¶ä»æ¡ä»¶-->
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 76px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 107px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è§æ ¼åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HModel" id="HModel">
			</div>
			<div class="layui-row" style="margin-top:10px;margin-left:5%;">
			<!--å¶ä»æ¡ä»¶-->
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 76px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 107px;">
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">è§æ ¼åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HModel" id="HModel">
			</div>
			</div>
			</div>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">

			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			@@ -159,7 +160,7 @@
			var option2 = [];
			var HModName = "Gy_RoutingBillListQuery";
			var titleData = ["hmainid", "åæ®ç±»å", "HMaterID", "hunitid", "HOrgID", "HMainCenterID", "å·¥ä½", "HMainProcID", "å·¥åºåç§°", "ä¸»è¿è¡æ¶é´", "è¿è¡æ¶é´åä½", "ä¸»å å·¥æ°é", "æè´¨", "å¾å·çæ¬", "HMainGroupID", "çç»", "å·¥ä»·", "æ åèµæºæ°", "å èµæºå¢é", "åèµæºåé", "HItemID", "HPRDORGID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData2 = ["hmainid", "hsubid", "ç¨åºå·", "æ¬å·¥åºç¡®è®¤è®°å½", "èªå¨ç§»è½¬", "æ¢ååå¤æ¶é´", "æ¬éåå¤æ¶é´", "ä¸éå¾ªç¯å¨æ", "ä¸éåºå®å¤©æ°", "å¼å·¥ä½éï¼åºæ°ï¼", "å¼å·¥ä½éï¼å¤©æ°ï¼", "æ åå®é¢", "æ¥åºåä»·", "ä¸åæ ¼åä»·", "å·¥åºå·¥ä»·", "çäº§å®é¢", "å¯æä½è®¾å¤æ°", "æ åäººæ°", "æµè½¬å·¥åº", "ä¸éæµè½¬å·¥åº", "åºå®çäº§å¤©æ°", "çäº§å¨æ", "ææ¾åº", "å¨è½¬ç®±", "å¨è½¬ç®±æ å", "æ¢æ¨¡æ¶é´", "è½¬ç§»æ¶é´", "æéæ¶é´", "åå¤æ¶é´", "äº§çº¿äººæ°", "äº§çº¿äº§è½", "äº§çº¿ä¸å¿", "è¯ç", "å å·¥æ°é", "è¿è¡æ¶é´", "æ¶é´åä½", "å¾çº¸ç¼å·", "æ¨¡å·ç¼å·", "è¯åä»", "æ¥åºåä»", "ä¸è¯åä»", "å·¥åºç±»å", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "å·¥æ®µ", "å¼å·¥ä½éå¤©æ°", "å¼å·¥ä½éåºæ°", "ç´¯è®¡è¯ç", "è¶é¢æ¯ä¾", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "å å·¥åä»·", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName", "ä¾åºåä»£ç ","ä¾åºå"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData2 = ["hmainid", "hsubid", "ç¨åºå·", "æ¬å·¥åºç¡®è®¤è®°å½", "èªå¨ç§»è½¬", "æ¢ååå¤æ¶é´", "æ¬éåå¤æ¶é´", "ä¸éå¾ªç¯å¨æ", "ä¸éåºå®å¤©æ°", "å¼å·¥ä½éï¼åºæ°ï¼", "å¼å·¥ä½éï¼å¤©æ°ï¼", "æ åå®é¢", "æ¥åºåä»·", "ä¸åæ ¼åä»·", "å·¥åºå·¥ä»·", "çäº§å®é¢", "å¯æä½è®¾å¤æ°", "æ åäººæ°", "æµè½¬å·¥åº", "ä¸éæµè½¬å·¥åº", "åºå®çäº§å¤©æ°", "çäº§å¨æ", "ææ¾åº", "å¨è½¬ç®±", "å¨è½¬ç®±æ å", "æ¢æ¨¡æ¶é´", "è½¬ç§»æ¶é´", "æéæ¶é´", "åå¤æ¶é´", "äº§çº¿äººæ°", "äº§çº¿äº§è½", "äº§çº¿ä¸å¿", "è¯ç", "å å·¥æ°é", "è¿è¡æ¶é´", "æ¶é´åä½", "å¾çº¸ç¼å·", "æ¨¡å·ç¼å·", "è¯åä»", "æ¥åºåä»", "ä¸è¯åä»", "å·¥åºç±»å", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "å·¥æ®µ", "å¼å·¥ä½éå¤©æ°", "å¼å·¥ä½éåºæ°", "ç´¯è®¡è¯ç", "è¶é¢æ¯ä¾", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "å å·¥åä»·", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			//#endregion

			@@ -276,62 +277,9 @@
			, toolbar: '#toolbarDemo'
			, height: 550
			, page: true
			, cellMinWidth: 90
			//, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			/* { field: 'hmainid', title: 'hmainid', width: 110 }*/
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 165 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			, { field: 'å·¥èºåç§°', title: 'å·¥èºåç§°', width: 170 }
			//, { field: 'hmaterid', title: 'hmaterid', width: 165 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 215 }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 115 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½' }
			, { field: 'é»è®¤å·¥èº', title: 'é»è®¤å·¥èº' }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
			, { field: 'ç»ç»', title: 'ç»ç»' }
			//, { field: 'hsubid', title: 'hsubid', width: 80 }
			, { field: 'å·¥åºå·', title: 'å·¥åºå·' }
			, { field: 'å§å¤æ è®°', title: 'å§å¤æ è®°' }
			//, { field: 'hprocid', title: 'hprocid', width: 105 }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ' }
			, { field: 'å·¥åº', title: 'å·¥åº' }
			//, { field: 'HSupID', title: 'HSupID', width: 105 }
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ' }
			, { field: 'ä¾åºå', title: 'ä¾åºå' }
			//, { field: 'HCenterID', title: 'HCenterID', width: 105 }
			, { field: 'å·¥ä½ä¸å¿ä»£ç ', title: 'å·¥ä½ä¸å¿ä»£ç ', width: 115 }
			, { field: 'å·¥ä½ä¸å¿åç§°', title: 'å·¥ä½ä¸å¿åç§°', width: 115 }
			, { field: 'æ¶é´åä½', title: 'æ¶é´åä½' }
			, { field: 'è¿è¡æ¶é´', title: 'è¿è¡æ¶é´' }
			, { field: 'å å·¥æ°é', title: 'å å·¥æ°é' }
			, { field: 'åå¤æ¶é´', title: 'åå¤æ¶é´' }
			, { field: 'æéæ¶é´', title: 'æéæ¶é´' }
			, { field: 'è½¬ç§»æ¶é´', title: 'è½¬ç§»æ¶é´' }
			, { field: 'è¯ç', title: 'è¯ç' }
			, { field: 'ç´¯è®¡è¯ç', title: 'ç´¯è®¡è¯ç' }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨' }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 195 }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 180 }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº' }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 180 }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº' }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ' }
			//, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
			//, { field: 'HGroupID', title: 'HGroupID', width: 105 }
			//, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
			//, { field: 'HSourceID', title: 'HSourceID', width: 105 }
			, { field: 'å å·¥åä»·', title: 'å å·¥åä»·' }
			//, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
			, { field: 'ä¸éæµè½¬å·¥åº', title: 'ä¸éæµè½¬å·¥åº', width: 150 }
			, { field: 'æµè½¬å·¥åº', title: 'æµè½¬å·¥åº' }
			]]
			};
			}

			@@ -409,10 +357,10 @@
			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: 120 });
			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>"});
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			}
			}
			@@ -483,7 +431,7 @@
			, data: data1.data
			, height: 550
			, page: true
			, cellMinWidth: 90
			//, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			}