MES-WEB-LayUI.git

			@@ -171,50 +171,47 @@
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">è´è´£äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" 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-col-xs7 layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">è´è´£äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
			</div>


			</div>
			<div class="layui-row">

			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			</div>


			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item">
			@@ -240,20 +237,6 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¶åæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
			@@ -271,24 +254,42 @@
			<input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>



			</div>

			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			@@ -374,7 +375,7 @@
			$.ajax({
			url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
			type: "GET",
			data: { "HBillType": '1103' },
			data: { "HBillType": '1239' },
			success: function (d) {
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HInterID").val(d.data[0].HInterID);
			@@ -413,28 +414,28 @@



			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			//è·åæå¤§åæ®å· new
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HInterID").val("0");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '1239' },
			success: function (d) {
			//console.log(d.data);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HInterID").val(d.data[0].HInterID);
			$("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ç®æ¹å¼
			}
			});
			} else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			$("#HInterID").val(linterid);
			RoadBillMain(linterid);
			}
			////å¤ææ¯å¦æ°å¢
			//if (linterid == null \|\| linterid == 0) {
			// //è·åæå¤§åæ®å· new
			// $("#HMaker").val(sessionStorage["HUserName"]);
			// $("#HInterID").val("0");
			// $("#HBillNo").val("");
			// $.ajax({
			// url: GetWEBURL() + "/Web/GetMAXNum",
			// type: "GET",
			// data: { "HBillType": '1239' },
			// success: function (d) {
			// //console.log(d.data);
			// $("#HBillNo").val(d.data[0].HBillNo);
			// $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			// $("#HInterID").val(d.data[0].HInterID);
			// $("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ç®æ¹å¼
			// }
			// });
			//} else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			// $("#HInterID").val(linterid);
			// RoadBillMain(linterid);
			//}
			//#endregion
			//#endregion
			//è·åç»ç»
			@@ -869,11 +870,13 @@
			, "HMaker": data.å¶åäºº
			, "HChecker": data.å®¡æ ¸äºº
			, "HCloseMan": data.å³éäºº
			, "HMakeDate": data.å¶åæ¥æ
			, "HCheckDate": data.å®¡æ ¸æ¥æ
			, "HCloseDate": data.å³éæ¥æ
			, "HUpDateDate": data.ä¿®æ¹æ¥æ
			, "HDeleteDate": data.ä½åºæ¥æ
			, "HUpDater": data.ä¿®æ¹äºº
			, "HDeleteDate": data.ä½åºäºº
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Pub_Format(data.å¶åæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCheckDate": data.å®¡æ ¸æ¥æ == null ? "" : Pub_Format(data.å®¡æ ¸æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCloseDate": data.å³éæ¥æ == null ? "" : Pub_Format(data.å³éæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HUpDateDate": data.ä¿®æ¹æ¥æ == null ? "" : Pub_Format(data.ä¿®æ¹æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HDeleteDate": data.ä½åºæ¥æ == null ? "" : Pub_Format(data.ä½åºæ¥æ, "yyyy-MM-dd hh:mm:ss")

			});
			//åè¡¨ èµå¼
			@@ -1010,16 +1013,16 @@
			, "HDeptName": dataArray[0].é¨é¨
			, "HManagerID": dataArray[0].HManagerID
			, "HManagerName": dataArray[0].ä¸»ç®¡
			, "HWHID": dataArray[0].HWHID
			, "HWHName": dataArray[0].ä»åº
			, "HWHID": dataArray[0].ä¸»è¡¨ä»åºID == null ? 0 : dataArray[0].ä¸»è¡¨ä»åºID
			, "HWHName": dataArray[0].ä¸»è¡¨ä»åº
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HSecManagerID": dataArray[0].HSecManagerID
			, "HSecManagerName": dataArray[0].éªæ¶å
			, "HKeeperID": dataArray[0].HKeeperID
			, "HKeeperName": dataArray[0].ä¿ç®¡å
			//, "HSecManagerID": dataArray[0].HSecManagerID
			//, "HSecManagerName": dataArray[0].éªæ¶å
			//, "HKeeperID": dataArray[0].HKeeperID
			//, "HKeeperName": dataArray[0].ä¿ç®¡å
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			@@ -1046,6 +1049,7 @@
			, "HSecUnitID": dataArray[i].HSecUnitID
			, "è¾å©åä½": dataArray[i].è¾å©åä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HQtyMust": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, 'HDiscountRate': dataArray[i].ææ£ç //
			, 'HRelTaxPrice': "0"
			@@ -1097,14 +1101,14 @@
			layer.msg("è¯·éæ©ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HKeeperID").val() == 0) {
			layer.msg("è¯·éæ©ä¿ç®¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HSecManagerID").val() == 0) {
			layer.msg("è¯·éæ©éªæ¶åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if ($("#HKeeperID").val() == 0) {
			// layer.msg("è¯·éæ©ä¿ç®¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HSecManagerID").val() == 0) {
			// layer.msg("è¯·éæ©éªæ¶åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}


			var num = [];
			@@ -1710,6 +1714,35 @@
			if (checkStatus.data.length == 0) {
			return layer.msg("è¯·è³å°éæ©ä¸æ¡æ°æ®!");
			}

			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": "0"
			, "HMainSourceEntryID": "0"
			, "HMainSourceBillNo": ""
			, "HMainSourceBillType": $("#BillType").val()

			, "HDeptID": checkStatus.data[0].HDeptID
			, "HDeptName": checkStatus.data[0].é¨é¨
			, "HManagerID": checkStatus.data[0].HManagerID
			, "HManagerName": checkStatus.data[0].ä¸»ç®¡
			, "HWHID": checkStatus.data[0].ä¸»è¡¨ä»åºID == null ? 0 : checkStatus.data[0].ä¸»è¡¨ä»åºID
			, "HWHName": checkStatus.data[0].ä¸»è¡¨ä»åº
			, "HEmpID": checkStatus.data[0].HEmpID
			, "HEmpName": checkStatus.data[0].ä¸å¡å
			, "HSupID": checkStatus.data[0].HSupID
			, "HSupName": checkStatus.data[0].ä¾åºå
			//, "HSecManagerID": checkStatus.data[0].HSecManagerID
			//, "HSecManagerName": checkStatus.data[0].éªæ¶å
			//, "HKeeperID": checkStatus.data[0].HKeeperID
			//, "HKeeperName": checkStatus.data[0].ä¿ç®¡å
			, "HCurID": checkStatus.data[0].HCurID
			, "HCurName": checkStatus.data[0].å¸å«
			, "HExRate": checkStatus.data[0].æ±ç
			/, "HAddress": data.äº¤è´§å°ç¹/
			, "HRemark": checkStatus.data[0].è¡¨å¤´å¤æ³¨
			, "HInnerBillNo": checkStatus.data[0].åé¨åæ®å·
			});

			//layer.alert("ä½ å·²éæ©" + checkStatus.data.length + "æ¡æ°æ®");
			//è·åæ¶æéç¥åä»£ç
			var ProcessNumber = [];
			@@ -1727,8 +1760,8 @@
			option.data.push({
			"HMaterID": checkStatus.data[j].HMaterID, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": checkStatus.data[j].ç©æåç§°, "è§æ ¼åå·": checkStatus.data[j].è§æ ¼åå·,
			"HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½,
			"HQty": checkStatus.data[j].æ°é-checkStatus.data[j].å³èæ°é,"HQtyMust": checkStatus.data[j].åºæ¶æ°é, "HPrice": checkStatus.data[j].åä»·,
			"HMoney": checkStatus.data[j].éé¢, "HTaxRate": checkStatus.data[j].ç¨ç, "HTaxMoney": checkStatus.data[j].ç¨é¢,"HWHID": checkStatus.data[j].HWHID,
			"HQty": checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é, "HQtyMust": checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é, "HPrice": checkStatus.data[j].åä»·,
			"HMoney": (checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é) * Number(checkStatus.data[j].åä»·), "HTaxRate": checkStatus.data[j].ç¨ç, "HTaxMoney": checkStatus.data[j].ç¨é¢, "HWHID": checkStatus.data[j].HWHID,
			"æ¶æä»åº": checkStatus.data[j].æ¶æä»åº,"HSPID": checkStatus.data[j].HSPID,"ä»ä½åç§°": checkStatus.data[j].ä»ä½åç§°,"HSecUnitID": checkStatus.data[j].HSecUnitID,"è¾å©åä½": checkStatus.data[j].è¾å©åä½,
			"HSourceBillNo": checkStatus.data[j].åæ®å·, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid
			})