MES-WEB-LayUI.git

			@@ -125,18 +125,24 @@
			var HSourceID = ""; //èµæºID
			var HICMOInterID = ""; //çäº§è®¢åä¸»ID
			var HICMOEntryID = ""; //çäº§è®¢ååID
			var HMaker = ""; //å½åç»å½äºº
			var Czybm = ""; //å½åç»å½äººç¼å·
			var HSourceInterID = ""; //çäº§ç¶æä¸´æ¶è¡¨ä¸»ID
			var HSourceBillType = ""; //æºåç±»å
			var HProcID = ""; //å·¥åºID
			var SchWhere = ""; //æé®æ¥è¯¢åæ°
			var edit = function (data) {
			workcode = data[0].workcode;
			HSourceID = data[0].HSourceID;
			HSourceName = data[0].HSourceName;
			HICMOInterID = data[0].HICMOInterID;
			HICMOEntryID = data[0].HICMOEntryID;
			HMaker = data[0].HMaker;
			Czybm = data[0].Czybm;
			HSourceBillType = data[0].HSourceBillType;
			}
			//var edit = function (data) {
			// workcode = data[0].workcode;
			// HSourceID = data[0].HSourceID;
			// HSourceName = data[0].HSourceName;
			// HICMOInterID = data[0].HICMOInterID;
			// HICMOEntryID = data[0].HICMOEntryID;
			// HMaker = data[0].HMaker;
			// Czybm = data[0].Czybm;
			// HSourceInterID = data[0].HSourceInterID;
			// HSourceBillType = data[0].HSourceBillType;
			// HProcID = data[0].HProcID;
			//}
			//è·åé¡µé¢è·³è½¬åæ° //åæ®ç¼è¾ç¶æï¼ 1.æ æºåæ°å¢Â Â 2.ææºåæ°å¢Â Â 3.ç¼è¾Â 4.æµè§Â 5.åæ´
			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			@@ -144,7 +150,17 @@
			} else {
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			var HSBillType = params[params[2]];//æºåç±»å
			var workcode = params[params[3]];
			var HSourceID = params[params[4]];
			var HSourceName = params[params[5]];
			var HICMOInterID = params[params[6]];
			var HICMOEntryID = params[params[7]];
			var HMaker = params[params[8]];
			var Czybm = params[params[9]];
			var HSourceInterID = params[params[10]];
			var HSourceBillType = params[params[11]];
			var HProcID = params[params[12]];
			}


			@@ -200,11 +216,76 @@
			, { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
			, { field: 'HDate', title: 'æ¥æ', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'HBillNo', title: 'åæ®å·', width: 200 }
			, { field: 'HBillType', title: 'åæ®ç±»å', width: 200 }
			, { field: 'HBillStatus', title: 'åæ®ç¶æ', width: 200}
			, {
			field: 'HBillType', title: 'åæ®ç±»å', width: 200, templet: function (d) {
			if (d.HBillType == "3724") {
			return "äº§éæ±æ¥ä¸´æ¶å";
			}
			}
			}
			, {
			field: 'HBillStatus', title: 'åæ®ç¶æ', width: 200, templet: function (d) {
			switch (d.HBillStatus) {
			case 0:
			return "åå»º"
			break;
			case 1:
			return "æªå®¡"
			break;
			case 2:
			return "å·²å®¡"
			break;
			case 3:
			return "å³é"
			break;
			case 4:
			return "ä½åº"
			break;
			case 5:
			return "å®¡æ ¸éå"
			break;
			case 6:
			return "å®¡æ ¸ä¸"
			break;
			case 7:
			return "å·²é"
			break;
			case 8:
			return "å·²åå¤"
			break;
			case 9:
			return "ç»æ¡"
			break;
			case 10:
			return "éªè¯"
			break;
			case 11:
			return "ä¸è¾¾"
			break;
			case 12:
			return "å¼å·¥"
			break;
			case 13:
			return "ç³è¯·å®¡æ¹"
			break;
			case 15:
			return "ç³è¯·æ£éª"
			break;
			case 16:
			return "å¤å®åæ ¼"
			break;
			case 17:
			return "å¤å®ä¸åæ ¼"
			break;
			default:
			return d.HBillStatus
			}
			}
			}
			, { field: 'HICMOBillNo', title: 'çäº§è®¢åå·', width: 200 }
			, { field: 'HICMOInterID', title: 'çäº§è®¢åä¸»ID', width: 200, hide: true }
			, { field: 'HICMOEntryID', title: 'çäº§è®¢ååID', width: 200, hide: true }
			, { field: 'HProcID', title: 'å·¥åºID', width: 200, hide: true }
			, { field: 'HProcNumber', title: 'å·¥åºç¼ç ', width: 200 }
			, { field: 'HProcName', title: 'å·¥åºåç§°', width: 200 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 200 }
			@@ -234,7 +315,8 @@
			//æ¥å·¥å¹³å°è¿å¥(ææºå)
			function set_AddNew()
			{
			sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
			//sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HSourceInterID == "null" ? 0 : HSourceInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
			sWhere = " where a.HSourceID='" + HSourceID + "' and a.HSourceBillNo='" + workcode + "' and a.HSourceInterID='" + (HSourceInterID == "null" ? 0 : HSourceInterID) + "' and a.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
			SchWhere = sWhere;
			console.log(sWhere);
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			@@ -248,7 +330,7 @@
			table.render(option);

			} else {
			layer.close(index);

			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			sWhere = "";
			@@ -320,7 +402,7 @@
			type: "Get",
			url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveGetMESProductReportBillList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "ScMaxWork": ScMaxWork(), "HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker, "Czybm": Czybm },
			data: { "ScMaxWork": ScMaxWork(), "HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker, "Czybm": Czybm, "HProcID": HProcID },
			dataType: "json",
			beforeSend: function () {
			$('#AskReport').addClass("layui-btn-disabled").attr("disabled", true);