MES-WEB-LayUI.git

			@@ -90,7 +90,7 @@
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>
			<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding: 0 5px; display: none; ">éæ°åæ¥</button>-->

			<div class="layui-row">
			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			@@ -232,6 +232,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print1" id="print1"><i class="layui-icon layui-icon-print"></i>æå°ï¼æ¶æåï¼</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			@@ -268,6 +269,7 @@
			var sWhere = "";
			var option = [];
			var HModName = "Cg_POInStockBillList";
			var ins;
			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "1103";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			@@ -625,7 +627,7 @@
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];//ååæ®µæ°æ®
			var col = [];
			var totalArray = [];
			var totalArray = ["æ°é","å³èæ°é","éé¢","ç¨é¢","ä»·ç¨åè®¡"];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			@@ -668,7 +670,7 @@
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			ins = table.render(option);
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "1103";
			@@ -853,6 +855,9 @@
			//æå°
			case 'btn-print1':
			get_PrintReport1();
			break;
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			@@ -1464,6 +1469,11 @@
			var hmainid = [];

			for (var i = 0; i < checkStatus.data.length; i++) {
			if (checkStatus.data[i].ç¶æ != "å·²å®¡æ ¸" && checkStatus.data[i].ç¶æ!="") {
			layer.alert("æå°å¤±è´¥!åå ï¼åæ®ç¶æä¸ä¸º'å·²å®¡æ ¸'ç¶æ!!", { icon: 5 });
			return;
			}

			hmainid.push(data[i].hmainid.toString() + padStart(data[i].hsubid.toString(),8))
			}
			layer.open({
			@@ -1495,6 +1505,12 @@
			return layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼');
			}
			else {

			if (data[0].ç¶æ != "å·²å®¡æ ¸") {
			layer.alert("æå°å¤±è´¥!åå ï¼åæ®ç¶æä¸ä¸º'å·²å®¡æ ¸'ç¶æ!!", { icon: 5 });
			return;
			}

			layer.open({
			type: 2
			, area: ['50%', '50%']
			@@ -1514,6 +1530,177 @@
			get_DisplayPage(sWhere);
			}
			//#endregion

			//æéå¤å®
			function set_ModCheck(ModRightNameCheck) {
			var Permission = false;
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: false,
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			Permission = true;
			} else {
			layer.alert("å½åæ¨¡åæ²¡ææ¥è¯¢æé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			return Permission;
			}

			//#region å¯¼åºExecel
			function btn_Export() {
			//æéå¤å®
			if (!set_ModCheck("Cg_POInStockBill_ExportExcel")) {
			return
			}
			var data;
			//è®¾ç½®sWhere
			var ajaxLoad = layer.load();
			var HDate = $("#HDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HDate1").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HProjectNumber = $("#HProjectNumber").val(); //é¡¹ç®ç¼å·
			var HSupID = $("#HSupID").val();
			var HDeptID = $("#HDeptID").val();
			var HMangerID = $("#HMangerID").val();
			//ä»»æåæ®µè¿æ»¤
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}
			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}

			if (HProjectNumber) {
			sWhere += " and é¡¹ç®ä»£ç like '%" + HProjectNumber + "%'";
			}
			if (HSupID) {
			sWhere += " and ä¾åºå like '%" + HSupID + "%'";
			}
			if (HDeptID) {
			sWhere += " and é¨é¨ like '%" + HDeptID + "%'";
			}
			if (HMangerID) {
			sWhere += " and ä¸»ç®¡ like '%" + HMangerID + "%'";
			}
			//sWhere += " and å³éäºº =''";
			sWhere += addSWhereByOpenType();
			$.ajax({
			url: GetWEBURL() + '/Cg_POInStockBill/list',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			data = data1.data
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.Message, { icon: 5 });
			}
			},
			error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			sWhere = "";
			data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});

			table.exportFile(ins.config.id, data, "xls");
			}
			//#endregion


			//éèåè®¾ç½®
			function get_HideColumn() {
			@@ -1779,8 +1966,8 @@

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"];
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©", "è¿åå¹´", "è¿ä¸å¹´"];

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';
			for (var i = 0; i < valueList.length; i++) {