MES-WEB-LayUI.git

			@@ -8,19 +8,21 @@
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<form class="layui-form" action="" lay-filter="component-form-group" autocomplete="off">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-colla-title layui-inline">
			@@ -39,7 +41,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">çç»<label style="color:red"></label></label>
			<div class="layui-input-inline">
			<input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
			<input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
			<input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -49,7 +51,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">èå</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float:left;width:150px;" readonly>
			<input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float:left;width:150px;" >
			<input type="hidden" class="layui-input" name="HEmpID" id="HEmpID" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -74,15 +76,39 @@
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>

			<div class="layui-tab layui-tab-card" lay-filter="table">
			<ul class="layui-tab-title">
			<li class="layui-this">è®¡ä»¶æ°æ®</li>
			<li>é¶æ¢¯è®¡ä»¶æ°æ®</li>
			</ul>
			<div class="layui-tab-content" style="">
			<div class="layui-tab-item layui-show">
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</div>
			<div class="layui-tab-item ">
			<table class="" id="mainTable2" lay-filter="mainTable2"></table>
			<script type="text/html" id="toolbarDemo2">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload2"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export2" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</div>

			</div>
			</script>
			</div>


			</form>
			</div>
			</div>
			@@ -93,7 +119,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable','tableSelect'], function () {

			//#region å¬å±åé
			var $ = layui.$
			@@ -105,10 +131,13 @@
			, laypage = layui.laypage
			, laydate = layui.laydate
			, soulTable = layui.soulTable
			, tableSelect = layui.tableSelect;
			var ins;
			var sWhere = "";
			var option = [];
			var option2 = [];
			var HModName = "Pay_PaymentEntryReport";
			var HModName2 = "Pay_PaymentEntryReport2";
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±


			@@ -122,14 +151,16 @@

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery();
			get_FastQuery(1);
			get_FastQuery(2);
			});

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();
			get_FastQuery();
			get_FastQuery(1);
			get_FastQuery(2);
			});

			//#region éæ©çç»æé®
			@@ -146,18 +177,38 @@

			//#region å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);//è·åéä¸è¡ æ°æ®
			switch (obj.event) {
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
			break;
			case 'btn-reload':
			get_FastQuery();
			get_FastQuery(1);
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//éåº
			case 'btn-exit': Pub_Close(2);
			break;
			default:
			break;
			}
			});

			table.on('toolbar(mainTable2)', function (obj) {
			switch (obj.event) {
			//åè®¾ç½®
			case 'set_HideColumn2':
			get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_FastQuery);
			break;
			case 'btn-reload2':
			get_FastQuery(2);
			break;
			//å¯¼åºexcel
			case 'get_export2':
			get_Export2();
			break;
			//éåº
			case 'btn-exit': Pub_Close(2);
			@@ -178,10 +229,102 @@
			get_Dept();
			//åå§åè¡¨æ ¼
			set_InitGrid();
			$("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HBDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
			$("#HEDate").val(Format(new Date(), "yyyy-MM-dd"));
			//æ¥è¯¢
			get_FastQuery(1);
			get_FastQuery(2);

			//é¨é¨è¾å¥æ¡
			tableSelect.render({
			elem: '#HGroupName',//è¾å¥æ¡doméæ©
			searchKey: 'çç»åç§°,çç»ä»£ç ',//æ¥è¯¢çåå
			sWhere: ` and HUSEORGID = ${sessionStorage["OrganizationID"]}`,//tableæç´¢sWhereæ¡ä»¶ //é»è®¤çéé¡¹
			ajaxSelect: function (sWhere) {
			var data = '';
			$.ajax({
			url: GetWEBURL() + '/Gy_Group/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			async: false,
			success: function (data1) {
			if (data1.count == 1) {
			data = data1.data
			}
			},
			error: function () {
			layer.alert('è·ååè¡¨å¤±è´¥ï¼', { icon: 15, title: 'éä¿¡éè¯¯' });
			}
			});
			return data;
			},//è®¾ç½®åç«¯åé¡µæ¶å¯ä»¥è®¾ç½®ç
			table: {
			//url: GetWEBURL() + 'Gy_Supplier/page',
			//where: { user: 'ç¿æ¶æ¶', Organization: 'æµæ±æºäºè¿æ' },
			cols: [[
			{ type: 'radio', fixed: 'left' },//éè¦å è¿ä¸ªfixedå±æ§ä¸ç¶ç¹å»checkboxä¼è§¦åè¡ç¹å»å¯¼è´æ æ³æ£ç¡®ç¹å»
			{ field: 'HItemID', title: 'HItemID' },
			{ field: 'çç»åç§°', title: 'çç»åç§°' },
			{ field: 'çç»ä»£ç ', title: 'çç»ä»£ç ' },
			]],
			page: true,
			limit: 5,
			limits: [5]
			},
			done: function (elem, data) {
			if (data != []) {
			$("#HGroupName").val(data.data[0]['çç»åç§°']);
			$("#HGroupID").val(data.data[0]['HItemID']);
			}

			}
			})
			//èå
			tableSelect.render({
			elem: '#HEmpName',//è¾å¥æ¡doméæ©
			searchKey: 'èååç§°,èåä»£ç ',//æ¥è¯¢çåå
			sWhere: ` and ç»ç»åç§° = '${sessionStorage["Organization"]}'`,//tableæç´¢sWhereæ¡ä»¶ //é»è®¤çéé¡¹
			ajaxSelect: function (sWhere) {
			var data = '';
			$.ajax({
			url: GetWEBURL() + '/Gy_Employee/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],"Organization":'' },
			async: false,
			success: function (data1) {
			if (data1.count == 1) {
			data = data1.data
			}
			},
			error: function () {
			layer.alert('è·ååè¡¨å¤±è´¥ï¼', { icon: 15, title: 'éä¿¡éè¯¯' });
			}
			});
			return data;
			},//è®¾ç½®åç«¯åé¡µæ¶å¯ä»¥è®¾ç½®ç
			table: {
			//url: GetWEBURL() + 'Gy_Supplier/page',
			//where: { user: 'ç¿æ¶æ¶', Organization: 'æµæ±æºäºè¿æ' },
			cols: [[
			{ type: 'radio', fixed: 'left' },//éè¦å è¿ä¸ªfixedå±æ§ä¸ç¶ç¹å»checkboxä¼è§¦åè¡ç¹å»å¯¼è´æ æ³æ£ç¡®ç¹å»
			{ field: 'HItemID', title: 'HItemID' },
			{ field: 'èååç§°', title: 'èååç§°' },
			{ field: 'èåä»£ç ', title: 'èåä»£ç ' },
			]],
			page: true,
			limit: 5,
			limits: [5]
			},
			done: function (elem, data) {
			if (data != []) {
			$("#HEmpName").val(data.data[0]['èååç§°']);
			$("#HEmpID").val(data.data[0]['HItemID']);
			}

			}
			})


			}
			//#endregion

			@@ -193,7 +336,21 @@
			, page: true
			, cellMinWidth: 90
			, totalRow: true
			, limit: 5000
			, limit: 500
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			, cols: [[]]
			};
			option2 = {
			elem: '#mainTable2'
			, toolbar: '#toolbarDemo2'
			, height: 'full-80'
			, page: true
			, cellMinWidth: 90
			, totalRow: true
			, limit: 500
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			@@ -294,10 +451,11 @@

			option.cols = [col]
			option.data = data1.data;
			table.render(option);

			layer.close(ajaxLoad);

			DisPlay_HideColumn();
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
			table.render(option);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			@@ -309,17 +467,83 @@
			}
			});
			}

			function get_Display2(sWhere) {
			var ajaxLoad = layer.load();

			var sql = "exec h_p_Pay_PaymentEntryReportStepped " + sWhere;

			$.ajax({
			url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
			type: "GET",
			async: false,
			data: { "sWhere": sql },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];//ååæ®µæ°æ®
			var col = [];
			var totalArray = [];
			var titleData = [];
			//ç»ç©ºçæ°ç»èµå¼
			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++) {//éådataæ°ç»éçæ°æ®
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {//æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸ //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true, filter: 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, filter: true });
			} else if (isValidDate(data[i].name)) {
			col.push({ field: data[i].name, title: Format(data[i].name, 'MM-dd'), width: 70, totalRow: true, filter: true })
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, filter: true, templet: "<div>{{d." + (data[i].name == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, filter: true });
			}
			}
			}
			option2.cols = [col];
			option2.data = data1.data;
			//åè®¾ç½®
			DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
			table.render(option2);
			layer.close(ajaxLoad);
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(ajaxLoad);
			}
			});
			}

			//#endregion

			//#region å¿«éè¿æ»¤
			function get_FastQuery() {
			function get_FastQuery(type) {
			var HBDate = $("#HBDate").val();//å¼å§æ¶é´
			var HEDate = $("#HEDate").val();//ç»ææ¶é´
			var HDeptID = $("#HDeptID").val();
			var HEmpID = $("#HEmpID").val();
			var HGroupID = $("#HGroupID").val();
			sWhere = "'" + HBDate + "','" + HEDate + "','" + HDeptID + "','" + HGroupID + "','" + HEmpID + "'";
			get_Display(sWhere);
			if (type == 1) {
			get_Display(sWhere);
			} else {
			get_Display2(sWhere);
			}

			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//#endregion
			@@ -383,10 +607,11 @@
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});
			table.exportFile(ins.config.id, option.data, "xls");
			table.exportFile("mainTable", option.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			@@ -395,6 +620,38 @@
			}
			});
			}
			function get_Export2() {
			var ModRightNameCheck = "Pay_PaymentEntryReportExcel";

			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			var data = option2.data
			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().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			}
			});
			table.exportFile("mainTable2", option2.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//#endregion

			//#region éæ©çç»
			@@ -458,103 +715,7 @@
			}
			//#endregion

			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			dataCol = data1.data[0].HGridString.split(',');
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			if (dataCol.length == option.cols[0].length - 1) {
			//éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			for (var j = 0; j < option.cols[0].length - 1; j++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[j].split('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[5]) {
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			if (dataCol.length == newCols[0].length - 1) {
			option.cols = newCols;
			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			}
			}
			ins = table.render(option);
			} else {
			ins = table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion


			//#region ç¹å»è¡éä¸é«äº®
			//table.on('row(mainTable)', function (obj) {