MES-WEB-LayUI.git

			@@ -18,6 +18,8 @@
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/QueryScheme.js"></script>
			<script src="../../../layuiadmin/grwebapp.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

			</head>
			<body>
			<div class="layui-fluid">
			@@ -325,11 +327,7 @@
			</div>
			</div>
			</div>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

			<script>
			var GetDataCols = "";
			layui.config({
			@@ -699,6 +697,7 @@
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "get",
			async: false,
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			var Organization = "";
			@@ -1163,7 +1162,7 @@
			function get_DisplayPage(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
			//sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
			$.ajax({
			url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json_byPage',
			type: "GET",
			@@ -1416,6 +1415,8 @@
			sWhere += addSWhereByOpenType();
			//æ ¹æ®ç¨æ·è¿æ»¤ç¨æ·å³èå®¢æ·çè®°å½
			sWhere += getSWhereByHUser();

			sWhere += getOrgIDByUser();//ç¨æ·å³èç»ç»æ¥è¯¢è¿æ»¤

			//get_Display(sWhere);

			@@ -2912,10 +2913,34 @@

			return res;
			}


			//#endregion

			//#region æ ¹æ®ç¨æ·è·åç¨æ·å³èç»ç»çè¿æ»¤æ¡ä»¶
			function getOrgIDByUser() {
			var res = "";
			$.ajax({
			type: "GET",
			async: false,
			url: GetWEBURL() + "/Xt_User/getOrgIDListByUser", //æ¹æ³æå¨é¡µé¢åæ¹æ³å ä¼ å ç»ç»å¿é¡»æ¯åè¡¨å¤´é¨æ¥è¯¢çç»ç» ä¸è½ä½¿ç¨ç¨æ·é»è®¤
			data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HOrgID").val() },
			success: function (result) {
			if (result.count == 1) {
			if (result.data[0].sWhere == "1") {
			res = " and HPRDORGID = '" + $("#HOrgID").val() + "'";
			} else {
			res = result.data[0].sWhere;
			}
			}
			}, error: function (err) {
			res = " and 1 = 0";
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			return res;
			}
			//#endregion


			//#region è·åæºå-çäº§è®¢ååæ®ç¶æ
			function getSourceBillStatus_ICMOBill(ParamsInterID) {
			var HSourceBillData = "none";