MES-WEB-LayUI.git

			@@ -201,11 +201,6 @@
			<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_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>åèµ·å®¡æ¹</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>æ¥çå®¡æ¹è¿åº¦</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><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_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>å¤çº§åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" 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" style="display:none;" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(å®é¢ç³è¯·å)</button>
			@@ -244,9 +239,10 @@
			//var sWhere = " äº§åä»£ç = 'BX0002'";
			var sWhere = "";
			var option = [];
			var page = 1;//åé¡µæ°æ®
			var size = 50;
			var ins; //ç¨äºå¯¼åºexcel
			var HModName = "Gy_RoutingBillList";
			var HBillType = 3301;
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//è·ååæ°
			function getUrlVars() {
			@@ -291,21 +287,6 @@
			break;
			//ç¼è¾
			case 'set_ShowBill': set_ShowBill();
			break;
			//åèµ·å®¡æ¹
			case 'set_startCheckBill': set_startCheckBill();
			break;
			//æ¥çå®¡æ¹è¿åº¦
			case 'get_CheckFlowInfo': get_CheckFlowInfo();
			break;
			//å¤çº§å®¡æ ¸
			case 'set_CheckBill_Flow': set_CheckBill_Flow(0);
			break;
			//å¤çº§åå®¡æ ¸
			case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1);
			break;
			//é©³å
			case 'set_RejectCheck_Flow': set_RejectCheck_Flow();
			break;
			//å¤è¡ä¸æ¨
			case 'btn-ProcPriceRequestBills': set_ProcPriceRequestBills();
			@@ -513,6 +494,28 @@
			//, { field: 'æµè½¬å·¥åº', title: 'æµè½¬å·¥åº' }
			]]
			};
			optionPage = {
			elem: 'page', //æ³¨æï¼è¿éç page æ¯ IDï¼ä¸ç¨å # å·
			count: 10000, //æ°æ®æ»æ°ï¼ä»æå¡ç«¯å¾å°
			limit: 50,
			limits: [50, 500, 5000, 50000],
			layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
			jump: function (obj, first) {
			//console.log(obj)
			//objåå«äºå½ååé¡µçææåæ°ï¼æ¯å¦ï¼
			//console.log(obj.curr); //å¾å°å½åé¡µï¼ä»¥ä¾¿åæå¡ç«¯è¯·æ±å¯¹åºé¡µçæ°æ®ã
			//console.log(obj.limit); //å¾å°æ¯é¡µæ¾ç¤ºçæ¡æ°

			//é¦æ¬¡ä¸æ§è¡
			if (!first) {
			//do something
			page = obj.curr;
			size = obj.limit;
			get_FastQuery();
			}
			}
			}
			laypage.render(optionPage);
			}


			@@ -753,19 +756,19 @@
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			com = "like''%" + ColContent + "%''";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			com = "like''%" + ColContent + "''";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			com = "like''" + ColContent + "%''";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			com = "not like''%" + ColContent + "%''";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			com = "" + Comparator + "''" + ColContent + "''";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			@@ -775,19 +778,19 @@
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			com1 = "like''%" + ColContent1 + "%''";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			com1 = "like''%" + ColContent1 + "''";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			com1 = "like''" + ColContent1 + "%''";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			com1 = "not like''%" + ColContent1 + "%''";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			com1 = "" + Comparator1 + "''" + ColContent1 + "''";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			@@ -796,19 +799,19 @@
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			com2 = "like''%" + ColContent2 + "%''";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			com2 = "like''%" + ColContent2 + "''";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			com2 = "like''" + ColContent2 + "%''";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			com2 = "not like''%" + ColContent2 + "%''";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			com2 = "" + Comparator + "''" + ColContent + "''";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			@@ -818,10 +821,10 @@

			} else {
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= ''" + HDate + "''";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= ''" + HDate1 + "''";
			}
			}

			@@ -833,32 +836,96 @@
			}

			if (HOrderProcNO) {
			sWhere += " and åæ®ç±»å like '%" + HOrderProcNO + "%'";
			sWhere += " and åæ®ç±»å like ''%" + HOrderProcNO + "%''";
			}
			if (HMaterName) {
			sWhere += "and ç©æåç§° like '%" + HMaterName + "%'";
			sWhere += "and ç©æåç§° like ''%" + HMaterName + "%''";
			}
			if (HMaterNumber) {
			sWhere += "and ç©æä»£ç like '%" + HMaterNumber + "%'";
			sWhere += "and ç©æä»£ç like ''%" + HMaterNumber + "%''";
			}
			if (HModel) {
			sWhere += "and è§æ ¼åå· like '%" + HModel + "%'";
			sWhere += "and è§æ ¼åå· like ''%" + HModel + "%''";
			}
			if (WorkCenter) {
			sWhere += " and åæ®å· like '%" + WorkCenter + "%'";
			sWhere += " and åæ®å· like ''%" + WorkCenter + "%''";
			}
			if (HOrgID) {
			sWhere += " and HOrgID = '" + HOrgID + "'";
			sWhere += " and HOrgID = ''" + HOrgID + "''";
			}
			if (number==2) {
			if (HProject!='0') {
			sWhere += " and é¡¹ç®å· like '%" + HProject + "%'";
			sWhere += " and é¡¹ç®å· like ''%" + HProject + "%''";
			}
			}

			sWhere += " and å·¥åºä»£ç != '9999' and HBillSubType<>'SUB'"
			get_Display(sWhere);
			sWhere += " and å·¥åºä»£ç != ''9999'' and HBillSubType<>''SUB''"
			get_DisplayPage(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//#endregion

			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_RoutingBill/page',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.code == 1) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			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 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
			}
			}
			}


			option.cols = [col];
			option.data = data1.data;
			ins = table.render(option);
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			option.data = [[]]
			table.render(option);
			layer.close(ajaxLoad);
			/layer.alert(data1.code + data1.Message, { icon: 5 });/
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			@@ -1061,7 +1128,7 @@
			//#region å·æ°
			function get_Refresh() {
			set_ClearQuery();
			get_Display(sWhere);
			get_DisplayPage(sWhere);
			}

			//å®¡æ ¸ [1 å®¡æ ¸ã2 åå®¡æ ¸]
			@@ -1097,149 +1164,6 @@
			}
			}


			//#region åèµ·å®¡æ¹
			function set_startCheckBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_Routing/StartCheckFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			$("#btnSearch").trigger('click');
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion

			//#region æ¥çå®¡æ¹è¿åº¦
			function get_CheckFlowInfo() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var hID = data[0].hmainid.toString();
			layer.open({
			type: 2
			, area: ['70%', '70%']
			, title: 'åæ®å®¡æ¹è¿åº¦'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../ç³»ç»ç®¡ç/å¤çº§å®¡æ¹/å®¡æ¹è¿åº¦/Xt_CheckFlowProgressList.html?linterid=' + hID + '&HSouceBillType=' + HBillType
			, resize: false,
			end: function () {
			////ä¿®æ¹ä¸ºååå·æ°çé¢
			//if (get_needClose_Bar == 0) {
			// $("#btnSearch").trigger('click');
			//} else if (get_needClose_Bar == 1) {
			// $("#get_needClose").trigger('click');
			//}
			}
			, cancel: function () {

			}
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®æ¥çï¼');
			}
			}
			//#endregion

			//#region å¤çº§ åå®¡æ ¸/å®¡æ ¸æ°æ®
			function set_CheckBill_Flow(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_Routing/AuditFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "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 () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion

			//#region é©³å
			function set_RejectCheck_Flow(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			});
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion

			//å³é [1 å³éã2 åå³é]
			function set_CloseBill(num) {
			@@ -1304,7 +1228,7 @@
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["field"] + ",";
			colName += option.cols[0][i]["title"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			@@ -1339,7 +1263,6 @@
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async:"false",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {
			@@ -1376,10 +1299,6 @@
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			@@ -1391,10 +1310,6 @@
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			}

			@@ -1449,7 +1364,7 @@
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").empty();