MES-WEB-LayUI.git

			@@ -102,7 +102,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" id="BT_HSourceBillNo">éåå·<label style="color:red">*</label></label>
			<div class="layui-input-inline">
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceBillNoList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -201,6 +201,10 @@
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			var closeType = params[params[3]]; //å³éç±»å
			var loginCard = params[params[4]]; //èªå¨ç»å½icå¡å·
			var HOrgID = params[params[5]];//ç»å½ç»ç»id
			//var HOrgName = params[params[6]];//ç»å½ç»ç»åç§°
			var HTranSlate = params[params[6]];//è¯è¨
			}

			var OptionData = [];
			@@ -267,6 +271,18 @@
			})

			//#region è¿å¥é¡µé¢æ¢å è½½
			//èªå¨ç»å½
			if (loginCard != undefined) {
			var login_result = true;
			loginByICCard(loginCard)
			if (login_result) {
			$("#HSourceBillType").val(HSouceBillType);
			form.render('select');
			$("#HSourceBillNo").val(linterid);
			}

			}

			//åå§åè¡¨åæä»¶
			set_InitFrom();
			//å è½½ç»ç»æ°æ®
			@@ -302,6 +318,13 @@

			initFunction(1, "Gy_BarCodeBill", sessionStorage["HTranSlate"]);
			form.render('select');

			//ç»å½åéä¸æºåå¨ä½
			if (loginCard != undefined && login_result == true) {
			let HSourceBillType = getSupType();
			getBarCodeByHBillNo(linterid, HSourceBillType)

			}
			//#endregion

			//#region ç¹å»äºä»¶ï¼åæ¬onåformäºä»¶
			@@ -597,6 +620,24 @@
			}
			});
			});

			//#region åè½¦éæ©æºå
			$('#HSourceBillNo').on('keydown', function (event) {
			var HSourceBillNo = $('#HSourceBillNo').val();//ï¼æºååæ®å·ï¼
			//$("#HSourceBillType").val(2);
			//form.render('select');
			if (event.keyCode == 13) {
			var ajaxLoad = layer.load();
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			if (HSourceBillNo == "") {
			layer.close(ajaxLoad);
			return;
			}
			let HSourceBillType = getSupType();
			getBarCodeByHBillNo(HSourceBillNo, HSourceBillType)
			}
			});
			//#endregion

			function isAllEqual(array) {
			if (array.length > 0) {
			@@ -1048,8 +1089,8 @@
			table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			DisPlay_HideColumn1();
			DisPlay_HideColumn2();
			//DisPlay_HideColumn1();
			//DisPlay_HideColumn2();
			}

			function set_AddFNew1() {
			@@ -1061,17 +1102,17 @@
			}];
			table.render(option1);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//DisPlay_HideColumn();
			DisPlay_HideColumn1();
			DisPlay_HideColumn2();
			//DisPlay_HideColumn2();
			}

			function set_AddFNew2() {
			option2.data = [];
			table.render(option2);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			DisPlay_HideColumn1();
			//DisPlay_HideColumn();
			//DisPlay_HideColumn1();
			DisPlay_HideColumn2();
			}

			@@ -1989,6 +2030,181 @@
			return Result;
			}

			//æ ¹æ®åæ®å·è·åæ¡ç ä¿¡æ¯
			function getBarCodeByHBillNo(HBillNo,HSouceBillType) {
			var ajaxLoad = layer.load();
			let sWhere1 = " and åæ®å· = '" + HBillNo +"'"
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
			type: "GET",
			data: { "page": 1, "limit": 50, "sWhere": sWhere1, "HSouceBillType": HSouceBillType, "HOrgID": sessionStorage["OrganizationID"] },
			async: false,
			dataType: "json",//æ°æ®ç±»åå¯ä»¥ä¸º text xml json script jsonp
			success: function (data1) {
			HBarInfo = ""; //åå¨æ¡ç ä¿¡æ¯
			HFileList = ""; //åå¨æ¡£æ¡åè¡¨
			$('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//çææé®å¯ç¨
			element.tabChange('tab-TabTest', '1');
			var checkStatus = data1;//è·åtableçelem:"#test"
			if (checkStatus.data === null) {
			layer.close(ajaxLoad);
			return layer.msg(get_MessageError('[0000-1-020]è¯·éæ©åæ®æ°æ®', sessionStorage["HTranSlate"]));
			}
			var list = [];
			var BillSelect = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (checkStatus.data[i].é¨é¨ != "" && checkStatus.data[i].é¨é¨ != null) {
			list.push(checkStatus.data[i].é¨é¨)
			}
			BillSelect.push({ BillType: checkStatus.data[i].HBillType, BillTitle: getSupType(), BillNo: checkStatus.data[i].åæ®å·, "BillMainID": checkStatus.data[i].HMainID, "BillSubID": checkStatus.data[i].HSubID, "SPID": 0, "BatchNo": "", "HAuxPropID": 0 });
			}
			if (isAllEqual(list)) //ä¸åè®¸éæ©ä¸åé¨é¨
			{
			//è·åéä¸æ°æ®
			var GrdSelectData = JSON.stringify(BillSelect);
			//è·åéæ©çæºåç±»å
			var HSourceBillType = $("#HSourceBillType").find("option:selected").html();
			//è·åéæ©çæ¡ç ç±»å
			var HBarCodeType = $("#HBarCodeType").find("option:selected").html();
			//è·åå½åç»å½äººå
			var UserName = sessionStorage["HUserName"];
			var Str = GrdSelectData + ";" + HSourceBillType + ";" + HBarCodeType + ";" + UserName;
			//éè¿éæ©çæºåä¸»ååç æ¥æ¾è¯¦ç»ä¿¡æ¯
			$.ajax({
			type: "post",
			url: GetWEBURL() + "/Sc_BarCode/SelectReportFromBillList",
			//contentType: 'application/json',
			async: false,
			dataType: "json",
			data: { "msg": Str },
			//traditional: true,
			success: function (result) {
			HMaterID = result.list[0].HMaterID;
			HBatchNo = result.list[0].HBatchNo;
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			for (let i = 0; i < result.list.length; i++) {
			result.list[i].HQty = result.list[i].HQty.toString().match(/^\d+(?:\.\d{0,6})?/)[0] //ä¿çå°æ°ç¹ååä½å°æ°
			if (result.list[i].HMinQty != 0) {
			result.list[i].HBQty = Math.ceil(result.list[i].HQty / result.list[i].HMinQty)
			}
			result.list[i].HEmpID = sessionStorage["HEmpID"]
			result.list[i].HEmpNumber = sessionStorage["HEmpNumber"]
			result.list[i].HEmpName = sessionStorage["HEmpName"]
			}

			BatchNoArray = result.list; //è·åæ¹å·ï¼ç¨æ¥ç»æ¹æ¬¡æé®åè½ä¸çæ¹å·èµå¼
			//for (let i = 0; i < result.list.length; i++) {
			// result.list[i].HMinQty = '';//ç¹å»ååæ ¼çæ¶åé»è®¤å¼0ä¸ä¼æ¸é¤ï¼å®¢æ·çäºä¼è§å¾å¾æªï¼æä»¥åç¨ç©ºåç¬¦ä¸²åä»£;
			//}
			console.log(result.list[0]);
			table.reload('mainTable', {
			data: result.list // è°ç¨table.reload éæ°æ¸²ææ¾ç¤ºå è½½è¿½å äºæ°æ®çè¡¨æ ¼
			});
			//å³éå½åframe
			layer.close(ajaxLoad);
			}
			}
			})
			}
			else {
			layer.msg(get_MessageError("[3899-2-001]ä¸åè®¸éæ©ä¸åçé¨é¨æ°æ®!", sessionStorage["HTranSlate"]), { time: 1 * 2000, icon: 5 });
			}
			}, error: function (err) {
			layer.alert(err.Message, { icon: 5 });
			layer.close(ajaxLoad);
			}
			});
			}
			//ç»å½æ ¹æ®icå¡å·
			function loginByICCard(HBarCode) {
			var index = layer.load();
			//è·åé»è®¤ç»ç»åç§°
			$.ajax({
			type: "get",
			async: false,
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (let element of data) {
			if (element.ID == HOrgID) {
			sessionStorage["Organization"] = element.Name;
			}
			}
			}
			},
			error: function (err) {
			login_result = false;
			layer.close(index);
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			})
			//è·åç»å½ä¿¡æ¯
			$.ajax({
			url: GetWEBURL() + "/Web/GetUserByICCard",
			type: "GET",
			async: false,
			data: { "HBarCode": HBarCode },
			success: function (result) {
			if (result.count == 1) {
			layer.close(index);
			sessionStorage["HCloudUserName"] = result.data[0].HCloudUserName;//éè¶äºè´¦å·
			sessionStorage["HCloudUserPsd"] = result.data[0].HCloudUserPsd;
			sessionStorage["HMaker"] = result.data[0].Czymc;
			sessionStorage["HUserName"] = result.data[0].Czymc;
			sessionStorage["HBillerID"] = result.data[0].HK3UserID;
			sessionStorage["SourceFlag"] = false;
			sessionStorage["HKeeperID"] = result.data[0].HKeeperID;
			sessionStorage["HKeeper"] = result.data[0].HKeeper;
			sessionStorage["HSecManagerID"] = result.data[0].HSecManagerID;
			sessionStorage["HSecManager"] = result.data[0].HSecManager;
			sessionStorage["HSellManID"] = result.data[0].HSellManID;
			sessionStorage["HSellMan"] = result.data[0].HSellMan;
			sessionStorage["HDeptID"] = result.data[0].HDeptID;
			sessionStorage["HDept"] = result.data[0].HDept;
			sessionStorage["HWHID"] = result.data[0].HWhID;
			sessionStorage["HWHName"] = result.data[0].HWHName;
			sessionStorage["HSPID"] = result.data[0].HSPID;
			sessionStorage["HSPName"] = result.data[0].HSPName;
			sessionStorage["HSupID"] = result.data[0].HSupID;
			sessionStorage["HSupName"] = result.data[0].HSupName;
			sessionStorage["Czmm"] = result.data[0].Czmm;
			sessionStorage["Czybm"] = result.data[0].Czybm;
			sessionStorage["HEmpID"] = result.data[0].HEmpID;
			sessionStorage["HEmpNumber"] = result.data[0].HEmpNumber;
			sessionStorage["HEmpName"] = result.data[0].HEmpName;
			sessionStorage["HGroup"] = result.data[0].HGroup;
			sessionStorage["HGroupID"] = result.data[0].HGroupID;
			sessionStorage["HProc"] = result.data[0].HProc;
			sessionStorage["HProcNo"] = result.data[0].HProcNo;
			sessionStorage["HSource"] = result.data[0].HSource;
			sessionStorage["HSourceID"] = result.data[0].HSourceID;
			sessionStorage["HWorkCenter"] = result.data[0].HWorkCenter;
			sessionStorage["HWorkCenterID"] = result.data[0].HWorkCenterID;
			sessionStorage["HProcName"] = result.data[0].HProcName;
			sessionStorage["HProcID"] = result.data[0].HProcID;
			sessionStorage["HCheckEmpID"] = result.data[0].HCheckEmpID;
			sessionStorage["HCheckEmpName"] = result.data[0].HCheckEmpName;
			sessionStorage["login"] = "login";
			sessionStorage["OrganizationID"] = HOrgID;
			//sessionStorage["Organization"] = $("#Organization option:selected").text();
			sessionStorage["HTranSlate"] = HTranSlate;
			}
			else {
			layer.close(index);
			login_result = false;
			layer.msg("åºç°é®é¢ï¼" + result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.close(index);
			login_result = false;
			layer.msg("æ¥å£è¯·æ±å¤±è´¥ï¼" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//#endregion