MES-WEB-LayUI.git

			@@ -13,6 +13,8 @@
			<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>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -35,7 +37,7 @@
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æä»£ç </label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<div class="layui-input-block">
			<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>
			<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;">
			@@ -51,10 +53,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" style="display:none;" type="button" 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">
			@@ -105,17 +107,24 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<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" 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_AddNewSub" id="set_AddNewSub"><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_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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-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"><i class="layui-icon layui-icon-form"></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" 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="get_export" id="get_export"><i class="layui-icon layui-icon-export"></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>
			</form>
			@@ -129,7 +138,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {

			//#region å¬å±åé
			var $ = layui.$
			@@ -140,9 +149,11 @@
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, soulTable = layui.soulTable
			//var sWhere = " äº§åä»£ç = 'BX0002'";
			var sWhere = "";
			var option = [];
			var ins; //ç¨äºå¯¼åºexcel
			var HModName = "Gy_RoutingBillList";

			//#endregion
			@@ -162,7 +173,10 @@
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//æ°å¢
			case 'set_AddNew': set_AddNew();
			case 'set_AddNew': set_AddNew();
			break;
			//æ°å¢åè·¯çº¿
			case 'set_AddNewSub': set_AddNewSub();
			break;
			//ç¼è¾
			case 'set_ShowBill': set_ShowBill();
			@@ -179,11 +193,32 @@
			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			//å®¡æ ¸
			case 'set_CheckBill': set_CheckBill(1);
			break;
			//åå®¡æ ¸
			case 'set_AbandonCheck': set_CheckBill(2);
			break;
			//å³é
			case 'set_CloseBill': set_CloseBill(1);
			break;
			//åå³é
			case 'set_CancelCloseBill': set_CloseBill(2);
			break;
			//éåºæé®
			case 'get_Exit': Pub_Close(2);
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			get_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
			break;
			};
			});
			@@ -254,29 +289,32 @@
			//, 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 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 115 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½' }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
			, { field: 'å·¥åºå·', title: 'å·¥åºå·' }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ' }
			, { field: 'å·¥åº', title: 'å·¥åº' }
			, { field: 'å·¥ä½ä¸å¿ä»£ç ', title: 'å·¥ä½ä¸å¿ä»£ç ', width: 115 }
			, { field: 'å·¥ä½ä¸å¿åç§°', title: 'å·¥ä½ä¸å¿åç§°', width: 115 }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 195 }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 180 }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº' }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 180 }
			, { field: 'é»è®¤å·¥èº', title: 'é»è®¤å·¥èº' }
			, { 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: 'ç»ç»' }
			@@ -364,13 +402,40 @@
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType":"3301" },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);

			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			var colList = [];
			for (var i = 0; i < option.cols[0].length; i++) {
			colList.push(option.cols[0][i].field);
			}
			//è®¾ç½®æ°æ®
			var result = data1.data;
			var temp = "";
			for (var i = 0; i < result.length; i++) {
			if (temp != result[i]["åæ®å·"]) {
			temp = result[i]["åæ®å·"];
			} else {
			var initIndex = $.inArray("åæ®å·", colList);
			var lastIndex = $.inArray("å·¥åºå·", colList);
			for (var j = initIndex; j < lastIndex; j++) {
			var fieldName = colList[j];
			result[i][fieldName] = "";
			}
			}
			}


			option.data = result;
			ins = 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();
			}
			@@ -448,7 +513,7 @@
			if (HOrgID) {
			sWhere += " and HOrgID = '" + HOrgID + "'";
			}
			sWhere += " and å·¥åºä»£ç != '9999'"
			sWhere += " and å·¥åºä»£ç != '9999' and HBillSubType<>'SUB'"
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			@@ -462,7 +527,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();
			@@ -470,6 +535,22 @@
			})
			}
			//#endregion

			//æ·»å åè·¯çº¿
			function set_AddNewSub() {
			layer.open({
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'å·¥èºè·¯çº¿-æ°å¢'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=SUB&linteridSub=-1'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			}
			})
			}

			//#region ç¼è¾
			function set_ShowBill() {
			@@ -485,7 +566,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();
			@@ -509,7 +590,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) {
			@@ -552,7 +633,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();
			@@ -568,6 +649,82 @@
			set_ClearQuery();
			get_Display(sWhere);
			}

			//å®¡æ ¸ [1 å®¡æ ¸ã2 åå®¡æ ¸]
			function set_CheckBill(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;

			if (data.length == 1) {
			layer.confirm("ç¡®è®¤è¦å®¡æ ¸å?", function (index) {
			var wait = layer.load();
			var HInterID = data[0].hmainid;
			$.ajax({
			url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
			type: "GET",
			data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
			success: function (result) {
			if (result.count == 1) {
			get_FastQuery();
			layer.msg(result.Message, { icon: 1 });
			layer.close(wait);
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.close(wait);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(wait);
			}
			});
			})
			} else {
			layer.msg("è¯·éæ©ä¸æ¡æ°æ®!");
			}
			}


			//å³é [1 å³éã2 åå³é]
			function set_CloseBill(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;

			if (data.length == 1) {
			layer.confirm("ç¡®è®¤è¦å³éå?", function (index) {
			var wait = layer.load();
			var HInterID = data[0].hmainid;
			$.ajax({
			url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
			type: "GET",
			data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": ""},
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { icon: 1 });
			layer.close(wait);
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.close(wait);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(wait);
			}
			});
			})
			}
			else {
			layer.msg("è¯·éæ©ä¸æ¡æ°æ®!");
			}
			}



			//å¯¼åºExecel
			function get_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}


			//#endregion
			//éèåè®¾ç½®
			function get_HideColumn() {
			@@ -681,6 +838,8 @@
			} else {
			table.render(option);
			}
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, "3301", HModName, sessionStorage["HUserName"]);
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}