MES-WEB-LayUI.git

			@@ -102,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">
			@@ -132,25 +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">
			@@ -161,8 +142,8 @@
			</button>
			</div>
			</div>

			</div>

			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ä¸»ç®¡</label>
			@@ -185,6 +166,13 @@
			<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>
			@@ -239,6 +227,24 @@
			<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>
			@@ -649,6 +655,7 @@
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			});

			//åè¡¨Entry èµå¼
			@@ -674,8 +681,8 @@
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			@@ -749,6 +756,7 @@
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			, "HInvoiceBillNo": dataArray[0].åç¥¨ç¼å·
			});
			//åè¡¨Entry èµå¼
			@@ -774,8 +782,8 @@
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			@@ -864,7 +872,7 @@
			, "HQty": "0"
			, "HPrice": "0"
			, "HTaxPrice": "0"
			, 'HDiscountRate': "0"
			, 'HDiscountRate': "1"
			, 'HRelTaxPrice': "0"
			, "HTaxRate": "0"
			, 'HTaxMoney': "0"
			@@ -1401,7 +1409,7 @@
			, "HQty": "0"
			, "HPrice": "0"
			, "HTaxPrice": "0"
			, 'HDiscountRate': "0"
			, 'HDiscountRate': "1"
			, 'HRelTaxPrice': "0"
			, "HTaxRate": "0"
			, 'HTaxMoney': "0"
			@@ -1800,6 +1808,7 @@

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

			, "HMaker": data.å¶åäºº
			@@ -1939,6 +1948,7 @@
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			});

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

			@@ -2883,6 +2894,7 @@
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			});

			//åè¡¨Entry èµå¼
			@@ -2908,8 +2920,8 @@
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			@@ -2985,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"
			@@ -3000,15 +3018,16 @@
			, "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].åç¥¨ç¼å·
			});

			@@ -3035,8 +3054,8 @@
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			@@ -3197,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