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;
			};
			});
			@@ -369,6 +376,9 @@
			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();
			}
			@@ -438,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);
			@@ -512,6 +526,7 @@
			if (HOrgID) {
			sWhere += " and HOrgID = '" + HOrgID + "'";
			}
			sWhere += " and HBillSubType<>'SUB' ";
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			@@ -525,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();
			@@ -548,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();
			@@ -572,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) {
			@@ -615,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();
			@@ -780,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 });
			}