MES-WEB-LayUI.git

			@@ -14,38 +14,6 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<style>
			.main-btn { /å¤´é¨ä¸»æé®/
			padding: 0 2px; /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			height: 30px;
			line-height: 30px;
			}

			.btn-title {
			font-size: 16px;
			}
			/* é²æ¢ä¸ææ¡çä¸æåè¡¨è¢«éè---å¿é¡»è®¾ç½®--- */
			.layui-table-cell {
			overflow: visible !important;
			}
			/* ä½¿å¾ä¸ææ¡ä¸ååæ ¼åå¥½åé */
			td .layui-form-select {
			margin-top: -10px;
			margin-left: -15px;
			margin-right: -15px;
			}

			.layui-form-item .layui-inline {
			margin-top: 5px;
			margin-bottom: 5px;
			margin-right: 0px;
			}

			.layui-form-label {
			width: 25%;
			}
			</style>

			</head>
			<body>
			<div class="layui-fluid" style="padding: 0;">
			@@ -145,11 +113,9 @@
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å æ·»å ä¿å
			var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å
			var linteridSub = params[params[3]]; //ä»åæ°è·å åè¡¨çº§å«

			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			linteridSub = -1;
			OperationType = 1;
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			@@ -163,7 +129,7 @@
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(linterid, linteridSub);
			RoadBillMain(linterid);
			//RoadBillSub(linterid);
			}

			@@ -255,7 +221,7 @@

			//éåº
			form.on('submit(Cancel)', function () {
			if ((OperationType == 1 && linteridSub == -1) \|\| OperationType == 3) {
			if ((OperationType == 1 ) \|\| OperationType == 3) {
			Pub_Close(1);
			} else {
			Pub_Close(2);
			@@ -297,6 +263,7 @@
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HPRDORGID").append(Organization);
			$("#HPRDORGID").val(sessionStorage["OrganizationID"]);
			form.render('select');
			}
			layer.closeAll("loading");
			@@ -350,7 +317,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../Baseset/åºç¡èµæ/Gy_SupplierList.html", "yes"]
			, content: ["../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -363,8 +330,8 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HSupplierID": checkStatus.data[0].HItemID
			, "HSupplierNumber": checkStatus.data[0].HNumber
			, "HSupplierName": checkStatus.data[0].HName
			, "HSupplierNumber": checkStatus.data[0].ä¾åºåä»£ç
			, "HSupplierName": checkStatus.data[0].ä¾åºååç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -403,6 +370,7 @@
			}
			})
			}
			obj.event = "";
			return false;
			}

			@@ -410,9 +378,9 @@
			}

			//ç¼è¾ é¡µé¢èµå¼
			function RoadBillMain(linterid, linteridSub)//å è½½è¡¨å¤´
			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
			var sWhere = " and hmainid='" + linterid + "'";
			$.ajax({
			url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/PODemandPlanConfigBillList",
			type: "GET",
			@@ -423,18 +391,20 @@
			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": d.data[0].åæ®å·
			, "HInterID": d.data[0].hmainid
			, "HPRDORGID": d.data[0].ç»ç»
			, "HPRDORGID": d.data[0].HOrgID
			});

			//åè¡¨ èµå¼
			var rowdata = [{
			"HSupplierID": d.data[0].HSupplierID, "HSupplierNumber": d.data[0].ä¾åºåä»£ç , "HSupplierName": d.data[0].ä¾åºååç§°, "HMaterID": d.data[0].HMaterID, "HMaterNumber": d.data[0].ç©æä»£ç , "HMaterName": d.data[0].ç©æåç§°, "HMaterModel": d.data[0].è§æ ¼åå·
			, "HJITMaterGroup": d.data[0].JITç©æåç±», "HJITSafeStock": d.data[0].JITæå¨å®å¨åºåé, "HJITMaterDemand": d.data[0].JITç©æéæ±ä¾è´§å¨æ, "HJITBatchQty": d.data[0].JITæè´§æ¹é, "HDeliveryPeriod": d.data[0].JITæè´§æ¹éå¯¹åºå¨æ
			, "HLeadTime": d.data[0].JITä¾è´§æåæ, "HLeadTime_Sec": d.data[0].JITå°è´§åç½®æ, "HDeliveryMode": d.data[0].JITéè´§æ¹å¼, "HDeliveryDaysCtrl": d.data[0].JITéè´§æ§å¶å¤©æ°, "HRemark": d.data[0].è¡¨ä½å¤æ³¨
			}];
			var rowdata = [];
			for (var i = 0; i < d.data.length; i++) {
			//åè¡¨ èµå¼
			rowdata.push({
			"HSupplierID": d.data[i].HSupplierID, "HSupplierNumber": d.data[i].ä¾åºåä»£ç , "HSupplierName": d.data[i].ä¾åºååç§°, "HMaterID": d.data[i].HMaterID, "HMaterNumber": d.data[i].ç©æä»£ç , "HMaterName": d.data[i].ç©æåç§°, "HMaterModel": d.data[i].è§æ ¼åå·
			, "HJITMaterGroup": d.data[i].JITç©æåç±», "HJITSafeStock": d.data[i].JITæå¨å®å¨åºåé, "HJITMaterDemand": d.data[i].JITç©æéæ±ä¾è´§å¨æ, "HJITBatchQty": d.data[i].JITæè´§æ¹é, "HDeliveryPeriod": d.data[i].JITæè´§æ¹éå¯¹åºå¨æ
			, "HLeadTime": d.data[i].JITä¾è´§æåæ, "HLeadTime_Sec": d.data[i].JITå°è´§åç½®æ, "HDeliveryMode": d.data[i].JITéè´§æ¹å¼, "HDeliveryDaysCtrl": d.data[i].JITéè´§æ§å¶å¤©æ°, "HRemark": d.data[i].è¡¨ä½å¤æ³¨
			});
			}
			option.data = rowdata;
			table.render(option);
			form.render('select');
			}
			})
			}
			@@ -453,8 +423,7 @@

			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(num);
			var hentryid = linteridSub;//åè¡¨ æåºid
			var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
			var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];

			var index = layer.load();
			$.ajax({