MES-WEB-LayUI.git

			@@ -46,21 +46,20 @@
			</button>
			</div>
			</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 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 class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§è®¢åç»ç»</label>
			@@ -168,13 +167,13 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>æ°å¢åè·¯çº¿</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>æ°å¢åè·¯çº¿</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_defaultRoute" id="set_defaultRoute"><i class="layui-icon layui-icon-form"></i>å¯ç¨é»è®¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_closeOtherRoute" id="set_closeOtherRoute"><i class="layui-icon layui-icon-form"></i>ç¦ç¨å¶å®</button>
			@@ -185,14 +184,14 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(å®é¢ç³è¯·å)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(å®é¢ç³è¯·å)</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>åå®¡æ ¸</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>-->
			</div>
			</script>
			</form>
			@@ -223,7 +222,7 @@
			var option = [];
			var HBillType = 3301;
			var ins; //ç¨äºå¯¼åºexcel
			var HModName = "Gy_RoutingBillList";
			var HModName = "Gy_RoutingBillToInvalidatedList";
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//è·ååæ°
			function getUrlVars() {
			@@ -395,66 +394,18 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-150'
			, page: false
			, cols: [[]]
			, data: [[]]
			, height: 800
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			/* { field: 'hmainid', title: 'hmainid', width: 110 }*/
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 165 }
			, { field: 'å·¥èºåç§°', title: 'å·¥èºåç§°', width: 170, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160, sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160, sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160, sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 115, sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', sort: true }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', sort: true }
			, { field: 'å·¥åºå·', title: 'å·¥åºå·', sort: true }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ', sort: true }
			, { field: 'å·¥åº', title: 'å·¥åº', sort: true }
			, { field: 'å·¥ä½ä¸å¿ä»£ç ', title: 'å·¥ä½ä¸å¿ä»£ç ', width: 115, sort: true }
			, { field: 'å·¥ä½ä¸å¿åç§°', title: 'å·¥ä½ä¸å¿åç§°', width: 115, sort: true }
			, { field: 'å¶åäºº', title: 'å¶åäºº', sort: true }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 195, sort: true }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', sort: true }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 180, sort: true }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', sort: true }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 180, sort: true }
			, { field: 'é»è®¤å·¥èº', title: 'é»è®¤å·¥èº', sort: true }
			//, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			////, { field: 'hmaterid', title: 'hmaterid', width: 165 }
			//, { field: 'ç»ç»', title: 'ç»ç»' }
			////, { field: 'hsubid', title: 'hsubid', width: 80 }
			//, { field: 'å§å¤æ è®°', title: 'å§å¤æ è®°' }
			////, { field: 'hprocid', title: 'hprocid', width: 105 }
			////, { field: 'HSupID', title: 'HSupID', width: 105 }
			//, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ' }
			//, { field: 'ä¾åºå', title: 'ä¾åºå' }
			////, { field: 'HCenterID', title: 'HCenterID', width: 105 }
			//, { field: 'æ¶é´åä½', title: 'æ¶é´åä½' }
			//, { field: 'è¿è¡æ¶é´', title: 'è¿è¡æ¶é´' }
			//, { field: 'å å·¥æ°é', title: 'å å·¥æ°é' }
			//, { field: 'åå¤æ¶é´', title: 'åå¤æ¶é´' }
			//, { field: 'æéæ¶é´', title: 'æéæ¶é´' }
			//, { field: 'è½¬ç§»æ¶é´', title: 'è½¬ç§»æ¶é´' }
			//, { field: 'è¯ç', title: 'è¯ç' }
			//, { field: 'ç´¯è®¡è¯ç', title: 'ç´¯è®¡è¯ç' }
			//, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨' }
			//, { 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: 'æµè½¬å·¥åº' }
			]]
			};
			}

			}
			//#region æåºåéæ©
			@@ -611,23 +562,8 @@
			}
			}
			}
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 800
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			}

			option.cols=[col];
			option.data = data1.data;
			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			var colList = [];
			@@ -970,7 +906,7 @@
			//#region å·æ°
			function get_Refresh() {
			set_ClearQuery();
			get_DisplayPage(sWhere);
			get_FastQuery();
			}

			//å¯ç¨é»è®¤

	WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/计划管理/工艺路线/Gy_RoutingBillToInvalidatedList.html	124 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -883,13 +883,14 @@
			function set_CheckBill_Flow(num, tableName) {
			var checkStatus = table.checkStatus(tableName)
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			if (checkStatus.data.length != 0) {
			var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//å°å¯¹è±¡æ°ç»idæåå»é
			var queryString = uniqueIds.join(",");//å°idsåææ°ç»
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_Routing/AuditFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
			url: GetWEBURL() + "/Gy_Routing/CheckAllFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterIDS": queryString, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -916,7 +917,7 @@
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			layer.msg('è¯·éæ©è³å°ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion