MES-WEB-LayUI.git

			@@ -54,7 +54,9 @@
			<h1 style="text-align: center; padding: 10px 0;"><b>åºä»å</b></h1>
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶åä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶ä»ä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">å¶åä¿¡æ¯</li>

			</ul>
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			@@ -81,9 +83,9 @@
			<!--å¨ææ¸²ææºåç±»å-->
			</select>
			<!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
			<option style="color:blue;" selected="selected" value="1102">éè´è®¢å</option>
			<option style="color:blue;" value="1201">éè´å¥åºå</option>
			</select>-->
			<option style="color:blue;" selected="selected" value="1102">éè´è®¢å</option>
			<option style="color:blue;" value="1201">éè´å¥åºå</option>
			</select>-->
			</div>
			</div>
			<div class="layui-inline">
			@@ -100,14 +102,14 @@
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline" style="width:625px">
			<div class="layui-inline" >
			<label class="layui-form-label">ä¾åºå<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 505px" readonly>
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 505px;">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 150px" readonly>
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 150px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-inline">
			@@ -130,24 +132,6 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">å¸å«<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
			<input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ±ç<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">éè´æ¹å¼</label>
			<div class="layui-input-inline">
			@@ -158,17 +142,8 @@
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç®æ¹å¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
			<input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>

			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ä¸»ç®¡</label>
			@@ -180,10 +155,24 @@
			</button>
			</div>
			</div>
			<div class="layui-inline" style="">
			<label class="layui-form-label">åç¥¨ç¼å·</label>
			<div class="layui-input-inline" style="background-color: #efefef4d; float: left; width: 150px;">
			<input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»æ¬¾æ¥æ<label style="color:red"> * </label></label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
			<label class="layui-form-label">é¡¹ç®åç§°</label>
			<div class="layui-input-inline">
			<input type="text" name="HProjectName" id="HProjectName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
			<input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">é¡¹ç®ç¼ç </label>
			<div class="layui-input-inline">
			<input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>

			</div>
			</div>
			</div>
			@@ -192,16 +181,6 @@
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 1135px;">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			@@ -227,6 +206,59 @@
			</div>
			</div>
			</div>
			</div>
			</div>

			<!--å¶ä»ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç®æ¹å¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
			<input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»æ¬¾æ¥æ<label style="color:red"> * </label></label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¸å«<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
			<input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">æ±ç<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>

			</div>
			</div>
			<!--å¶åä¿¡æ¯-->
			@@ -621,6 +653,9 @@
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			});

			//åè¡¨Entry èµå¼
			@@ -719,6 +754,10 @@
			, "HSSName": ""
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			, "HInvoiceBillNo": dataArray[0].åç¥¨ç¼å·
			});
			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			@@ -1767,6 +1806,11 @@
			, "HExplanation": data.æè¦
			, "HInnerBillNo": data.åé¨åæ®å·

			, "HProjectID": data.HProjectID == null ? 0 : data.HProjectID
			, "HProjectName": data.é¡¹ç®åç§°
			, "HProjectNumber": data.é¡¹ç®ä»£ç
			, "HInvoiceBillNo": data.åç¥¨ç¼å·

			, "HMaker": data.å¶åäºº
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Format(new Date(data.å¶åæ¥æ), "yyyy-MM-dd HH:mm:ss")
			, "HUpDater": data.ä¿®æ¹äºº
			@@ -1902,6 +1946,9 @@
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			});

			//åè¡¨ èµå¼
			@@ -1981,6 +2028,10 @@
			, "HExRate": dataArray[0].æ±ç
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleSName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			, "HInvoiceBillNo": dataArray[0].åç¥¨ç¼å·
			});

			//åè¡¨ èµå¼
			@@ -2127,22 +2178,22 @@
			layer.msg("æ¥æä¸è½ä¸ºç©º!");
			return false;
			}
			if ($("#HCurID").val() == 0) {
			layer.msg("è¯·éæ©å¸å«ï¼");
			return;
			}
			if ($("#HExRate").val() == 0) {
			layer.msg("è¯·è¾å¥æ±çï¼");
			return;
			}
			//if ($("#HCurID").val() == 0) {
			// layer.msg("è¯·éæ©å¸å«ï¼");
			// return;
			//}
			//if ($("#HExRate").val() == 0) {
			// layer.msg("è¯·è¾å¥æ±çï¼");
			// return;
			//}
			//if ($("#HEmpID").val() == 0) {
			// layer.msg("è¯·éæ©ä¸å¡ååï¼");
			// return;
			//}
			if ($("#HDeptID").val() == 0) {
			layer.msg("è¯·éæ©éè´é¨é¨ï¼");
			return;
			}
			//if ($("#HDeptID").val() == 0) {
			// layer.msg("è¯·éæ©éè´é¨é¨ï¼");
			// return;
			//}
			if ($("#HSupID").val() == 0) {
			layer.msg("è¯·éæ©ä¾åºåï¼");
			return;
			@@ -2156,14 +2207,14 @@
			// return;
			//}

			temp = $("#HExRate").val() + "";
			if (temp == 0) {
			layer.msg("æ±çä¸è½ä¸º0!");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("æ±çè¯·è¾å¥å¤§äº0çæ°å!");
			return false;
			}
			//temp = $("#HExRate").val() + "";
			//if (temp == 0) {
			// layer.msg("æ±çä¸è½ä¸º0!");
			// return false;
			//} else if (!ref.test(temp)) {
			// layer.msg("æ±çè¯·è¾å¥å¤§äº0çæ°å!");
			// return false;
			//}
			//#endregion

			//#region åè¡¨ æ°æ®æ£éª
			@@ -2841,6 +2892,9 @@
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			});

			//åè¡¨Entry èµå¼
			@@ -2943,6 +2997,12 @@
			return;
			}
			}
			if (dataArray[0].æºåç±»å == "1102") {
			getPushSource_POOrderBillCur(dataArray[0].æºåä¸»åç , dataArray[0].æºåååç );
			} else {
			getPushSource_POInStockBillCur(dataArray[0].æºåä¸»åç , dataArray[0].æºåååç );
			}


			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": "0"
			@@ -2958,13 +3018,17 @@
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			//, "HCurID": dataArray[0].HCurID
			//, "HCurName": dataArray[0].å¸å«
			//, "HExRate": dataArray[0].æ±ç
			, "HSSID": "0"
			, "HSSName": ""
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			, "HInvoiceBillNo": dataArray[0].åç¥¨ç¼å·
			});

			//åè¡¨Entry èµå¼
			@@ -3152,7 +3216,69 @@
			}
			//#endregion


			//#region æ ¹æ®ä¸»åç ä¸ååç è·åæºåéè´è®¢åå¸å«æ±ç
			function getPushSource_POOrderBillCur(HSourceInterID, HSourceEntryID) {
			var res = "none";
			$.ajax({
			url: GetWEBURL() + "/Cg_POOrderBill/loadCg_POOrderBill_Push",
			async: false,
			type: "GET",
			data: {
			"HInterID": HSourceInterID
			, "HSubID": HSourceEntryID
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			res = result.data[0];
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HCurID": res.HCurID
			, "HCurName": res.å¸å«
			, "HExRate": res.æ±ç
			});
			} else {
			res = result.data;
			//layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			res = "none";
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			return res;
			}
			//#endregion

			//#region æ ¹æ®ä¸»åç ä¸ååç è·åæºåæ¶æéç¥åå¸å«æ±ç
			function getPushSource_POInStockBillCur(HSourceInterID, HSourceEntryID) {
			var res = "none";
			$.ajax({
			url: GetWEBURL() + "/Cg_POInStockBill/loadCg_POInStockBill_Push",
			async: false,
			type: "GET",
			data: {
			"HInterID": HSourceInterID
			, "HSubID": HSourceEntryID
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			res = result.data[0];
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HCurID": res.HCurID
			, "HCurName": res.å¸å«
			, "HExRate": res.æ±ç
			});
			} else {
			res = result.data;
			//layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			res = "none";
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			return res;
			}
			//#endregion

			//#endregion