MES-WEB-LayUI.git

			@@ -61,7 +61,7 @@
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æºåç±»å</label>
			</div>
			<div class="layui-col-xs8">
			<select name=" HBillType" id="HBillType">
			<select name="HBillType" id="HBillType">
			<option value="1241">å¥åºç³è¯·å</option>
			<option value="-1">æå·¥å½å¥</option>
			</select>
			@@ -90,6 +90,16 @@
			<select name=" HBillSubType" id="HBillSubType">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-col-xs3">
			<label class="layui-form-label" style="width:60px;padding-left:0px;">æ¥æ</label>
			</div>
			<div class="layui-col-xs8">
			<input name="HDate" id="HDate" autocomplete="off" class="layui-input">
			</div>
			</div>
			</div>
			@@ -245,6 +255,7 @@
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, laydate = layui.laydate
			, element = layui.element;

			//è¡¨å¤´åå§åèµå¼ï¼æ ¹æ®ç»å½ç¨æ·è·å é»è®¤ä»åºãé¨é¨ãéªæ¶ãä¿ç®¡ãéè¶ç¨æ·ï¼ new
			@@ -268,7 +279,23 @@
			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			$("#HOrgID").hide();
			$("#HBillSubType").val(sessionStorage["HBillSubType"]);
			$("#HDate").val(formatDate(sessionStorage["HDate"]));
			var HSourceFlag = sessionStorage["SourceFlag"];
			//é»è®¤å¸¦å¥çä»åºï¼å¦æå¯ç¨ä»ä½åä»ä½ææï¼å¦ææ²¡æå¯ç¨åä»ä½ç°åº¦ new


			// ç¼è¾è·åè¡¨å¤´æ¶æ¶é´æ ¼å¼ç«æ£æ¹å¼
			function formatDate(date) {
			var d = new Date(date),
			month = '' + (d.getMonth() + 1),
			day = '' + d.getDate(),
			year = d.getFullYear();

			if (month.length < 2) month = '0' + month;
			if (day.length < 2) day = '0' + day;

			return [year, month, day].join('-');
			}


			//è·ååæ°
			@@ -286,6 +313,17 @@
			var linterid = params[params[0]]; //ä»åæ°ä¸è·å åæ®åç
			var lSourceBillType = params[params[2]]; //ä»åæ®è·å æºåç±»å

			//åå§åè¡¨åæä»¶
			set_InitFrom();

			//åå§åè¡¨åæä»¶
			function set_InitFrom() {
			//å¸¸è§ç¨æ³
			laydate.render({
			elem: '#HDate'
			});
			}

			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			$.ajax({
			@@ -296,14 +334,36 @@
			// console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HBillType").val(d.data[0].HSourceBillType);
			$("#HBillType").val(d.data[0].HSourceBillType == null ? "1241" : d.data[0].HSourceBillType);
			//è·åæºåç±»åãæºååå·
			if (d.data[0].HSourceBillType == "1241") {
			$("#HBillType").empty();
			$("#HBillType").val("1241");
			var optionHtml = '';
			optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + 'å¥åºç³è¯·å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else {
			$("#HBillType").empty();
			$("#HBillType").val("-1");
			var optionHtml = '';
			optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + 'æå·¥å½å¥' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
			$("#HSourceBillNo").attr("disabled", "true");
			$("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
			//$("#HWHID").val(d.data[0].HWhID);
			//$("#HKeeperID").val(d.data[0].HKeeperID);
			//$("#HSecManagerID").val(d.data[0].HSecManagerID);
			//$("#HDeptID").val(d.data[0].HDeptID);
			//$("#HBarCode").val(d.data[0].HBarCode);
			//$("#HQty").val(d.data[0].HQty);
			HSourceFlag = true;
			}
			})
			//è·ååæ®åç±»å
			@@ -375,6 +435,7 @@
			//console.log(d.data);
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
			}
			});
			//è·ååæ®åç±»å
			@@ -1015,7 +1076,7 @@
			//url: "http://localhost:12761/OtherInStockBill/get_InfoByBarCode_Source_Json", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
			type: "GET",
			data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": sessionStorage["SourceFlag"], "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
			data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": HBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
			success: function (result) {
			if (result.count == 1) {
			if (result.data.HBarType == 'ä»åºæ¡ç ') {
			@@ -1045,7 +1106,7 @@
			$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			$("#HSourceBillNo").val(result.data.HSourceBillNo);
			sessionStorage["SourceFlag"] = true;
			HSourceFlag = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.HSourceBillType == "1241") {
			$("#HBillType").val("1241");
			@@ -1058,7 +1119,7 @@
			element.tabChange('tab-Kf_OtherInBill', '3');
			}
			else {
			if (sessionStorage["SourceFlag"] == "true") {
			if (HSourceFlag == true) {
			element.tabChange('tab-Kf_OtherInBill', '3');
			}
			else {
			@@ -1067,15 +1128,40 @@
			//$("#HDeptName").val(result.data.HDeptName);
			//$("#HDeptID").val(result.data.HDeptID);
			//$("#HSourceBillNo").val(result.data.HSourceBillNo);
			sessionStorage["SourceFlag"] = true;
			//sessionStorage["SourceFlag"] = true;
			//è·åæºåç±»åãæºååå·
			if (result.data.HSourceBillType == "1241") {
			$("#HBillType").val("1241");
			//if (result.data.HSourceBillType == "1241") {
			// $("#HBillType").val("1241");

			//}
			//else if (result.data.HSourceBillType == "1601") {
			// $("#HBillType").val("1601");
			//}


			HSourceFlag = true;
			$("#HSourceBillNo").val(result.data.hSourceBillNoField);
			$("#HBillType").val(result.data.hSourceBillTypeField == null ? "1241" : result.data.hSourceBillTypeField);
			//è·åæºåç±»åãæºååå·
			if (result.data.hSourceBillTypeField == "1241") {
			$("#HBillType").empty();
			$("#HBillType").val("1241");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'å¥åºç³è¯·å' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			else if (result.data.HSourceBillType == "1601") {
			$("#HBillType").val("1601");
			else {
			//$("#HBillType").empty();
			$("#HBillType").val("-1");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'æå·¥å½å¥' + "</option>";
			$("#HBillType").append(optionHtml);
			layui.form.render('select');
			$("#HBillType").attr("readonly", "readonly");
			}
			$("#HSourceBillNo").attr("readonly", "readonly");
			$("#HNote").val(";ç©ææ¡ç ");
			element.tabChange('tab-Kf_OtherInBill', '3');
			}
			@@ -1236,7 +1322,7 @@
			element.tabChange('tab-Kf_OtherInBill', '2');
			playSound1();
			HSourceFlag = true;
			sessionStorage["SourceFlag"] = true;
			//sessionStorage["SourceFlag"] = true;
			layer.load(3)
			//table.render({
			// elem: '#wl-table'