MES-WEB-LayUI.git

			@@ -13,6 +13,7 @@
			<script src="../../../layuiadmin/scripts/jquery-1.4.1.min.js"></script>
			<script src="../../../layuiadmin/pubcustom.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -37,7 +38,7 @@
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æä»£ç </label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 50%;display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			@@ -51,10 +52,10 @@
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<button class="layui-btn layuiadmin-btn-order" type="button" style="display:none;" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<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>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">éç½®</button>
			<div class="layui-row" style="margin-top:10px;margin-left:5%;">
			<!--å¶ä»æ¡ä»¶-->
			<div class="layui-inline">
			@@ -118,18 +119,19 @@
			</div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="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"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="set_HideButton" id="set_HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			</div>
			</script>
			<script type="text/html" id="toolbarDemo2">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_HideColumn2"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_HideColumn2" id="get_HideColumn2"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</form>
			@@ -202,6 +204,11 @@
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			get_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
			break;
			};
			});
			@@ -280,59 +287,6 @@
			//, 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: 'æµè½¬å·¥åº' }
			]]
			};
			}

			@@ -410,10 +364,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 });
			}
			}
			}
			@@ -421,6 +375,9 @@
			option.data = data1.data;
			table.render(option);
			layer.close(ajaxLoad);

			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			@@ -491,6 +448,10 @@
			table.render(option2);

			layer.close(wait);

			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);

			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(wait);
			@@ -565,6 +526,7 @@
			if (HOrgID) {
			sWhere += " and HOrgID = '" + HOrgID + "'";
			}
			sWhere += " and HBillSubType<>'SUB' ";
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			@@ -578,7 +540,7 @@
			, area: ['100%', '100%']
			, title: 'å·¥èºè·¯çº¿-æ°å¢'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=3301&linteridSub=-1'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			@@ -601,7 +563,7 @@
			, area: ['100%', '100%']
			, title: 'å·¥èºè·¯çº¿-ç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			@@ -625,7 +587,7 @@
			$.ajax({
			url: GetWEBURL() + '/LEMS/DeltetGy_RoutingBillSub',
			type: "GET",
			data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
			data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
			success: function (result) {
			console.log('gouba' + result);
			if (result.count == 1) {
			@@ -668,7 +630,7 @@
			, area: ['100%', '100%']
			, title: 'å·¥èºè·¯çº¿-ç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3301'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			@@ -833,6 +795,9 @@
			} else {
			table.render(option);
			}

			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}