LongShan-LayUI.git

			@@ -57,7 +57,8 @@
			<button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">ä¿å</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">éåº</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">æå°</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">éèåè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Print_Convenient">ä¸é®æå°</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">åè®¾ç½®</button>
			</div>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			@@ -1149,7 +1150,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../../views/åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -1377,6 +1378,77 @@
			}
			});

			});

			//ä¸é®æå°
			form.on('submit(set_Print_Convenient)', function () {

			var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and åæ®å·='" + $("#HBillNo").val() + "' ";
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			var hinterid = "";
			if (data1.data.length != 0) {
			hinterid = data1.data[0]["hmainid"];
			}
			layer.close(ajaxLoad);

			if (hinterid != "") {
			$.ajax({
			url: GetWEBURL() + '/Sc_ProcessExchangeBillList/QJQD',
			type: "GET",
			data: { "HProcExchHinteID": hinterid },
			success: function (res) {
			if (res.count == 1) {
			if (res.data.length != 0) {
			hinterid += ",1";
			} else {
			hinterid += ",0";
			}

			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
			async: true,
			data: { "HNumber": 'HProcessExchange' },
			//data: { "Value": Value },
			success: function (result) {
			if (result.count == 1) {
			var OpenTmp = result.data[0].æ¨¡æ¿åç§°
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + hinterid + "&Type=" + 'HProcessExchange' + "&OpenTmp=" + OpenTmp.toString());
			} else {
			layer.msg(result.Message);
			}
			},
			error: function (result) {
			console.log(result);
			//layer.msg('è·åéè´è®¢ååºç°å¼å¸¸', { icon: 2, time: 2000 });
			}
			});
			} else {
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})

			} else {
			layer.msg("è¯·åä¿å,å¨è¿è¡æå°!");
			}
			} else {
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			});

			//éæ©åä»¶å¼¹çªPartInformation.html
			@@ -1724,13 +1796,13 @@
			layer.msg("ç¬¬" + indexRow + "è¡ï¼å·¥ä½ä¸å¿ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (sSubTable[i].HSupFlag == "true") {
			if (!sSubTable[i].HSupID) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼ä¾åºåä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			}
			//if (sSubTable[i].HSupFlag == "true") {
			// if (!sSubTable[i].HSupID) {
			// var indexRow = i + 1;
			// layer.msg("ç¬¬" + indexRow + "è¡ï¼ä¾åºåä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			// }
			//}
			}
			data.field.HPRDORGID = sessionStorage["OrganizationID"];//ç»ç»
			//var HBLFlag = data.field.HBLFlag;