MES-WEB-LayUI.git

			@@ -65,10 +65,10 @@
			<input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" style="display:none;" lay-filter="btnSearch" id="btnSearch">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">éç½®</button>
			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<div class="layui-inline" style="margin-left:5px;">
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
			@@ -221,6 +221,7 @@
			</div>
			<!--<div class="layui-tab-item layui-show">-->
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			<div id="page" style="margin-top:70px;"></div>
			<!--</div>-->
			<!--<table class="" id="mainTable" lay-filter="mainTable"></table>
			<table class="" id="mainTable2" lay-filter="mainTable2"></table>-->
			@@ -336,9 +337,15 @@
			, laydate = layui.laydate
			, util = layui.util
			, soulTable = layui.soulTable

			var Organization = sessionStorage["Organization"];

			//var sWhere = " äº§åä»£ç = 'BX0002'";
			var sWhere = "";
			var option = "";
			var page = 1;//åé¡µæ°æ®
			var size = 50;

			var option2 = "";
			var option3 = "";
			var option4 = "";
			@@ -581,17 +588,30 @@
			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();
			});
			//#endregion

			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			if ($("#HProject").val() == 0) {
			get_FastQuery();
			} else {
			get_FastQuery(2);
			}
			}
			});
			//#endregion

			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			if ($("#HProject").val() == 0) {
			get_FastQuery();
			} else {
			get_FastQuery(2);
			}
			}
			});
			//#endregion

			@@ -824,7 +844,10 @@
			//æ ¹æ®ç¨æ·è¿æ»¤ç¨æ·å³èå®¢æ·çè®°å½
			sWhere += getSWhereByHUser();

			get_Display(sWhere);
			//get_Display(sWhere);

			get_DisplayPage(sWhere);

			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//#endregion
			@@ -1175,11 +1198,11 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, height: 300
			//, page: true
			, height: 'full-80'
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			//, limits: [50, 500, 5000, 20000]
			, cols: [[
			// { type: 'checkbox', fixed: 'left' }
			// , { field: 'hmainid', title: 'hmainid', width: 90, hide: true }
			@@ -1240,6 +1263,31 @@
			]]
			};
			//table.render(option);


			optionPage = {
			elem: 'page', //æ³¨æï¼è¿éç page æ¯ IDï¼ä¸ç¨å # å·
			count: 10000, //æ°æ®æ»æ°ï¼ä»æå¡ç«¯å¾å°
			limit: 50,
			limits: [50, 500, 5000, 50000],
			layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
			jump: function (obj, first) {
			//console.log(obj)
			//objåå«äºå½ååé¡µçææåæ°ï¼æ¯å¦ï¼
			//console.log(obj.curr); //å¾å°å½åé¡µï¼ä»¥ä¾¿åæå¡ç«¯è¯·æ±å¯¹åºé¡µçæ°æ®ã
			//console.log(obj.limit); //å¾å°æ¯é¡µæ¾ç¤ºçæ¡æ°

			//é¦æ¬¡ä¸æ§è¡
			if (!first) {
			//do something
			console.log(obj)
			page = obj.curr;
			size = obj.limit;
			get_FastQuery();
			}
			}
			}
			laypage.render(optionPage);
			}

			//åå§åä»è¡¨åè¡¨ å·¥èºæµç¨
			@@ -1476,6 +1524,127 @@
			}
			//#endregion

			//#region æ¥è¯¢(ä¸»è¡¨)-åé¡µ
			function get_DisplayPage(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and HBillSubType<>'SUB'";
			$.ajax({
			url: GetWEBURL() + '/LEMS/Sc_ProcessExchangeBillList_Query_byPage',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size, "HBillSubType": "3772" },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.count != 0) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			//else if ($.inArray(data[i].name, totalArray) > -1) { //è®¡ç®å
			// col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			//}
			else if (data[i].name == 'åæ®å·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·' });
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			if (data[i].name == 'çäº§æ°é' \|\| data[i].name == 'æµè½¬å¡æ°é' \|\| data[i].name == 'å¥åºæ°é' \|\| data[i].name == 'ç´¯è®¡è¿ç«æ°é' \|\| data[i].name == 'ç´¯è®¡åæ ¼åºç«æ°é' \|\| data[i].name == 'ç´¯è®¡æ¥åºæ°é' \|\| data[i].name == 'ç´¯è®¡ä¸è¯æ°é' \|\| data[i].name == 'æ«éå·¥åºåºç«æ°é') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
			} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			}

			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 780
			//, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			//, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			//, done: function (res, curr, count) {
			// var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
			// var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
			// var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
			// for (var i = 0; i < $data.length; i++) {
			// var l1 = $data.eq(i).find('div').width();
			// var l2 = $head.eq(i).find('div').width();
			// if (l1 > l2) {
			// $head.eq(i).find('div').width(l1);
			// $total.eq(i).find('div').width(l1);
			// } else {
			// $data.eq(i).find('div').width(l2);
			// $total.eq(i).find('div').width(l2);
			// }
			// }
			//}
			}
			ins = table.render(option);

			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, "3772", HModName, sessionStorage["HUserName"]);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
			ColFilter();
			}

			//ææ°æ®çæåµä¸,é»è®¤æ¾ç¤ºç¬¬ä¸æ¡çæç»æ°æ®
			if (data1.data.length > 0) {
			get_DisplaySub(data1.data[0]);
			}

			layer.close(ajaxLoad);
			} else {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			laypage.render(optionPage);

			option.data = [];
			table.render(option);
			layer.close(ajaxLoad);
			/layer.alert(data1.code + data1.Message, { icon: 5 });/
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			DisPlay_HideColumn();

			layer.close(wait);
			}
			//#endregion

			//#region éèåè®¾ç½® (ä¸»åè¡¨)
			function get_HideColumn1() {
			var colName = "";
			@@ -1644,6 +1813,7 @@
			$.ajax({
			url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
			type: "GET",
			async: false,
			data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
			success: function (data1) {
			if (data1.count == 1) {

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html	190 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -6243,7 +6243,7 @@
			<publishTime>08/28/2024 18:15:51</publishTime>
			</File>
			<File Include="views/è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeBillList.html">
			<publishTime>09/11/2024 21:05:01</publishTime>
			<publishTime>09/26/2024 15:16:55</publishTime>
			</File>
			<File Include="views/è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeBillList_LookDown.html">
			<publishTime>01/05/2024 08:43:43</publishTime>